add compatibility with PHP 5.3
paulfantom committed
Jun 16, 2016 at 00:35 UTC
7b69abedb8631a7342fcff65993aa8b8e089659b
1 file changed
+18
-5
charts.d/phpfpm.chart.sh
+18
-5
@@ -44,7 +44,6 @@ phpfpm_get() {
44
|| "${phpfpm_response[26]}" != "idle" \
45
|| "${phpfpm_response[29]}" != "active" \
46
|| "${phpfpm_response[32]}" != "total" \
47
- || "${phpfpm_response[43]}" != "slow" \
47
]]
48
then
49
echo >&2 "phpfpm: invalid response from phpfpm status server: ${phpfpm_response[*]}"
@@ -63,7 +62,12 @@ phpfpm_get() {
62
phpfpm_total_processes="${phpfpm_response[34]}"
63
phpfpm_max_active_processes="${phpfpm_response[38]}"
64
phpfpm_max_children_reached="${phpfpm_response[42]}"
66
- phpfpm_slow_requests="${phpfpm_response[45]}"
65
+ if [[ "${phpfpm_response[43]}" == "slow" ]]
66
+ then
67
+ phpfpm_slow_requests="${phpfpm_response[45]}"
68
+ else
69
+ phpfpm_slow_requests="-1"
70
+ fi
71
72
if [[ -z "${phpfpm_pool}" \
73
|| -z "${phpfpm_start_time}" \
@@ -77,7 +81,6 @@ phpfpm_get() {
81
|| -z "${phpfpm_total_processes}" \
82
|| -z "${phpfpm_max_active_processes}" \
83
|| -z "${phpfpm_max_children_reached}" \
80
- || -z "${phpfpm_slow_requests}" \
84
]]
85
then
86
echo >&2 "phpfpm: empty values got from phpfpm status server: ${phpfpm_response[*]}"
@@ -124,7 +127,7 @@ phpfpm_create() {
127
cat <<EOF
128
CHART phpfpm_$m.connections '' "PHP-FPM Active Connections" "connections" phpfpm phpfpm.connections line $((phpfpm_priority + 1)) $phpfpm_update_every
129
DIMENSION active '' absolute 1 1
127
-DIMENSION maxActive 'max active' absolute 1 1
130
+DDIMENSION maxActive 'max active' absolute 1 1
131
DIMENSION idle '' absolute 1 1
132
133
CHART phpfpm_$m.requests '' "PHP-FPM Requests" "requests/s" phpfpm phpfpm.requests line $((phpfpm_priority + 2)) $phpfpm_update_every
@@ -132,8 +135,13 @@ DIMENSION requests '' incremental 1 1
135
136
CHART phpfpm_$m.performance '' "PHP-FPM Performance" "status" phpfpm phpfpm.performance line $((phpfpm_priority + 3)) $phpfpm_update_every
137
DIMENSION reached 'max children reached' absolute 1 1
138
+EOF
139
+ if [[ ${phpfpm_slow_requests} != "-1" ]]
140
+ then
141
+ cat <<EOF
142
DIMENSION slow 'slow requests' absolute 1 1
143
EOF
144
+ fi
145
done
146
147
return 0
@@ -168,9 +176,14 @@ SET requests = $((phpfpm_accepted_conn))
176
END
177
BEGIN phpfpm_$m.performance $1
178
SET reached = $((phpfpm_max_children_reached))
179
+EOF
180
+ if [[ ${phpfpm_slow_requests} != "-1" ]]
181
+ then
182
+ cat << EOF
183
SET slow = $((phpfpm_slow_requests))
172
-END
184
EOF
185
+ fi
186
+ echo "END"
187
done
188
189
return 0