From 8ab9fd7fff6f7ba432b6cf9bcaa0c58519aa399a Mon Sep 17 00:00:00 2001 From: Maxim Storchak Date: Tue, 5 Jan 2021 22:36:19 +0200 Subject: [PATCH] collectd: expose more global parameters to uci Signed-off-by: Maxim Storchak --- utils/collectd/files/collectd.init | 23 +++++++++++++++++++++-- utils/collectd/files/collectd.uci | 4 ++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init index ae3dba5cc..b8c0f368d 100644 --- a/utils/collectd/files/collectd.init +++ b/utils/collectd/files/collectd.init @@ -286,7 +286,8 @@ process_plugins() { process_config() { local alt_config_file BaseDir Include PIDFile PluginDir TypesDB - local Interval ReadThreads Hostname + local Interval ReadThreads WriteThreads Hostname + local WriteQueueLimitHigh WriteQueueLimitLow CollectInternalStats rm -f "$COLLECTD_CONF" @@ -321,7 +322,25 @@ process_config() { printf "Interval %s\n" "$Interval" >> "$COLLECTD_CONF" config_get ReadThreads globals ReadThreads 2 - printf "ReadThreads \"%s\"\n" "$ReadThreads" >> "$COLLECTD_CONF" + printf "ReadThreads %s\n" "$ReadThreads" >> "$COLLECTD_CONF" + + config_get WriteThreads globals WriteThreads 2 + printf "WriteThreads %s\n" "$WriteThreads" >> "$COLLECTD_CONF" + + config_get WriteQueueLimitLow globals WriteQueueLimitLow 0 + [ "$WriteQueueLimitLow" -ne 0 ] \ + && printf "WriteQueueLimitLow %s\n" "$WriteQueueLimitLow" >> "$COLLECTD_CONF" + + config_get WriteQueueLimitHigh globals WriteQueueLimitHigh 0 + [ "$WriteQueueLimitHigh" -ne 0 ] \ + && printf "WriteQueueLimitHigh %s\n" "$WriteQueueLimitHigh" >> "$COLLECTD_CONF" + + config_get_bool CollectInternalStats globals CollectInternalStats 0 + if [ "$CollectInternalStats" = "0" ]; then + printf "CollectInternalStats false\n" >> "$COLLECTD_CONF" + else + printf "CollectInternalStats true\n" >> "$COLLECTD_CONF" + fi config_get Hostname globals Hostname "$(uname -n)" printf "Hostname \"%s\"\n" "$Hostname" >> "$COLLECTD_CONF" diff --git a/utils/collectd/files/collectd.uci b/utils/collectd/files/collectd.uci index cde383511..685b3468b 100644 --- a/utils/collectd/files/collectd.uci +++ b/utils/collectd/files/collectd.uci @@ -7,6 +7,10 @@ config globals 'globals' # option TypesDB '/usr/share/collectd/types.db' # option Interval '30' # option ReadThreads '2' +# option WriteThreads '2' +# option WriteQueueLimitLow '0' +# option WriteQueueLimitHigh '0' +# option CollectInternalStats '0' #config plugin 'apcups' # option enable '0'