webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

collectd: Fixes bug-13074, create collectd.d directory

Browse Source 
- 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@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2024-08-07 14:16:45 +02:00
committed by Michael Tremer
parent befebc44b4
commit 5b75ddfff2
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/collectd/collectd.conf
View File

@@ -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/*"

1
config/collectd/collectd.custom
View File

@@ -1 +0,0 @@
# Use this file to add custom configs and rules for collectd

2
config/rootfiles/common/collectd
View File

@@ -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

3
lfs/collectd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2024 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 #
@@ -129,6 +129,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

5
src/initscripts/system/collectd
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2024 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 #
@@ -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