]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
graphs.pl: Update to names used by collectd-5.x
authorAdolf Belka <adolf.belka@ipfire.org>
Wed, 25 Dec 2024 13:48:24 +0000 (14:48 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 21 Jan 2025 18:32:09 +0000 (19:32 +0100)
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/cfgroot/graphs.pl

index f07214cf867441725a36739b91bcdab989d4f48b..51292540ecf71d500c602c23eac1ad000e7da2ae 100644 (file)
@@ -457,8 +457,8 @@ sub updateifgraph {
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},
-               "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:rx:AVERAGE",
-               "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:tx:AVERAGE",
+               "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface-".$interface."/if_octets.rrd:rx:AVERAGE",
+               "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface-".$interface."/if_octets.rrd:tx:AVERAGE",
                "CDEF:outgoingn=outgoing,-1,*",
                "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
@@ -757,7 +757,7 @@ sub updatepinggraph {
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},
-               "DEF:roundtrip=".$mainsettings{'RRDLOG'}."/collectd/localhost/ping/ping-".$host.".rrd:ping:AVERAGE",
+               "DEF:roundtrip=".$mainsettings{'RRDLOG'}."/collectd/localhost/ping/ping-".$host.".rrd:value:AVERAGE",
                "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'})."\\j",
                "CDEF:roundavg=roundtrip,PREV(roundtrip),+,2,/",
                "CDEF:r0=roundtrip,30,MIN",
@@ -1173,7 +1173,7 @@ sub updateconntrackgraph {
                "-r",
                "--lower-limit","0",
                "-v $Lang::tr{'open connections'}",
-               "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:entropy:AVERAGE",
+               "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:value:AVERAGE",
                "LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}),
                "VDEF:ctmin=conntrack,MINIMUM",
                "VDEF:ctmax=conntrack,MAXIMUM",