From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] collectd: Fixes bug-13074, create collectd.d directory Date: Tue, 06 Aug 2024 16:57:29 +0100 Message-ID: In-Reply-To: <20240806102155.4011-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5264272639781337704==" List-Id: --===============5264272639781337704== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, I think this is generally be acceptable. However, wouldn=E2=80=99t the precache file be loaded twice? Should we rather= not leave that one where it is right now? Or just copy and paste it into col= lectd.conf? -Michael > On 6 Aug 2024, at 11:21, Adolf Belka wrote: >=20 > - As requested in bug 13074, create a collectd.d directory to enable any ad= don definitions > to be created. > - Added include statement in conf file to load everything that is stored in= the collectd.d > directory. > - Moved collectd.precache and collectd.thermal to the collectd.d directory = and modified > the paths for them in the collectd.conf file. > - Modified the path for the collectd.thermal file in the initscript. > - Removed the arm section in the initscript as only aarch64 is now used. > - Modified the lfs to account for the changed directory for the precache an= d thermal files > - Update of rootfile to take account of new path. > - Removal of collectd.custom file as this was the previous way to define cu= stom collectd > profiles but would have been overwritten by any update of collectd. > - Tested out in vm testbed with Core Update 187 and all existing graphs wer= e 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 ow= n desired > profiles but also if it is decided that an addon should be included in th= e processes > graph, or if a new graph for addons is created then profiles for that add= on can be > placed in the collectd.d directory and will be automatically included by = collectd. >=20 > Fixes: Bug13074 > Tested-by: Adolf Belka > Signed-off-by: Adolf Belka > --- > config/collectd/collectd.conf | 7 +++---- > config/collectd/collectd.custom | 1 - > config/rootfiles/common/collectd | 8 ++++---- > lfs/collectd | 10 ++++++---- > src/initscripts/system/collectd | 9 +++------ > 5 files changed, 16 insertions(+), 19 deletions(-) > delete mode 100644 config/collectd/collectd.custom >=20 > diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf > index cc49f0ba7..ec0c7a6a3 100644 > --- a/config/collectd/collectd.conf > +++ b/config/collectd/collectd.conf > @@ -30,7 +30,7 @@ LoadPlugin syslog > #LoadPlugin wireless > LoadPlugin match_regex >=20 > -include "/etc/collectd.precache" > +include "/etc/collectd.d/collectd.precache" >=20 > > Interface "lo" > @@ -86,6 +86,5 @@ include "/etc/collectd.precache" > LogLevel info > >=20 > -#include "/etc/collectd.thermal" > -include "/etc/collectd.custom" > -include "/etc/collectd.vpn" > +#include "/etc/collectd.d/collectd.thermal" > +include "/etc/collectd.d/*" > diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.cus= tom > 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/col= lectd > index 65408dc7f..8a12fa844 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/collectd.d/collectd.vpn > +etc/collectd.d/collectd.precache > +etc/collectd.d/collectd.thermal > 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..3f0deca26 100644 > --- a/lfs/collectd > +++ b/lfs/collectd > @@ -1,7 +1,7 @@ > ###########################################################################= #### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2007-2018 IPFire Team = # > +# Copyright (C) 2007-2024 IPFire Team = # > # = # > # 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,10 +125,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > --with-librrd=3D/usr/share/rrdtool-1.2.30 \ > --with-fp-layout=3Dnothing > cd $(DIR_APP) && make install #collectd-4 does not support parallel build > - cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ > - mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn > + mkdir /etc/collectd.d > + cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/collectd.d/ > + mv /etc/collectd.d/collectd.vpn /var/ipfire/ovpn/collectd.vpn > + mv /etc/collectd.d/collectd.conf /etc/ > chown nobody.nobody /var/ipfire/ovpn/collectd.vpn > - ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn > + ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.d/collectd.vpn > ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd > ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd > ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd > diff --git a/src/initscripts/system/collectd b/src/initscripts/system/colle= ctd > index 56b799d56..79a81ce6a 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 = # > +# Copyright (C) 2007-2024 IPFire Team = # > # = # > # 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=3D$(uname -m) > - if [ "${machine:0:3}" =3D "arm" ]; then > - touch /etc/sysconfig/lm_sensors > - fi > if [ "${machine:0:7}" =3D "aarch64" ]; then > touch /etc/sysconfig/lm_sensors > fi > @@ -127,9 +124,9 @@ case "$1" in >=20 > # Enable thermal plugin if thermal_zone found > if [ ! -e /sys/class/thermal/thermal_zone0 ]; then > - sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.th= ermal"|g' /etc/collectd.conf > + sed -i -e 's|^include "/etc/collectd.d/collectd.thermal"$|#include "/etc/= collectd.d/collectd.thermal"|g' /etc/collectd.conf > else > - sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.th= ermal"|g' /etc/collectd.conf > + sed -i -e 's|^#include "/etc/collectd.d/collectd.thermal"$|include "/etc/= collectd.d/collectd.thermal"|g' /etc/collectd.conf > fi >=20 > # Enable cpufreq plugin if cpufreq found > --=20 > 2.45.2 >=20 --===============5264272639781337704==--