diff options
Diffstat (limited to '')
| -rw-r--r-- | collectors/charts.d.plugin/exim/Makefile.inc | 13 | ||||
| -rw-r--r-- | collectors/charts.d.plugin/exim/README.md | 2 | ||||
| -rw-r--r-- | collectors/charts.d.plugin/exim/exim.chart.sh (renamed from charts.d/exim.chart.sh) | 7 | ||||
| -rw-r--r-- | collectors/charts.d.plugin/exim/exim.conf (renamed from conf.d/charts.d/exim.conf) | 0 |
4 files changed, 19 insertions, 3 deletions
diff --git a/collectors/charts.d.plugin/exim/Makefile.inc b/collectors/charts.d.plugin/exim/Makefile.inc new file mode 100644 index 000000000..ca2112a80 --- /dev/null +++ b/collectors/charts.d.plugin/exim/Makefile.inc @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +# THIS IS NOT A COMPLETE Makefile +# IT IS INCLUDED BY ITS PARENT'S Makefile.am +# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT + +# install these files +dist_charts_DATA += exim/exim.chart.sh +dist_chartsconfig_DATA += exim/exim.conf + +# do not install these files, but include them in the distribution +dist_noinst_DATA += exim/README.md exim/Makefile.inc + diff --git a/collectors/charts.d.plugin/exim/README.md b/collectors/charts.d.plugin/exim/README.md new file mode 100644 index 000000000..d82951aac --- /dev/null +++ b/collectors/charts.d.plugin/exim/README.md @@ -0,0 +1,2 @@ +> THIS MODULE IS OBSOLETE. +> USE THE PYTHON ONE - IT SUPPORTS MULTIPLE JOBS AND IT IS MORE EFFICIENT diff --git a/charts.d/exim.chart.sh b/collectors/charts.d.plugin/exim/exim.chart.sh index 4c70f2c19..8099a7249 100644 --- a/charts.d/exim.chart.sh +++ b/collectors/charts.d.plugin/exim/exim.chart.sh @@ -1,9 +1,10 @@ +# shellcheck shell=bash # no need for shebang - this file is loaded from charts.d.plugin +# SPDX-License-Identifier: GPL-3.0-or-later # netdata # real-time performance and health monitoring, done right! # (C) 2016 Costa Tsaousis <costa@tsaousis.gr> -# GPL v3+ # # Contributed by @jsveiga with PR #480 @@ -22,7 +23,7 @@ exim_check() { exim_command="${EXIM_CMD}" fi - if [ $(${exim_command} -bpc 2>&1 | grep -c denied) -ne 0 ] + if [ "$(${exim_command} -bpc 2>&1 | grep -c denied)" -ne 0 ] then error "permission denied - please set 'queue_list_requires_admin = false' in your exim options file" return 1 @@ -41,7 +42,7 @@ EOF exim_update() { echo "BEGIN exim_local.qemails $1" - echo "SET emails = " $(run ${exim_command} -bpc) + echo "SET emails = $(run "${exim_command}" -bpc)" echo "END" return 0 } diff --git a/conf.d/charts.d/exim.conf b/collectors/charts.d.plugin/exim/exim.conf index f96ac4dbb..f96ac4dbb 100644 --- a/conf.d/charts.d/exim.conf +++ b/collectors/charts.d.plugin/exim/exim.conf |