Merge pull request #483 from ktsaou/master

allow cookies on all requests; respect DoNotTrack; generate SVG badges

diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
new file mode 100644 (file)
index 0000000..c5ed747
--- /dev/null
+++ b/charts.d/exim.chart.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+exim_command=
+
+# how frequently to collect queue size
+exim_update_every=5
+
+exim_priority=60000
+
+exim_check() {
+       if [ -z "$exim_command" -o ! -x "$exim_command" ]
+               then
+               local d=
+               for d in /sbin /usr/sbin /usr/local/sbin
+               do
+                       if [ -x "$d/exim" ]
+                       then
+                               exim_command="$d/exim"
+                               break
+                       fi
+               done
+       fi
+
+       if [ -z "$exim_command" -o ! -x  "$exim_command" ]
+       then
+               echo >&2 "$PROGRAM_NAME: exim: cannot find exim executable. Please set 'exim_command=/path/to/exim' in $confd/exim.conf"
+               return 1
+       fi
+
+       if [ `$exim_command -bpc 2>&1 | grep -c denied` -ne 0 ]
+       then
+               echo >&2 "$PROGRAM_NAME: exim: permission denied. Please set 'queue_list_requires_admin = false' in your exim options file"
+               return 1
+       fi
+
+       return 0
+}
+
+exim_create() {
+cat <<EOF
+CHART exim.qemails '' "Exim Queue Emails" "emails" queue exim.queued.emails line $((exim_priority + 1)) $exim_update_every
+DIMENSION emails '' absolute 1 1
+EOF
+return 0
+}
+
+exim_update() {
+echo "BEGIN exim.qemails $1"
+echo "SET emails = " `$exim_command -bpc`
+echo "END"
+return 0
+}

diff --git a/netdata-installer.sh b/netdata-installer.sh
index f8abd5b0d388ac01f59ac3dbc6547874952724a6..f07da52de239cb4f382d4ce7c4d39a9ec43e2338 100755 (executable)
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -897,7 +897,7 @@ cat <<-END
        -------------------------------------------------------------------------------
 
        INFO: Command line options changed. -pidfile, -nd and -ch are deprecated.
-       If you use custom stratup scripts please run netdata -h to see the 
+       If you use custom startup scripts, please run netdata -h to see the 
        corresponding options and update your scripts.
 
        Hit http://${access}:${NETDATA_PORT}/ from your browser.