[PATCH 1/4] netexternal.cgi: Fixed bug13834 - tun0 graph missing in external net traffic

[PATCH 1/4] netexternal.cgi: Fixed bug13834 - tun0 graph missing in external net traffic

[Adolf Belka]

- Some additional rrd directory and file name changes missed from collect-5 update.

Fixes: bug13834
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/netexternal.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index fb1097d61..79ba1c0b8 100644
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -55,11 +55,11 @@ if ($netsettings{'RED_TYPE'} ne 'PPPOE'){
 	push (@graphs, "ppp0");
 }
 
-if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd"){
+if (-e "/var/log/rrd/collectd/localhost/interface-ipsec0/if_octets.rrd"){
 	push (@graphs, ("ipsec0"));
 }
 
-if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-tun0.rrd"){
+if (-e "/var/log/rrd/collectd/localhost/interface-tun0/if_octets.rrd"){
 	push (@graphs, ("tun0"));
 }
 
-- 
2.49.0

[PATCH 2/4] netovpnsrv.cgi: Fixes rrd file names for n2n openvpn graphs

[Adolf Belka]

- An additional rrd file name change missed from collect-5 update.
- This was identified as part of fixing bug13834

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/netovpnsrv.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index 1fb66e7a4..7bc5d8509 100644
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/html/cgi-bin/netovpnsrv.cgi
@@ -55,7 +55,7 @@ foreach my $key (sort {$vpnsettings{$a}[1] <=> $vpnsettings{$b}[1]} keys %vpnset
 
 my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not  -path *openvpn-UNDEF* -name *traffic.rrd 2>/dev/null|sort`;
 foreach (@vpngraphs){
-	if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive-traffic.rrd/){
+	if($_ =~ /(.*)\/openvpn-(.*)\/if_octets-traffic.rrd/){
 		push(@vpns,$2);
 	}
 }
-- 
2.49.0

[PATCH 3/4] red: Fixes rrd file name updates from collectd-5 update

[Adolf Belka]

- Some additional rrd file name changes missed from collect-5 update.
- This was identified as part of fixing bug13834
- Couldn't test this as I don't have a ppp0 connection available but the chnage is inline
   with the other rrd changes which have been tested as working.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 src/initscripts/networking/red | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 2a5f06b4e..fddc70d92 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -483,7 +483,7 @@ case "${1}" in
 
 			/etc/rc.d/init.d/connectd start
 			# Add a NaN value to ppp0 rrd to supress spikes at reconnect
-			rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+			rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \
 				$(date +%s):: > /dev/null 2>&1
 			exit 0
 		fi
@@ -524,7 +524,7 @@ case "${1}" in
 			killall -w -s TERM /usr/sbin/pppd 2>/dev/null
 			evaluate_retval
 			# Add a NaN value to ppp0 rrd to supress spikes at reconnect
-			rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+			rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \
 				$(date +%s):: > /dev/null 2>&1
 
 		elif [ "$TYPE" == "DHCP" ]; then
-- 
2.49.0

[PATCH 4/4] graphs.pl: Update of rrd file names from the collectd-5 update

[Adolf Belka]

- Some additional rrd file name changes missed from collect-5 update.
- This was identified as part of fixing bug13834

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/cfgroot/graphs.pl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 8308d2443..a64958c75 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -529,12 +529,12 @@ sub updatevpnn2ngraph {
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
 		"--color=BACK".$color{"color21"},
-		"DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:rx:AVERAGE",
-		"DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:tx:AVERAGE",
-		"DEF:overhead_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:rx:AVERAGE",
-		"DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE",
-		"DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE",
-		"DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE",
+		"DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-traffic.rrd:rx:AVERAGE",
+		"DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-traffic.rrd:tx:AVERAGE",
+		"DEF:overhead_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-overhead.rrd:rx:AVERAGE",
+		"DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-overhead.rrd:tx:AVERAGE",
+		"DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression-data_in.rrd:uncompressed:AVERAGE",
+		"DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression-data_out.rrd:uncompressed:AVERAGE",
 		"CDEF:outgoingn=outgoing,-1,*",
 		"CDEF:overhead_outn=overhead_out,-1,*",
 		"CDEF:compression_outn=compression_out,-1,*",
-- 
2.49.0