Re: [PATCH 1/3] collectd: Fixes bug13832 - uncomments include openvpn plugin only if openvpn is running

[Michael Tremer <michael.tremer@ipfire.org>]

Hello Adolf,

In this patch you are checking whether OpenVPN is actually running.

Should we not check whether it is enabled? That would avoid any kind of races that we might see when collectd is being started before OpenVPN.

-Michael

> On 17 Mar 2025, at 19:51, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - Added code to check if openvpn.pid exists and only then uncomment the include openvpn
>   plugin line in collectd.conf
> - Tested out on my vm testbed and the include openvpn plugin line in collectd.conf is
>   only uncommented if the openvpn server is run ning and has a pid.
> 
> Fixes: Bug13832
> Tested-by: Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> src/initscripts/system/collectd | 7 +++++++
> 1 file changed, 7 insertions(+)
> 
> diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
> index 263511fc7..f86b64e9d 100644
> --- a/src/initscripts/system/collectd
> +++ b/src/initscripts/system/collectd
> @@ -143,6 +143,13 @@ case "$1" in
> sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
> fi
> 
> + # Enable openvpn plugin if openvpn.pid found
> + if [ ! -e /var/run/openvpn.pid ]; then
> + sed -i -e 's|^include "/etc/collectd.vpn"$|#include "/etc/collectd.vpn"|g' /etc/collectd.conf
> + else
> + sed -i -e 's|^#include "/etc/collectd.vpn"$|include "/etc/collectd.vpn"|g' /etc/collectd.conf
> + fi
> +
> if [ $(date +%Y) -gt 2011 ]; then
> boot_mesg "Starting Collection daemon..."
> /usr/sbin/collectd -C /etc/collectd.conf
> -- 
> 2.49.0
> 
>