Merge pull request #690 from paulfantom/master

add `_local` to postfix and exim bash scripts

diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
index 681651a0df303e5c46325b61409592379a78c633..14af66b89fd3a92ef1a4214ecc855e42895004ec 100755 (executable)
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -165,27 +165,27 @@ apache_check() {
 # _create is called once, to create the charts
 apache_create() {
        cat <<EOF
-CHART apache.bytesperreq '' "apache Lifetime Avg. Response Size" "bytes/request" statistics apache.bytesperreq area $((apache_priority + 8)) $apache_update_every
+CHART apache_local.bytesperreq '' "apache Lifetime Avg. Response Size" "bytes/request" statistics apache.bytesperreq area $((apache_priority + 8)) $apache_update_every
 DIMENSION size '' absolute 1 ${apache_decimal_detail}
-CHART apache.workers '' "apache Workers" "workers" workers apache.workers stacked $((apache_priority + 5)) $apache_update_every
+CHART apache_local.workers '' "apache Workers" "workers" workers apache.workers stacked $((apache_priority + 5)) $apache_update_every
 DIMENSION idle '' absolute 1 1
 DIMENSION busy '' absolute 1 1
-CHART apache.reqpersec '' "apache Lifetime Avg. Requests/s" "requests/s" statistics apache.reqpersec line $((apache_priority + 6)) $apache_update_every
+CHART apache_local.reqpersec '' "apache Lifetime Avg. Requests/s" "requests/s" statistics apache.reqpersec line $((apache_priority + 6)) $apache_update_every
 DIMENSION requests '' absolute 1 ${apache_decimal_detail}
-CHART apache.bytespersec '' "apache Lifetime Avg. Bandwidth/s" "kilobits/s" statistics apache.bytespersec area $((apache_priority + 7)) $apache_update_every
+CHART apache_local.bytespersec '' "apache Lifetime Avg. Bandwidth/s" "kilobits/s" statistics apache.bytespersec area $((apache_priority + 7)) $apache_update_every
 DIMENSION sent '' absolute 8 $((apache_decimal_detail * 1000))
-CHART apache.requests '' "apache Requests" "requests/s" requests apache.requests line $((apache_priority + 1)) $apache_update_every
+CHART apache_local.requests '' "apache Requests" "requests/s" requests apache.requests line $((apache_priority + 1)) $apache_update_every
 DIMENSION requests '' incremental 1 1
-CHART apache.net '' "apache Bandwidth" "kilobits/s" bandwidth apache.net area $((apache_priority + 3)) $apache_update_every
+CHART apache_local.net '' "apache Bandwidth" "kilobits/s" bandwidth apache.net area $((apache_priority + 3)) $apache_update_every
 DIMENSION sent '' incremental 8 1
 EOF
 
        if [ ${apache_has_conns} -eq 1 ]
                then
                cat <<EOF2
-CHART apache.connections '' "apache Connections" "connections" connections apache.connections line $((apache_priority + 2)) $apache_update_every
+CHART apache_local.connections '' "apache Connections" "connections" connections apache.connections line $((apache_priority + 2)) $apache_update_every
 DIMENSION connections '' absolute 1 1
-CHART apache.conns_async '' "apache Async Connections" "connections" connections apache.conns_async stacked $((apache_priority + 4)) $apache_update_every
+CHART apache_local.conns_async '' "apache Async Connections" "connections" connections apache.conns_async stacked $((apache_priority + 4)) $apache_update_every
 DIMENSION keepalive '' absolute 1 1
 DIMENSION closing '' absolute 1 1
 DIMENSION writing '' absolute 1 1
@@ -209,22 +209,22 @@ apache_update() {
 
        # write the result of the work.
        cat <<VALUESEOF
-BEGIN apache.requests $1
+BEGIN apache_local.requests $1
 SET requests = $((apache_accesses))
 END
-BEGIN apache.net $1
+BEGIN apache_local.net $1
 SET sent = $((apache_kbytes))
 END
-BEGIN apache.reqpersec $1
+BEGIN apache_local.reqpersec $1
 SET requests = $((apache_reqpersec))
 END
-BEGIN apache.bytespersec $1
+BEGIN apache_local.bytespersec $1
 SET sent = $((apache_bytespersec))
 END
-BEGIN apache.bytesperreq $1
+BEGIN apache_local.bytesperreq $1
 SET size = $((apache_bytesperreq))
 END
-BEGIN apache.workers $1
+BEGIN apache_local.workers $1
 SET idle = $((apache_idleworkers))
 SET busy = $((apache_busyworkers))
 END
@@ -233,10 +233,10 @@ VALUESEOF
        if [ ${apache_has_conns} -eq 1 ]
                then
        cat <<VALUESEOF2
-BEGIN apache.connections $1
+BEGIN apache_local.connections $1
 SET connections = $((apache_connstotal))
 END
-BEGIN apache.conns_async $1
+BEGIN apache_local.conns_async $1
 SET keepalive = $((apache_connsasynckeepalive))
 SET closing = $((apache_connsasyncclosing))
 SET writing = $((apache_connsasyncwriting))

diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
index c5ed747b89941bdcfb59f551d24b5767eae3b276..e436ce8f207d10fc3e3a09599c74e4023656b8a5 100644 (file)
--- a/charts.d/exim.chart.sh
+++ b/charts.d/exim.chart.sh
@@ -38,14 +38,14 @@ exim_check() {
 
 exim_create() {
 cat <<EOF
-CHART exim.qemails '' "Exim Queue Emails" "emails" queue exim.queued.emails line $((exim_priority + 1)) $exim_update_every
+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
 }
 
 exim_update() {
-echo "BEGIN exim.qemails $1"
+echo "BEGIN exim_local.qemails $1"
 echo "SET emails = " `$exim_command -bpc`
 echo "END"
 return 0

diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
index f4f710275432ec52c3eed037feec626c5401ea24..e705733cb7b909032956e922de262856f59d8856 100755 (executable)
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -43,9 +43,9 @@ postfix_check() {
 
 postfix_create() {
 cat <<EOF
-CHART postfix.qemails '' "Postfix Queue Emails" "emails" queue postfix.queued.emails line $((postfix_priority + 1)) $postfix_update_every
+CHART postfix_local.qemails '' "Postfix Queue Emails" "emails" queue postfix.queued.emails line $((postfix_priority + 1)) $postfix_update_every
 DIMENSION emails '' absolute 1 1
-CHART postfix.qsize '' "Postfix Queue Emails Size" "emails size in KB" queue postfix.queued.size area $((postfix_priority + 2)) $postfix_update_every
+CHART postfix_local.qsize '' "Postfix Queue Emails Size" "emails size in KB" queue postfix.queued.size area $((postfix_priority + 2)) $postfix_update_every
 DIMENSION size '' absolute 1 1
 EOF
 
@@ -80,10 +80,10 @@ postfix_update() {
 
        # write the result of the work.
        cat <<VALUESEOF
-BEGIN postfix.qemails $1
+BEGIN postfix_local.qemails $1
 SET emails = $postfix_q_emails
 END
-BEGIN postfix.qsize $1
+BEGIN postfix_local.qsize $1
 SET size = $postfix_q_size
 END
 VALUESEOF

diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
index 0eca99bc348ee235b17ce687800f90e06439e5d8..cc9ddfef2013a4dc4bd218c9c919e041e7a21056 100755 (executable)
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -63,21 +63,21 @@ squid_check() {
 squid_create() {
        # create the charts
        cat <<EOF
-CHART squid.clients_net '' "Squid Client Bandwidth" "kilobits / sec" clients squid.clients.net area $((squid_priority + 1)) $squid_update_every
+CHART squid_local.clients_net '' "Squid Client Bandwidth" "kilobits / sec" clients squid.clients.net area $((squid_priority + 1)) $squid_update_every
 DIMENSION client_http_kbytes_in in incremental 8 1
 DIMENSION client_http_kbytes_out out incremental -8 1
 DIMENSION client_http_hit_kbytes_out hits incremental -8 1
 
-CHART squid.clients_requests '' "Squid Client Requests" "requests / sec" clients squid.clients.requests line $((squid_priority + 3)) $squid_update_every
+CHART squid_local.clients_requests '' "Squid Client Requests" "requests / sec" clients squid.clients.requests line $((squid_priority + 3)) $squid_update_every
 DIMENSION client_http_requests requests incremental 1 1
 DIMENSION client_http_hits hits incremental 1 1
 DIMENSION client_http_errors errors incremental -1 1
 
-CHART squid.servers_net '' "Squid Server Bandwidth" "kilobits / sec" servers squid.servers.net area $((squid_priority + 2)) $squid_update_every
+CHART squid_local.servers_net '' "Squid Server Bandwidth" "kilobits / sec" servers squid.servers.net area $((squid_priority + 2)) $squid_update_every
 DIMENSION server_all_kbytes_in in incremental 8 1
 DIMENSION server_all_kbytes_out out incremental -8 1
 
-CHART squid.servers_requests '' "Squid Server Requests" "requests / sec" servers squid.servers.requests line $((squid_priority + 4)) $squid_update_every
+CHART squid_local.servers_requests '' "Squid Server Requests" "requests / sec" servers squid.servers.requests line $((squid_priority + 4)) $squid_update_every
 DIMENSION server_all_requests requests incremental 1 1
 DIMENSION server_all_errors errors incremental -1 1
 EOF
@@ -111,24 +111,24 @@ squid_update() {
 
        # write the result of the work.
        cat <<VALUESEOF
-BEGIN squid.clients_net $1
+BEGIN squid_local.clients_net $1
 SET client_http_kbytes_in = $squid_client_http_kbytes_in
 SET client_http_kbytes_out = $squid_client_http_kbytes_out
 SET client_http_hit_kbytes_out = $squid_client_http_hit_kbytes_out
 END
 
-BEGIN squid.clients_requests $1
+BEGIN squid_local.clients_requests $1
 SET client_http_requests = $squid_client_http_requests
 SET client_http_hits = $squid_client_http_hits
 SET client_http_errors = $squid_client_http_errors
 END
 
-BEGIN squid.servers_net $1
+BEGIN squid_local.servers_net $1
 SET server_all_kbytes_in = $squid_server_all_kbytes_in
 SET server_all_kbytes_out = $squid_server_all_kbytes_out
 END
 
-BEGIN squid.servers_requests $1
+BEGIN squid_local.servers_requests $1
 SET server_all_requests = $squid_server_all_requests
 SET server_all_errors = $squid_server_all_errors
 END