charts.d can be added multiple times

diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
index fad8f9f7a31dfea7dc3ddcee9e716aa53e556446..ac262f2678595a646db79408798a7a8608aaf209 100755 (executable)
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -16,6 +16,10 @@ EOF
 }
 
 squid_check() {
+       require_cmd nc    || return 1
+       require_cmd sed   || return 1
+       require_cmd egrep || return 1
+
        squid_url="cache_object://$squid_host:$squid_port/counters"
 
        # check once if the url works

diff --git a/plugins.d/charts.d.plugin b/plugins.d/charts.d.plugin
index 769d5ba69c995a80e962dc6e9d7cc483fcdfa400..081752e7e81add6033221e779ea440a1a8f6a3df 100755 (executable)
--- a/plugins.d/charts.d.plugin
+++ b/plugins.d/charts.d.plugin
@@ -1,7 +1,15 @@
 #!/bin/bash
 
 PROGRAM_FILE="$0"
-PROGRAM_NAME="charts.d"
+PROGRAM_NAME="$(basename $0)"
+PROGRAM_NAME="${PROGRAM_NAME/.plugin}"
+
+# if you need to run parallel charts.d processes
+# just link this files with a different name
+# in the same directory, with a .plugin suffix
+# netdata will start multiple of them
+# each will have a different config file
+
 echo >&2 "$PROGRAM_NAME: started from '$PROGRAM_FILE' with options: $*"
 
 if [ $(( ${BASH_VERSINFO[0]} )) -lt 4 ]
@@ -47,7 +55,8 @@ pluginsd="${NETDATA_PLUGINS_DIR}"
 
 confd="${NETDATA_CONFIG_DIR-/etc/netdata}"
 chartsd="$pluginsd/../charts.d"
-myconfig="$confd/charts.d.conf"
+
+myconfig="$confd/$PROGRAM_NAME.conf"
 
 minimum_update_frequency="${NETDATA_UPDATE_EVERY-1}"
 update_every=${minimum_update_frequency}       # this will be overwritten by the command line
@@ -331,9 +340,9 @@ trap chartsd_cleanup INT
 
 if [ $UID = "0" ]
 then
-       TMP_DIR="$( mktemp -d /var/run/netdata-charts.d-XXXXXXXXXX )"
+       TMP_DIR="$( mktemp -d /var/run/netdata-${PROGRAM_NAME}-XXXXXXXXXX )"
 else
-       TMP_DIR="$( mktemp -d /tmp/.netdata-charts.d-XXXXXXXXXX )"
+       TMP_DIR="$( mktemp -d /tmp/.netdata-${PROGRAM_NAME}-XXXXXXXXXX )"
 fi
 
 cd "$TMP_DIR" || exit 1