public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH 3/4] red: Fixes rrd file name updates from collectd-5 update
Date: Thu, 15 May 2025 13:49:19 +0200	[thread overview]
Message-ID: <20250515114920.12919-3-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org>

- 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



  parent reply	other threads:[~2025-05-15 11:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-15 11:49 [PATCH 1/4] netexternal.cgi: Fixed bug13834 - tun0 graph missing in external net traffic Adolf Belka
2025-05-15 11:49 ` [PATCH 2/4] netovpnsrv.cgi: Fixes rrd file names for n2n openvpn graphs Adolf Belka
2025-05-15 11:49 ` Adolf Belka [this message]
2025-05-15 11:49 ` [PATCH 4/4] graphs.pl: Update of rrd file names from the collectd-5 update Adolf Belka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250515114920.12919-3-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox