]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x
authorAdolf Belka <adolf.belka@ipfire.org>
Mon, 7 Apr 2025 18:43:43 +0000 (20:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Apr 2025 14:14:30 +0000 (14:14 +0000)
- Two locations in graphs.pl were missed with filename changes coming from the collectd
   update.
- These result in missing graph content for the openvpn road warrior graphs.
- Tested out on my production IPFire system. Making the changes resulted in the grahs
   being visible again.

Fixes: bug13838
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/cfgroot/graphs.pl

index aba1ef0ef6343f1a3b2a9e1e6f5731fe6aac76fb..8308d244346002c2bccbde68e21540a24632c914 100644 (file)
@@ -493,8 +493,8 @@ sub updatevpngraph {
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},
-               "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE",
-               "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:tx:AVERAGE",
+               "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:rx:AVERAGE",
+               "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:tx:AVERAGE",
                "CDEF:outgoingn=outgoing,-1,*",
                "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),