Skip to content

Commit 12725c6

Browse files
1ma1ma
committed
add pool label to non-worker metrics
1 parent 105028a commit 12725c6

2 files changed

Lines changed: 37 additions & 24 deletions

File tree

‎sapi/fpm/fpm/fpm_status.c‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -720,55 +720,67 @@ static void fpm_status_handle_openmetrics(struct fpm_scoreboard_s *scoreboard_p,
720720
spprintf(&buffer, 0,
721721
"# TYPE phpfpm_up gauge\n"
722722
"# HELP phpfpm_up Could pool %s using a %s PM on PHP-FPM be reached?\n"
723-
"phpfpm_up 1\n"
723+
"phpfpm_up{pool=\"%s\"} 1\n"
724724
"# TYPE phpfpm_start_since counter\n"
725725
"# HELP phpfpm_start_since The number of seconds since FPM has started.\n"
726-
"phpfpm_start_since %lu\n"
726+
"phpfpm_start_since{pool=\"%s\"} %lu\n"
727727
"# TYPE phpfpm_accepted_connections counter\n"
728728
"# HELP phpfpm_accepted_connections The number of requests accepted by the pool.\n"
729-
"phpfpm_accepted_connections %lu\n"
729+
"phpfpm_accepted_connections{pool=\"%s\"} %lu\n"
730730
"# TYPE phpfpm_listen_queue gauge\n"
731731
"# HELP phpfpm_listen_queue The number of requests in the queue of pending connections.\n"
732-
"phpfpm_listen_queue %d\n"
732+
"phpfpm_listen_queue{pool=\"%s\"} %d\n"
733733
"# TYPE phpfpm_max_listen_queue counter\n"
734734
"# HELP phpfpm_max_listen_queue The maximum number of requests in the queue of pending connections since FPM has started.\n"
735-
"phpfpm_max_listen_queue %d\n"
735+
"phpfpm_max_listen_queue{pool=\"%s\"} %d\n"
736736
"# TYPE phpfpm_listen_queue_length gauge\n"
737737
"# HELP phpfpm_listen_queue_length The size of the socket queue of pending connections.\n"
738-
"phpfpm_listen_queue_length %u\n"
738+
"phpfpm_listen_queue_length{pool=\"%s\"} %u\n"
739739
"# TYPE phpfpm_idle_processes gauge\n"
740740
"# HELP phpfpm_idle_processes The number of idle processes.\n"
741-
"phpfpm_idle_processes %d\n"
741+
"phpfpm_idle_processes{pool=\"%s\"} %d\n"
742742
"# TYPE phpfpm_active_processes gauge\n"
743743
"# HELP phpfpm_active_processes The number of active processes.\n"
744-
"phpfpm_active_processes %d\n"
744+
"phpfpm_active_processes{pool=\"%s\"} %d\n"
745745
"# TYPE phpfpm_total_processes gauge\n"
746746
"# HELP phpfpm_total_processes The number of idle + active processes.\n"
747-
"phpfpm_total_processes %d\n"
747+
"phpfpm_total_processes{pool=\"%s\"} %d\n"
748748
"# TYPE phpfpm_max_active_processes counter\n"
749749
"# HELP phpfpm_max_active_processes The maximum number of active processes since FPM has started.\n"
750-
"phpfpm_max_active_processes %d\n"
750+
"phpfpm_max_active_processes{pool=\"%s\"} %d\n"
751751
"# TYPE phpfpm_max_children_reached counter\n"
752752
"# HELP phpfpm_max_children_reached The number of times, the process limit has been reached, when pm tries to start more children (works only for pm 'dynamic' and 'ondemand').\n"
753-
"phpfpm_max_children_reached %u\n"
753+
"phpfpm_max_children_reached{pool=\"%s\"} %u\n"
754754
"# TYPE phpfpm_slow_requests counter\n"
755755
"# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value.\n"
756-
"phpfpm_slow_requests %lu\n"
756+
"phpfpm_slow_requests{pool=\"%s\"} %lu\n"
757757
"# TYPE phpfpm_memory_peak gauge\n"
758758
"# HELP phpfpm_memory_peak The memory usage peak since FPM has started.\n"
759759
"phpfpm_memory_peak %zu\n",
760760
scoreboard_p->pool,
761761
PM2STR(scoreboard_p->pm),
762+
scoreboard_p->pool,
763+
scoreboard_p->pool,
762764
(unsigned long) (now_epoch - scoreboard_p->start_epoch),
765+
scoreboard_p->pool,
763766
scoreboard_p->requests,
767+
scoreboard_p->pool,
764768
scoreboard_p->lq,
769+
scoreboard_p->pool,
765770
scoreboard_p->lq_max,
771+
scoreboard_p->pool,
766772
scoreboard_p->lq_len,
773+
scoreboard_p->pool,
767774
scoreboard_p->idle,
775+
scoreboard_p->pool,
768776
scoreboard_p->active,
777+
scoreboard_p->pool,
769778
scoreboard_p->idle + scoreboard_p->active,
779+
scoreboard_p->pool,
770780
scoreboard_p->active_max,
781+
scoreboard_p->pool,
771782
scoreboard_p->max_children_reached,
783+
scoreboard_p->pool,
772784
scoreboard_p->slow_rq,
773785
scoreboard_p->memory_peak);
774786

‎sapi/fpm/tests/status.inc‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,42 +231,43 @@ class Status
231231
*/
232232
protected function checkStatusOpenmetrics(string $body, array $fields)
233233
{
234+
$labels = '\{pool="' . $fields['pool'] . '"\}';
234235
$pattern = "(# TYPE phpfpm_up gauge\n" .
235236
"# HELP phpfpm_up Could pool " . $fields['pool'] . " using a " . $fields['process manager'] . " PM on PHP-FPM be reached\?\n" .
236-
"phpfpm_up 1\n" .
237+
"phpfpm_up" . $labels . " 1\n" .
237238
"# TYPE phpfpm_start_since counter\n" .
238239
"# HELP phpfpm_start_since The number of seconds since FPM has started\.\n" .
239-
"phpfpm_start_since " . $fields['start since'] . "\n" .
240+
"phpfpm_start_since" . $labels . " " . $fields['start since'] . "\n" .
240241
"# TYPE phpfpm_accepted_connections counter\n" .
241242
"# HELP phpfpm_accepted_connections The number of requests accepted by the pool\.\n" .
242-
"phpfpm_accepted_connections " . $fields['accepted conn'] . "\n" .
243+
"phpfpm_accepted_connections" . $labels . " " . $fields['accepted conn'] . "\n" .
243244
"# TYPE phpfpm_listen_queue gauge\n" .
244245
"# HELP phpfpm_listen_queue The number of requests in the queue of pending connections\.\n" .
245-
"phpfpm_listen_queue " . $fields['listen queue'] . "\n" .
246+
"phpfpm_listen_queue" . $labels . " " . $fields['listen queue'] . "\n" .
246247
"# TYPE phpfpm_max_listen_queue counter\n" .
247248
"# HELP phpfpm_max_listen_queue The maximum number of requests in the queue of pending connections since FPM has started\.\n" .
248-
"phpfpm_max_listen_queue " . $fields['max listen queue'] . "\n" .
249+
"phpfpm_max_listen_queue" . $labels . " " . $fields['max listen queue'] . "\n" .
249250
"# TYPE phpfpm_listen_queue_length gauge\n" .
250251
"# HELP phpfpm_listen_queue_length The size of the socket queue of pending connections\.\n" .
251-
"phpfpm_listen_queue_length " . $fields['listen queue len'] . "\n" .
252+
"phpfpm_listen_queue_length" . $labels . " " . $fields['listen queue len'] . "\n" .
252253
"# TYPE phpfpm_idle_processes gauge\n" .
253254
"# HELP phpfpm_idle_processes The number of idle processes\.\n" .
254-
"phpfpm_idle_processes " . $fields['idle processes'] . "\n" .
255+
"phpfpm_idle_processes" . $labels . " " . $fields['idle processes'] . "\n" .
255256
"# TYPE phpfpm_active_processes gauge\n" .
256257
"# HELP phpfpm_active_processes The number of active processes\.\n" .
257-
"phpfpm_active_processes " . $fields['active processes'] . "\n" .
258+
"phpfpm_active_processes" . $labels . " " . $fields['active processes'] . "\n" .
258259
"# TYPE phpfpm_total_processes gauge\n" .
259260
"# HELP phpfpm_total_processes The number of idle \+ active processes\.\n" .
260-
"phpfpm_total_processes " . $fields['total processes'] . "\n" .
261+
"phpfpm_total_processes" . $labels . " " . $fields['total processes'] . "\n" .
261262
"# TYPE phpfpm_max_active_processes counter\n" .
262263
"# HELP phpfpm_max_active_processes The maximum number of active processes since FPM has started\.\n" .
263-
"phpfpm_max_active_processes " . $fields['max active processes'] . "\n" .
264+
"phpfpm_max_active_processes" . $labels . " " . $fields['max active processes'] . "\n" .
264265
"# TYPE phpfpm_max_children_reached counter\n" .
265266
"# HELP phpfpm_max_children_reached The number of times, the process limit has been reached, when pm tries to start more children \(works only for pm 'dynamic' and 'ondemand'\)\.\n" .
266-
"phpfpm_max_children_reached " . $fields['max children reached'] . "\n" .
267+
"phpfpm_max_children_reached" . $labels . " " . $fields['max children reached'] . "\n" .
267268
"# TYPE phpfpm_slow_requests counter\n" .
268269
"# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value\.\n" .
269-
"phpfpm_slow_requests " . $fields['slow requests'] . "\n" .
270+
"phpfpm_slow_requests" . $labels . " " . $fields['slow requests'] . "\n" .
270271
"# TYPE phpfpm_memory_peak gauge\n" .
271272
"# HELP phpfpm_memory_peak The memory usage peak since FPM has started\.\n" .
272273
"phpfpm_memory_peak " . $fields['memory peak'] . "\n" .

0 commit comments

Comments
 (0)