]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
red: Fixes rrd file name updates from collectd-5 update
authorAdolf Belka <adolf.belka@ipfire.org>
Thu, 15 May 2025 11:49:19 +0000 (13:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 May 2025 14:58:44 +0000 (14:58 +0000)
- 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>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/initscripts/networking/red

index 2a5f06b4e349f897034fae15f84c247ab381e13c..fddc70d9295feb5b47a8a31cfdbf66e353f5c448 100644 (file)
@@ -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