From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 610ed2f195d1447f8f56b9796d916edf2800661f
Date: Tue, 22 Apr 2025 14:15:01 +0000 (UTC) [thread overview]
Message-ID: <4ZhklT5h9Cz2y6T@people01.haj.ipfire.org> (raw)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 610ed2f195d1447f8f56b9796d916edf2800661f (commit)
via 264b564c9cf78116b21236472fed08aacfd2b8d1 (commit)
via a5c82e0839b5e5f354b972c6c002f81a4f3ebad0 (commit)
from 678fa86af6129b960b6efe419a21a24507c6d993 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 610ed2f195d1447f8f56b9796d916edf2800661f
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Apr 7 20:43:45 2025 +0200
core194: Ship graphs.pl and netovpnrw.cgi for bug13838 fixes.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 264b564c9cf78116b21236472fed08aacfd2b8d1
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Apr 7 20:43:44 2025 +0200
netovpnrw.cgi: Fixes bug13838 - additional file name correction for collectd-5.x
- 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>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit a5c82e0839b5e5f354b972c6c002f81a4f3ebad0
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Apr 7 20:43:43 2025 +0200
graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x
- 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>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/graphs.pl | 4 ++--
config/rootfiles/core/194/filelists/files | 2 ++
html/cgi-bin/netovpnrw.cgi | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
Difference in files:
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'}),
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
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);
}
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-04-22 14:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4ZhklT5h9Cz2y6T@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@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