Adding upstream version 1.12.0.upstream/1.12.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 15 insertions, 40 deletions

diff --git a/collectors/charts.d.plugin/phpfpm/README.md b/collectors/charts.d.plugin/phpfpm/README.md
index d82951aac..36462ba98 100644
--- a/collectors/charts.d.plugin/phpfpm/README.md
+++ b/collectors/charts.d.plugin/phpfpm/README.md
@@ -1,2 +1,6 @@
+# phpfm
+
 > THIS MODULE IS OBSOLETE.
-> USE THE PYTHON ONE - IT SUPPORTS MULTIPLE JOBS AND IT IS MORE EFFICIENT
+> USE [THE PYTHON ONE](../../python.d.plugin/phpfpm) - IT SUPPORTS MULTIPLE JOBS AND IT IS MORE EFFICIENT
+
+[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fcharts.d.plugin%2Fphpfpm%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/charts.d.plugin/phpfpm/phpfpm.chart.sh b/collectors/charts.d.plugin/phpfpm/phpfpm.chart.sh
index 1af7910bc..b1edb2373 100644
--- a/collectors/charts.d.plugin/phpfpm/phpfpm.chart.sh
+++ b/collectors/charts.d.plugin/phpfpm/phpfpm.chart.sh
@@ -44,17 +44,7 @@ phpfpm_get() {
 		return 1
 	fi
 
-	if [[ "${phpfpm_response[0]}" != "pool:" \
-		|| "${phpfpm_response[2]}" != "process" \
-		|| "${phpfpm_response[5]}" != "start" \
-		|| "${phpfpm_response[12]}" != "accepted" \
-		|| "${phpfpm_response[15]}" != "listen" \
-		|| "${phpfpm_response[16]}" != "queue:" \
-		|| "${phpfpm_response[26]}" != "idle" \
-		|| "${phpfpm_response[29]}" != "active" \
-		|| "${phpfpm_response[32]}" != "total" \
-	]]
-		then
+	if [[ ${phpfpm_response[0]} != "pool:" || ${phpfpm_response[2]} != "process" || ${phpfpm_response[5]} != "start" || ${phpfpm_response[12]} != "accepted" || ${phpfpm_response[15]} != "listen" || ${phpfpm_response[16]} != "queue:" || ${phpfpm_response[26]} != "idle" || ${phpfpm_response[29]} != "active" || ${phpfpm_response[32]} != "total" ]]; then
 		error "invalid response from phpfpm status server: ${phpfpm_response[*]}"
 		return 1
 	fi
@@ -71,27 +61,13 @@ phpfpm_get() {
 	phpfpm_total_processes="${phpfpm_response[34]}"
 	phpfpm_max_active_processes="${phpfpm_response[38]}"
 	phpfpm_max_children_reached="${phpfpm_response[42]}"
-	if [ "${phpfpm_response[43]}" == "slow" ]
-		then
-	  	phpfpm_slow_requests="${phpfpm_response[45]}"
+	if [ "${phpfpm_response[43]}" == "slow" ]; then
+		phpfpm_slow_requests="${phpfpm_response[45]}"
 	else
-	  	phpfpm_slow_requests="-1"
+		phpfpm_slow_requests="-1"
 	fi
 
-	if [[ -z "${phpfpm_pool}" \
-		|| -z "${phpfpm_start_time}" \
-		|| -z "${phpfpm_start_since}" \
-		|| -z "${phpfpm_accepted_conn}" \
-		|| -z "${phpfpm_listen_queue}" \
-		|| -z "${phpfpm_max_listen_queue}" \
-		|| -z "${phpfpm_listen_queue_len}" \
-		|| -z "${phpfpm_idle_processes}" \
-		|| -z "${phpfpm_active_processes}" \
-		|| -z "${phpfpm_total_processes}" \
-		|| -z "${phpfpm_max_active_processes}" \
-		|| -z "${phpfpm_max_children_reached}" \
-	]]
-		then
+	if [[ -z ${phpfpm_pool} || -z ${phpfpm_start_time} || -z ${phpfpm_start_since} || -z ${phpfpm_accepted_conn} || -z ${phpfpm_listen_queue} || -z ${phpfpm_max_listen_queue} || -z ${phpfpm_listen_queue_len} || -z ${phpfpm_idle_processes} || -z ${phpfpm_active_processes} || -z ${phpfpm_total_processes} || -z ${phpfpm_max_active_processes} || -z ${phpfpm_max_children_reached} ]]; then
 		error "empty values got from phpfpm status server: ${phpfpm_response[*]}"
 		return 1
 	fi
@@ -106,8 +82,7 @@ phpfpm_check() {
 	fi
 
 	local m
-	for m in "${!phpfpm_urls[@]}"
-	do
+	for m in "${!phpfpm_urls[@]}"; do
 		phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
 		# shellcheck disable=SC2181
 		if [ $? -ne 0 ]; then
@@ -133,8 +108,7 @@ phpfpm_check() {
 # _create is called once, to create the charts
 phpfpm_create() {
 	local m
-	for m in "${!phpfpm_urls[@]}"
-	do
+	for m in "${!phpfpm_urls[@]}"; do
 		cat <<EOF
 CHART phpfpm_$m.connections '' "PHP-FPM Active Connections" "connections" phpfpm phpfpm.connections line $((phpfpm_priority + 1)) $phpfpm_update_every
 DIMENSION active '' absolute 1 1
@@ -147,8 +121,7 @@ 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
 EOF
-		if [ $((phpfpm_slow_requests)) -ne -1 ]
-			then
+		if [ $((phpfpm_slow_requests)) -ne -1 ]; then
 			echo "DIMENSION slow 'slow requests' absolute 1 1"
 		fi
 	done
@@ -166,8 +139,7 @@ phpfpm_update() {
 	# remember: KEEP IT SIMPLE AND SHORT
 
 	local m
-	for m in "${!phpfpm_urls[@]}"
-	do
+	for m in "${!phpfpm_urls[@]}"; do
 		phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
 		# shellcheck disable=SC2181
 		if [ $? -ne 0 ]; then
@@ -187,8 +159,7 @@ END
 BEGIN phpfpm_$m.performance $1
 SET reached = $((phpfpm_max_children_reached))
 EOF
-		if [ $((phpfpm_slow_requests)) -ne -1 ]
-			then
+		if [ $((phpfpm_slow_requests)) -ne -1 ]; then
 			echo "SET slow = $((phpfpm_slow_requests))"
 		fi
 		echo "END"