Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 26 insertions, 11 deletions

diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
index c0532fab1..976ce91b1 100755
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_
@@ -8,6 +8,7 @@
 # you can see, https://easyengine.io/tutorials/php/fpm-status-page/
 
 declare -A phpfpm_urls=()
+declare -A phpfpm_curl_opts=()
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
@@ -29,8 +30,9 @@ phpfpm_max_active_processes=0
 phpfpm_max_children_reached=0
 phpfpm_slow_requests=0
 phpfpm_get() {
-	url=$1
-	phpfpm_response=($(curl -Ss "${url}"))
+	local opts="${1}" url="${2}"
+
+	phpfpm_response=($(curl -Ss ${opts} "${url}"))
 	[ $? -ne 0 -o "${#phpfpm_response[@]}" -eq 0 ] && return 1
 
 	if [[ "${phpfpm_response[0]}" != "pool:" \
@@ -42,7 +44,6 @@ phpfpm_get() {
 		|| "${phpfpm_response[26]}" != "idle" \
 		|| "${phpfpm_response[29]}" != "active" \
 		|| "${phpfpm_response[32]}" != "total" \
-		|| "${phpfpm_response[43]}" != "slow" \
 	]]
 		then
 		echo >&2 "phpfpm: invalid response from phpfpm status server: ${phpfpm_response[*]}"
@@ -61,7 +62,12 @@ phpfpm_get() {
 	phpfpm_total_processes="${phpfpm_response[34]}"
 	phpfpm_max_active_processes="${phpfpm_response[38]}"
 	phpfpm_max_children_reached="${phpfpm_response[42]}"
-	phpfpm_slow_requests="${phpfpm_response[45]}"
+	if [ "${phpfpm_response[43]}" == "slow" ]
+		then
+	  	phpfpm_slow_requests="${phpfpm_response[45]}"
+	else
+	  	phpfpm_slow_requests="-1"
+	fi
 	
 	if [[ -z "${phpfpm_pool}" \
 		|| -z "${phpfpm_start_time}" \
@@ -75,7 +81,6 @@ phpfpm_get() {
 		|| -z "${phpfpm_total_processes}" \
 		|| -z "${phpfpm_max_active_processes}" \
 		|| -z "${phpfpm_max_children_reached}" \
-		|| -z "${phpfpm_slow_requests}" \
 	]]
 		then
 		echo >&2 "phpfpm: empty values got from phpfpm status server: ${phpfpm_response[*]}"
@@ -94,7 +99,7 @@ phpfpm_check() {
 	local m
 	for m in "${!phpfpm_urls[@]}"
 	do
-		phpfpm_get "${phpfpm_urls[$m]}"
+		phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
 		if [ $? -ne 0 ]; then
 			echo >&2 "phpfpm: cannot find status on URL '${phpfpm_url[$m]}'. Please set phpfpm_urls[$m]='http://localhost/status' in $confd/phpfpm.conf"
 			unset phpfpm_urls[$m]
@@ -130,8 +135,11 @@ DIMENSION requests '' incremental 1 1
 
 CHART phpfpm_$m.performance '' "PHP-FPM Performance" "status" phpfpm phpfpm.performance line $((phpfpm_priority + 3)) $phpfpm_update_every
 DIMENSION reached 'max children reached' absolute 1 1
-DIMENSION slow 'slow requests' absolute 1 1
 EOF
+		if [ $((phpfpm_slow_requests)) -ne -1 ]
+			then
+			echo "DIMENSION slow 'slow requests' absolute 1 1"
+		fi
 	done
 	
 	return 0
@@ -149,7 +157,7 @@ phpfpm_update() {
 	local m
 	for m in "${!phpfpm_urls[@]}"
 	do
-		phpfpm_get "${phpfpm_urls[$m]}"
+		phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
 		if [ $? -ne 0 ]; then
 			continue
 		fi
@@ -166,10 +174,17 @@ SET requests = $((phpfpm_accepted_conn))
 END
 BEGIN phpfpm_$m.performance $1
 SET reached = $((phpfpm_max_children_reached))
-SET slow = $((phpfpm_slow_requests))
-END
 EOF
+		if [ $((phpfpm_slow_requests)) -ne -1 ]
+			then
+			echo "SET slow = $((phpfpm_slow_requests))"
+		fi
+		echo "END"
 	done
 	
 	return 0
 }
+
+phpfpm_check
+phpfpm_create
+phpfpm_update