[PATCH v2] collectd: Fixes bug-13074, create collectd.d directory

[PATCH v2] collectd: Fixes bug-13074, create collectd.d directory

[Adolf Belka]

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

- As requested in bug 13074, create a collectd.d directory to enable any addon definitions
   to be created.
- Added include statement in conf file to load everything that is stored in the collectd.d
   directory.
- collectd.precache and collectd.thermal have been left in their original locations
- Removed the arm section in the initscript as only aarch64 is now used.
- Modified the lfs to create the collectd.d directory
- Removal of collectd.custom file as this was the previous way to define custom collectd
   profiles but would have been overwritten by any update of collectd.
- Update of rootfile to take account of new path and removal of collectd.custom
- Tested out in vm testbed with Core Update 188 and all existing graphs were still created
   and updated. From my evaluation the changes have not affected anything.
- The creation of the collectd.d directory now allows users to add their own desired
   profiles but also if it is decided that an addon should be included in the processes
   graph, or if a new graph for addons is created then profiles for that addon can be
   placed in the collectd.d directory and will be automatically included by collectd.

Fixes: Bug13074
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/collectd/collectd.conf    | 2 +-
 config/collectd/collectd.custom  | 1 -
 config/rootfiles/common/collectd | 2 +-
 lfs/collectd                     | 3 ++-
 src/initscripts/system/collectd  | 5 +----
 5 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 config/collectd/collectd.custom

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 27e1fe984..e51d9108b 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -74,5 +74,5 @@ include "/etc/collectd.precache"
 </Plugin>
 
 #include "/etc/collectd.thermal"
-include "/etc/collectd.custom"
 include "/etc/collectd.vpn"
+include "/etc/collectd.d/*"
diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom
deleted file mode 100644
index 7443bf3e6..000000000
--- a/config/collectd/collectd.custom
+++ /dev/null
@@ -1 +0,0 @@
-# Use this file to add custom configs and rules for collectd
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 65408dc7f..c8a3ad607 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,8 +1,8 @@
 etc/collectd.conf
-etc/collectd.custom
 etc/collectd.precache
 etc/collectd.thermal
 etc/collectd.vpn
+etc/collectd.d
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
diff --git a/lfs/collectd b/lfs/collectd
index 24f5bc632..6d0f666f6 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2024  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        #
@@ -125,6 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-librrd=/usr/share/rrdtool-1.2.30 \
 		--with-fp-layout=nothing
 	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
+	mkdir /etc/collectd.d
 	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
 	mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
 	chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index 56b799d56..263511fc7 100644
--- a/src/initscripts/system/collectd
+++ b/src/initscripts/system/collectd
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2024  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        #
@@ -68,9 +68,6 @@ case "$1" in
 		# ARM does not support to scan for sensors. In that case,
 		# we create an empty configuration file.
 		machine=$(uname -m)
-		if [ "${machine:0:3}" = "arm" ]; then
-			touch /etc/sysconfig/lm_sensors
-		fi
 		if [ "${machine:0:7}" = "aarch64" ]; then
 			touch /etc/sysconfig/lm_sensors
 		fi
-- 
2.45.2