[PATCH 1/3] graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x

[PATCH 1/3] graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x

[Adolf Belka]

- 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>
---
 config/cfgroot/graphs.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index aba1ef0ef..8308d2443 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -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'}),
-- 
2.49.0

[PATCH 2/3] netovpnrw.cgi: Fixes bug13838 - additional file name correction for collectd-5.x

[Adolf Belka]

- One location in netovpnrw.cgi was missed with a filename change coming from the collectd
   update.
- This resulted in missing graph content for the openvpn road warrior graphs.
- Tested out on my production IPFire system. Making the change 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>
---
 html/cgi-bin/netovpnrw.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
index 5014f9a55..fb81e9ffe 100644
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/html/cgi-bin/netovpnrw.cgi
@@ -43,7 +43,7 @@ my @vpns=();
 
 my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not  -path *openvpn-UNDEF*  -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`;
 foreach (@vpngraphs){
-	if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){
+	if($_ =~ /(.*)\/openvpn-(.*)\/if_octets.rrd/){
 		push(@vpns,$2);
 	}
 }
-- 
2.49.0

[PATCH 3/3] core194: Ship graphs.pl and netovpnrw.cgi for bug13838 fixes.

[Adolf Belka]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/core/194/filelists/files | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/core/194/filelists/files
index 03dfa2929..91c017ed2 100644
--- a/config/rootfiles/core/194/filelists/files
+++ b/config/rootfiles/core/194/filelists/files
@@ -6,3 +6,5 @@ etc/ssl/openssl.cnf
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/backup/include
 var/ipfire/backup/bin/backup.pl
+srv/web/ipfire/cgi-bin/netovpnrw.cgi
+var/ipfire/graphs.pl
-- 
2.49.0