-#!/bin/sh
+#!/bin/bash
# the URL to download apache status info
apache_url="http://127.0.0.1:80/server-status?auto"
# 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
apache_bytesperreq=0
apache_busyworkers=0
apache_idleworkers=0
+apache_connstotal=0
+apache_connsasyncwriting=0
+apache_connsasynckeepalive=0
+apache_connsasyncclosing=0
apache_keys_detected=0
+apache_has_conns=0
apache_key_accesses=
apache_key_kbytes=
apache_key_reqpersec=
apache_key_bytesperreq=
apache_key_busyworkers=
apache_key_idleworkers=
+apache_key_scoreboard=
apache_key_connstotal=
apache_key_connsasyncwriting=
apache_key_connsasynckeepalive=
for x in "${@}"
do
case "${x}" in
- 'Accesses:') apache_key_accesses=$[i + 1] ;;
- '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] ;;
+ '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]
-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
+ if [ ! -z "${apache_key_connstotal}" \
+ -a ! -z "${apache_key_connsasyncwriting}" \
+ -a ! -z "${apache_key_connsasynckeepalive}" \
+ -a ! -z "${apache_key_connsasyncclosing}" \
+ ]
+ then
+ apache_has_conns=1
+ fi
+
return 0
}
apache_get() {
- apache_response=($(curl -s "${apache_url}"))
- [ $? -ne 0 -o "${#apache_response[@]}" -eq 0 ] && return 1
+ local oIFS="${IFS}" ret
+ IFS=$':\n' apache_response=($(curl -Ss "${apache_url}"))
+ ret=$?
+ IFS="${oIFS}"
- if [ ${apache_keys_detected} -eq 0 ]
+ [ $ret -ne 0 -o "${#apache_response[@]}" -eq 0 ] && return 1
+
+ # the last line on the apache output is "Scoreboard"
+ # we use this label to detect that the output has a new word count
+ if [ ${apache_keys_detected} -eq 0 -o "${apache_response[${apache_key_scoreboard}]}" != "Scoreboard" ]
then
apache_detect "${apache_response[@]}" || return 1
apache_keys_detected=1
return 1
fi
+ if [ ${apache_has_conns} -eq 1 ]
+ then
+ apache_connstotal="${apache_response[${apache_key_connstotal}]}"
+ apache_connsasyncwriting="${apache_response[${apache_key_connsasyncwriting}]}"
+ apache_connsasynckeepalive="${apache_response[${apache_key_connsasynckeepalive}]}"
+ apache_connsasyncclosing="${apache_response[${apache_key_connsasyncclosing}]}"
+ fi
+
return 0
}
# _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.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.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.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
+CHART apache.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" apache apache line 16001 $apache_update_every
+CHART apache.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 16002 $apache_update_every
+CHART apache.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
+DIMENSION connections '' absolute 1 1
+CHART apache.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
+EOF2
+ fi
+
return 0
}
END
VALUESEOF
+ if [ ${apache_has_conns} -eq 1 ]
+ then
+ cat <<VALUESEOF2
+BEGIN apache.connections $1
+SET connections = $[apache_connstotal]
+END
+BEGIN apache.conns_async $1
+SET keepalive = $[apache_connsasynckeepalive]
+SET closing = $[apache_connsasyncwriting]
+SET writing = $[apache_connsasyncwriting]
+END
+VALUESEOF2
+ fi
+
return 0
}
projects / netdata.git / blobdiff