From 2b221b5b06e11b2c54537c05d8bd1accb665aa4c Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 20 Sep 2019 15:21:36 +0200 Subject: [PATCH 1/3] collectd: add logfile plugin definitions Signed-off-by: Florian Eckert --- .../files/usr/share/collectd/plugin/logfile.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 utils/collectd/files/usr/share/collectd/plugin/logfile.json diff --git a/utils/collectd/files/usr/share/collectd/plugin/logfile.json b/utils/collectd/files/usr/share/collectd/plugin/logfile.json new file mode 100644 index 000000000..fd1608497 --- /dev/null +++ b/utils/collectd/files/usr/share/collectd/plugin/logfile.json @@ -0,0 +1,9 @@ +{ + "string": [ + "LogLevel", + "File" + ], + "bool": [ + "Timestamp" + ] +} From f4349995e640e69b2dcd10850b06b44430635dd7 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 20 Sep 2019 15:46:53 +0200 Subject: [PATCH 2/3] collectd: add reload and service trigger Signed-off-by: Florian Eckert --- utils/collectd/files/collectd.init | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init index 89715d4c4..89af365c2 100644 --- a/utils/collectd/files/collectd.init +++ b/utils/collectd/files/collectd.init @@ -333,6 +333,11 @@ process_config() { config_foreach process_plugins plugin } +service_triggers() +{ + procd_add_reload_trigger "collectd" +} + start_service() { process_config @@ -345,3 +350,7 @@ start_service() { procd_set_param respawn procd_close_instance } + +reload_service() { + restart "$@" +} From b84edbe2c775c8ab3a2452d3e73c7d337a2f31d2 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 20 Sep 2019 16:12:26 +0200 Subject: [PATCH 3/3] collectd: bump PKG_PACKAGE version 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 830804886..02b1b5397 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.9.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \