From 50485bedfd9818165aa1d039d0abe95a559134b7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:31:03 +0100
Subject: Merging upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/charts.d.plugin/exim/README.md     |  6 +++++-
 collectors/charts.d.plugin/exim/exim.chart.sh | 26 ++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'collectors/charts.d.plugin/exim')

diff --git a/collectors/charts.d.plugin/exim/README.md b/collectors/charts.d.plugin/exim/README.md
index d82951aac..b4c853895 100644
--- a/collectors/charts.d.plugin/exim/README.md
+++ b/collectors/charts.d.plugin/exim/README.md
@@ -1,2 +1,6 @@
+# exim
+
 > THIS MODULE IS OBSOLETE.
-> USE THE PYTHON ONE - IT SUPPORTS MULTIPLE JOBS AND IT IS MORE EFFICIENT
+> USE [THE PYTHON ONE](../../python.d.plugin/exim) - IT SUPPORTS MULTIPLE JOBS AND IT IS MORE EFFICIENT
+
+[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fcharts.d.plugin%2Fexim%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/charts.d.plugin/exim/exim.chart.sh b/collectors/charts.d.plugin/exim/exim.chart.sh
index 8099a7249..7b0ef70d2 100644
--- a/collectors/charts.d.plugin/exim/exim.chart.sh
+++ b/collectors/charts.d.plugin/exim/exim.chart.sh
@@ -17,14 +17,12 @@ exim_update_every=5
 exim_priority=60000
 
 exim_check() {
-    if [ -z "${exim_command}" ]
-    then
-        require_cmd exim || return 1
-        exim_command="${EXIM_CMD}"
-    fi
-
-	if [ "$(${exim_command} -bpc 2>&1 | grep -c denied)" -ne 0 ]
-	then
+	if [ -z "${exim_command}" ]; then
+		require_cmd exim || return 1
+		exim_command="${EXIM_CMD}"
+	fi
+
+	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
 	fi
@@ -33,16 +31,16 @@ exim_check() {
 }
 
 exim_create() {
-    cat <<EOF
+	cat <<EOF
 CHART exim_local.qemails '' "Exim Queue Emails" "emails" queue exim.queued.emails line $((exim_priority + 1)) $exim_update_every
 DIMENSION emails '' absolute 1 1
 EOF
-    return 0
+	return 0
 }
 
 exim_update() {
-    echo "BEGIN exim_local.qemails $1"
-    echo "SET emails = $(run "${exim_command}" -bpc)"
-    echo "END"
-    return 0
+	echo "BEGIN exim_local.qemails $1"
+	echo "SET emails = $(run "${exim_command}" -bpc)"
+	echo "END"
+	return 0
 }
-- 
cgit v1.2.3