X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fapache.chart.sh;h=b503e74e3d2cdb8e8acd25e937c23d19aea858e9;hb=0711ceaacadf4b435b11377ce9f0e65392675d2a;hp=20c59afabb152a4a74094385c9445f437b8f46f4;hpb=4816f581ba1103f0b8d3923b51f1538f109da5ab;p=netdata.git

diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
old mode 100755
new mode 100644
index 20c59afa..b503e74e
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -1,12 +1,21 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
+
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
 
 # the URL to download apache status info
 apache_url="http://127.0.0.1:80/server-status?auto"
+apache_curl_opts=
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
 apache_update_every=
 
+apache_priority=60000
+
 # convert apache floating point values
 # to integer using this multiplier
 # this only affects precision - the values
@@ -45,38 +54,33 @@ apache_detect() {
 	for x in "${@}"
 	do
 		case "${x}" in
-			'Total Accesses') 		apache_key_accesses=$[i + 1] ;;
-			'Total kBytes') 		apache_key_kbytes=$[i + 1] ;;
-			'ReqPerSec') 			apache_key_reqpersec=$[i + 1] ;;
-			'BytesPerSec')			apache_key_bytespersec=$[i + 1] ;;
-			'BytesPerReq')			apache_key_bytesperreq=$[i + 1] ;;
-			'BusyWorkers')			apache_key_busyworkers=$[i + 1] ;;
-			'IdleWorkers')			apache_key_idleworkers=$[i + 1];;
-			'ConnsTotal')			apache_key_connstotal=$[i + 1] ;;
-			'ConnsAsyncWriting')	apache_key_connsasyncwriting=$[i + 1] ;;
-			'ConnsAsyncKeepAlive')	apache_key_connsasynckeepalive=$[i + 1] ;;
-			'ConnsAsyncClosing')	apache_key_connsasyncclosing=$[i + 1] ;;
-			'Scoreboard')			apache_key_scoreboard=$[i] ;;
+			'Total Accesses') 		apache_key_accesses=$((i + 1)) ;;
+			'Total kBytes') 		apache_key_kbytes=$((i + 1)) ;;
+			'ReqPerSec') 			apache_key_reqpersec=$((i + 1)) ;;
+			'BytesPerSec')			apache_key_bytespersec=$((i + 1)) ;;
+			'BytesPerReq')			apache_key_bytesperreq=$((i + 1)) ;;
+			'BusyWorkers')			apache_key_busyworkers=$((i + 1)) ;;
+			'IdleWorkers')			apache_key_idleworkers=$((i + 1));;
+			'ConnsTotal')			apache_key_connstotal=$((i + 1)) ;;
+			'ConnsAsyncWriting')	apache_key_connsasyncwriting=$((i + 1)) ;;
+			'ConnsAsyncKeepAlive')	apache_key_connsasynckeepalive=$((i + 1)) ;;
+			'ConnsAsyncClosing')	apache_key_connsasyncclosing=$((i + 1)) ;;
+			'Scoreboard')			apache_key_scoreboard=$((i)) ;;
 		esac
 
-		i=$[i + 1]
+		i=$((i + 1))
 	done
 
 	# we will not check of the Conns*
 	# keys, since these are apache 2.4 specific
-	if [ -z "${apache_key_accesses}" \
-		-o -z "${apache_key_kbytes}" \
-		-o -z "${apache_key_reqpersec}" \
-		-o -z "${apache_key_bytespersec}" \
-		-o -z "${apache_key_bytesperreq}" \
-		-o -z "${apache_key_busyworkers}" \
-		-o -z "${apache_key_idleworkers}" \
-		-o -z "${apache_key_scoreboard}" \
-		]
-		then
-		echo >&2 "apache: Invalid response or missing keys from apache server: ${*}"
-		return 1
-	fi
+	[ -z "${apache_key_accesses}"    ] && error "missing 'Total Accesses' from apache server: ${*}" && return 1
+	[ -z "${apache_key_kbytes}"      ] && error "missing 'Total kBytes' from apache server: ${*}" && return 1
+	[ -z "${apache_key_reqpersec}"   ] && error "missing 'ReqPerSec' from apache server: ${*}" && return 1
+	[ -z "${apache_key_bytespersec}" ] && error "missing 'BytesPerSec' from apache server: ${*}" && return 1
+	[ -z "${apache_key_bytesperreq}" ] && error "missing 'BytesPerReq' from apache server: ${*}" && return 1
+	[ -z "${apache_key_busyworkers}" ] && error "missing 'BusyWorkers' from apache server: ${*}" && return 1
+	[ -z "${apache_key_idleworkers}" ] && error "missing 'IdleWorkers' from apache server: ${*}" && return 1
+	[ -z "${apache_key_scoreboard}"  ] && error "missing 'Scoreboard' from apache server: ${*}" && return 1
 
 	if [ ! -z "${apache_key_connstotal}" \
 		-a ! -z "${apache_key_connsasyncwriting}" \
@@ -85,6 +89,8 @@ apache_detect() {
 		]
 		then
 		apache_has_conns=1
+	else
+		apache_has_conns=0
 	fi
 
 	return 0
@@ -92,7 +98,7 @@ apache_detect() {
 
 apache_get() {
 	local oIFS="${IFS}" ret
-	IFS=$':\n' apache_response=($(curl -s "${apache_url}"))
+	IFS=$':\n' apache_response=($(run curl -Ss ${apache_curl_opts} "${apache_url}"))
 	ret=$?
 	IFS="${oIFS}"
 
@@ -130,7 +136,7 @@ apache_get() {
 		-o -z "${apache_idleworkers}" \
 		]
 		then
-		echo >&2 "apache: empty values got from apache server: ${apache_response[*]}"
+		error "empty values got from apache server: ${apache_response[*]}"
 		return 1
 	fi
 
@@ -151,7 +157,7 @@ apache_check() {
 	apache_get
 	if [ $? -ne 0 ]
 		then
-		echo >&2 "apache: cannot find stub_status on URL '${apache_url}'. Please set apache_url='http://apache.server:80/server-status?auto' in $confd/apache.conf"
+		error "cannot find stub_status on URL '${apache_url}'. Please set apache_url='http://apache.server:80/server-status?auto' in $confd/apache.conf"
 		return 1
 	fi
 
@@ -165,27 +171,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" apache apache area 16008 $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" apache apache stacked 16005 $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" apache apache line 16006 $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" apache apache area 16007 $apache_update_every
-DIMENSION sent '' absolute 8 $[apache_decimal_detail * 1000]
-CHART apache.requests '' "apache Requests" "requests/s" apache apache line 16001 $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_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" apache apache area 16003 $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" apache apache line 16002 $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" apache apache stacked 16004 $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,37 +215,37 @@ apache_update() {
 
 	# write the result of the work.
 	cat <<VALUESEOF
-BEGIN apache.requests $1
-SET requests = $[apache_accesses]
+BEGIN apache_local.requests $1
+SET requests = $((apache_accesses))
 END
-BEGIN apache.net $1
-SET sent = $[apache_kbytes]
+BEGIN apache_local.net $1
+SET sent = $((apache_kbytes))
 END
-BEGIN apache.reqpersec $1
-SET requests = $[apache_reqpersec]
+BEGIN apache_local.reqpersec $1
+SET requests = $((apache_reqpersec))
 END
-BEGIN apache.bytespersec $1
-SET sent = $[apache_bytespersec]
+BEGIN apache_local.bytespersec $1
+SET sent = $((apache_bytespersec))
 END
-BEGIN apache.bytesperreq $1
-SET size = $[apache_bytesperreq]
+BEGIN apache_local.bytesperreq $1
+SET size = $((apache_bytesperreq))
 END
-BEGIN apache.workers $1
-SET idle = $[apache_idleworkers]
-SET busy = $[apache_busyworkers]
+BEGIN apache_local.workers $1
+SET idle = $((apache_idleworkers))
+SET busy = $((apache_busyworkers))
 END
 VALUESEOF
 
 	if [ ${apache_has_conns} -eq 1 ]
 		then
 	cat <<VALUESEOF2
-BEGIN apache.connections $1
-SET connections = $[apache_connstotal]
+BEGIN apache_local.connections $1
+SET connections = $((apache_connstotal))
 END
-BEGIN apache.conns_async $1
-SET keepalive = $[apache_connsasynckeepalive]
-SET closing = $[apache_connsasyncwriting]
-SET writing = $[apache_connsasyncwriting]
+BEGIN apache_local.conns_async $1
+SET keepalive = $((apache_connsasynckeepalive))
+SET closing = $((apache_connsasyncclosing))
+SET writing = $((apache_connsasyncwriting))
 END
 VALUESEOF2
 	fi