[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8d0df657b53e9f9930827278bf22a3892e47e456

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8d0df657b53e9f9930827278bf22a3892e47e456

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 6902 bytes --]

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, next has been updated
       via  8d0df657b53e9f9930827278bf22a3892e47e456 (commit)
       via  cd2e22704336c533c188b8418f2f48c99513a466 (commit)
       via  4d7c9a860f5e3e98b0289097d15c25a40e52de86 (commit)
      from  6ca4e2f29feb17401815aac2fb046e4354c1def2 (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 8d0df657b53e9f9930827278bf22a3892e47e456
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 26 11:41:54 2025 +0100

    core192: fix some collectd convertion issues
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit cd2e22704336c533c188b8418f2f48c99513a466
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 26 11:22:44 2025 +0100

    system.cgi: update cpufreq graph
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 4d7c9a860f5e3e98b0289097d15c25a40e52de86
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 26 11:21:47 2025 +0100

    graphs.pl: update cpufreq and themalzone graph
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/backup.pl             | 16 ++++++++++++----
 config/cfgroot/graphs.pl            |  4 ++--
 config/rootfiles/core/192/update.sh | 15 +++++++++------
 html/cgi-bin/system.cgi             |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 html/cgi-bin/system.cgi

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 959804b59..07b809441 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info(a)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        #
@@ -75,6 +75,10 @@ make_backup() {
 restore_backup() {
 	local filename="${1}"
 
+	# stop collectd to remove the rrd ramdisk for restore and convert
+	# the rrd's
+	/etc/rc.d/init.d/collectd stop
+
 	# remove all openvpn certs to prevent old unusable
 	# certificates being left in directory after a restore
 	rm -f /var/ipfire/ovpn/certs/*
@@ -264,9 +268,13 @@ restore_backup() {
 	# be empty after the migration has been carried out.
 	/var/ipfire/collectd-migrate-4-to-5.pl --indir /var/log/rrd/ > /tmp/rrd-migrate.sh
 	sh /tmp/rrd-migrate.sh >/dev/null 2>&1
-	if [ -d /var/log/rrd/collectd/localhost/interface/ ]; then
-		rm -Rf /var/log/rrd/collectd/localhost/interface/
-	fi
+	rm -rf \
+		/var/log/rrd/collectd/localhost/cpufreq
+		/var/log/rrd/collectd/localhost/interface
+		/var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperatur-temperatur.rrd
+
+	# start collectd after restore
+	/etc/rc.d/init.d/collectd start
 
 	return 0
 }
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 51292540e..aba1ef0ef 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -1094,7 +1094,7 @@ sub updatecpufreqgraph {
 	my $j = 11;
 	for(my $i = 0; $i < $cpucount; $i++) {
 		$j++; $j = 1 if $j > 20;
-		push(@command,"DEF:cpu".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpufreq/cpufreq-".$i.".rrd:value:AVERAGE"
+		push(@command,"DEF:cpu".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpufreq-".$i."/cpufreq.rrd:value:AVERAGE"
 				,"CDEF:cpu".$i."=cpu".$i."_,1000000,/"
 				,"LINE1:cpu".$i.$color{"color$j"}."A0:cpu ".$i." "
 				,"GPRINT:cpu".$i.":MAX:%3.0lf Mhz"
@@ -1132,7 +1132,7 @@ sub updatethermaltempgraph {
 
 	for(my $i = 0; $i < $thermalcount; $i++) {
 		my $j=$i+1;
-		push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
+		push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature.rrd:value:AVERAGE"
 				,"CDEF:temp".$i."=temp".$i."_,1,/"
 				,"LINE3:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
 				,"GPRINT:temp".$i.":MAX:%3.0lf °C"
diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh
index 7822bb24c..0ca3bad1a 100644
--- a/config/rootfiles/core/192/update.sh
+++ b/config/rootfiles/core/192/update.sh
@@ -44,6 +44,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/collectd stop
 
 KVER="xxxKVERxxx"
 
@@ -105,17 +106,19 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
-# Start services
-/etc/init.d/suricata restart
-
 # Create collectd 4.x to 5.x migration script from rrd contents, run the script that
 # was created and then remove the old interface directory if it is present as it will
 # be empty after the migration has been carried out.
 /var/ipfire/collectd-migrate-4-to-5.pl --indir /var/log/rrd/ > /tmp/rrd-migrate.sh
 sh /tmp/rrd-migrate.sh >/dev/null 2>&1
-if [ -d /var/log/rrd/collectd/localhost/interface/ ]; then
-	rm -Rf /var/log/rrd/collectd/localhost/interface/
-fi
+	rm -rf \
+		/var/log/rrd/collectd/localhost/cpufreq
+		/var/log/rrd/collectd/localhost/interface
+		/var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperatur-temperatur.rrd
+
+# Start services
+/etc/init.d/collectd start
+/etc/init.d/suricata restart
 
 # Build initial ramdisks
 dracut --regenerate-all --force
diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
old mode 100644
new mode 100755
index a6f60409d..d56e80234
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -39,7 +39,7 @@ my %mainsettings = ();
 &Header::graph("$Lang::tr{'processors'}", "system.cgi", "cpu", "day");
 
 # CPU Frequency
-if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
+if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq-0/cpufreq.rrd"){
 	&Header::graph("$Lang::tr{'cpu frequency'}", "system.cgi", "cpufreq", "day");
 }
 


hooks/post-receive
--
IPFire 2.x development tree