diff options
| author | Lennart Weller <lhw@ring0.de> | 2017-01-24 15:21:16 +0000 |
|---|---|---|
| committer | Lennart Weller <lhw@ring0.de> | 2017-01-24 15:21:16 +0000 |
| commit | ef0c127e7f95d2db2715b9e99fe758eebc7dabd3 (patch) | |
| tree | ea5d62342aba06f376f3be63aab898503b56f3ec /charts.d/nginx.chart.sh | |
| parent | update watch file and files-exclude (diff) | |
| parent | New upstream version 1.5.0+dfsg (diff) | |
| download | netdata-ef0c127e7f95d2db2715b9e99fe758eebc7dabd3.tar.xz netdata-ef0c127e7f95d2db2715b9e99fe758eebc7dabd3.zip | |
Merge tag 'upstream/1.5.0+dfsg'
Upstream version 1.5.0+dfsg
Diffstat (limited to 'charts.d/nginx.chart.sh')
| -rwxr-xr-x | charts.d/nginx.chart.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh index a2a9b320..0ae7d630 100755 --- a/charts.d/nginx.chart.sh +++ b/charts.d/nginx.chart.sh @@ -1,5 +1,11 @@ # 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+ +# + # if this chart is called X.chart.sh, then all functions and global variables # must start with X_ @@ -20,7 +26,7 @@ nginx_reading=0 nginx_writing=0 nginx_waiting=0 nginx_get() { - nginx_response=($(curl -Ss ${nginx_curl_opts} "${nginx_url}")) + nginx_response=($(run curl -Ss ${nginx_curl_opts} "${nginx_url}")) [ $? -ne 0 -o "${#nginx_response[@]}" -eq 0 ] && return 1 if [ "${nginx_response[0]}" != "Active" \ @@ -34,7 +40,7 @@ nginx_get() { -o "${nginx_response[14]}" != "Waiting:" \ ] then - echo >&2 "nginx: Invalid response from nginx server: ${nginx_response[*]}" + error "Invalid response from nginx server: ${nginx_response[*]}" return 1 fi @@ -55,7 +61,7 @@ nginx_get() { -o -z "${nginx_waiting}" \ ] then - echo >&2 "nginx: empty values got from nginx server: ${nginx_response[*]}" + error "empty values got from nginx server: ${nginx_response[*]}" return 1 fi @@ -68,7 +74,7 @@ nginx_check() { nginx_get if [ $? -ne 0 ] then - echo >&2 "nginx: cannot find stub_status on URL '${nginx_url}'. Please set nginx_url='http://nginx.server/stub_status' in $confd/nginx.conf" + error "cannot find stub_status on URL '${nginx_url}'. Please set nginx_url='http://nginx.server/stub_status' in $confd/nginx.conf" return 1 fi |