From 50f56c2ede8dc57464a94bdff4dce36ac3fe04dd Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 24 Jun 2020 16:09:56 +0200 Subject: [PATCH 1/3] collectd: move include line Currently the init script generates a config file from uci, that has the include line before the interval line. This means, that anything happening in the include directory does not yet see the changed Interval. Moving the include line before the uci generation process fix this issue. Signed-off-by: Florian Eckert --- utils/collectd/files/collectd.init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init index b07416f4e..7400194b0 100644 --- a/utils/collectd/files/collectd.init +++ b/utils/collectd/files/collectd.init @@ -310,10 +310,6 @@ process_config() { config_get BaseDir globals BaseDir "/var/run/collectd" printf "BaseDir \"%s\"\n" "$BaseDir" >> "$COLLECTD_CONF" - config_get Include globals Include "/tmp/collectd.d" - printf "Include \"%s\"\n" "$Include" >> "$COLLECTD_CONF" - mkdir -p "$Include" - config_get PIDFile globals PIDFile "/var/run/collectd.pid" printf "PIDFile \"%s\"\n" "$PIDFile" >> "$COLLECTD_CONF" @@ -332,6 +328,10 @@ process_config() { config_get Hostname globals Hostname "$(uname -n)" printf "Hostname \"%s\"\n" "$Hostname" >> "$COLLECTD_CONF" + config_get Include globals Include "/tmp/collectd.d" + printf "Include \"%s\"\n" "$Include" >> "$COLLECTD_CONF" + mkdir -p "$Include" + printf "\n" >> "$COLLECTD_CONF" # PLUGIN CONFIG From d2d62204769b62c3c4bb974dd3cf0c847b24c7b5 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 24 Jun 2020 16:13:32 +0200 Subject: [PATCH 2/3] collectd: remove quotation on interval this is an number The value is a number and not a string. Signed-off-by: Florian Eckert --- utils/collectd/files/collectd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init index 7400194b0..89fc6b2bb 100644 --- a/utils/collectd/files/collectd.init +++ b/utils/collectd/files/collectd.init @@ -320,7 +320,7 @@ process_config() { printf "TypesDB \"%s\"\n" "$TypesDB" >> "$COLLECTD_CONF" config_get Interval globals Interval 30 - printf "Interval \"%s\"\n" "$Interval" >> "$COLLECTD_CONF" + printf "Interval %s\n" "$Interval" >> "$COLLECTD_CONF" config_get ReadThreads globals ReadThreads 2 printf "ReadThreads \"%s\"\n" "$ReadThreads" >> "$COLLECTD_CONF" From 6d34208c5737d7b3f76fcf2146c4a22754dbe527 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 24 Jun 2020 20:10:07 +0200 Subject: [PATCH 3/3] collectd: update PKG_RELEASE Signed-off-by: Florian Eckert --- utils/collectd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index b2deb82d1..790e38f31 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.11.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \