rename chart fields to avoid conflicts with backends; fixes #1962

[netdata.git] / charts.d / phpfpm.chart.sh

diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
old mode 100755 (executable)
new mode 100644 (file)
index 5551016..a5ee0ad
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -1,9 +1,13 @@
-#!/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_
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+# Contributed by @safeie with PR #276
 
-# first, you need open php-fpm status in php-fpm.conf 
+# first, you need open php-fpm status in php-fpm.conf
 # second, you need add status location in nginx.conf
 # you can see, https://easyengine.io/tutorials/php/fpm-status-page/
 
@@ -32,7 +36,7 @@ phpfpm_slow_requests=0
 phpfpm_get() {
        local opts="${1}" url="${2}"
 
-       phpfpm_response=($(curl -Ss ${opts} "${url}"))
+       phpfpm_response=($(run curl -Ss ${opts} "${url}"))
        [ $? -ne 0 -o "${#phpfpm_response[@]}" -eq 0 ] && return 1
 
        if [[ "${phpfpm_response[0]}" != "pool:" \
@@ -44,10 +48,9 @@ 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[*]}"
+               error "invalid response from phpfpm status server: ${phpfpm_response[*]}"
                return 1
        fi
 
@@ -63,7 +66,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}" \
@@ -77,10 +85,9 @@ 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[*]}"
+               error "empty values got from phpfpm status server: ${phpfpm_response[*]}"
                return 1
        fi
 
@@ -98,14 +105,14 @@ phpfpm_check() {
        do
                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"
+                       error "cannot find status on URL '${phpfpm_url[$m]}'. Please set phpfpm_urls[$m]='http://localhost/status' in $confd/phpfpm.conf"
                        unset phpfpm_urls[$m]
                        continue
                fi
        done
        
        if [ ${#phpfpm_urls[@]} -eq 0 ]; then
-               echo >&2 "phpfpm: no phpfpm servers found. Please set phpfpm_urls[name]='url' to whatever needed to get status to the phpfpm server, in $confd/phpfpm.conf"
+               error "no phpfpm servers found. Please set phpfpm_urls[name]='url' to whatever needed to get status to the phpfpm server, in $confd/phpfpm.conf"
                return 1
        fi
        
@@ -132,8 +139,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
@@ -168,10 +178,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