From 2e85f9325a797977eea9dfea0a925775ddd211d9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Feb 2021 12:49:00 +0100
Subject: Merging upstream version 1.29.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/python.d.plugin/phpfpm/README.md       | 54 +++++++++++++----------
 collectors/python.d.plugin/phpfpm/phpfpm.chart.py | 10 +++--
 2 files changed, 36 insertions(+), 28 deletions(-)

(limited to 'collectors/python.d.plugin/phpfpm')

diff --git a/collectors/python.d.plugin/phpfpm/README.md b/collectors/python.d.plugin/phpfpm/README.md
index 5f8284330..9d0dbb580 100644
--- a/collectors/python.d.plugin/phpfpm/README.md
+++ b/collectors/python.d.plugin/phpfpm/README.md
@@ -1,41 +1,47 @@
-# phpfpm
+<!--
+title: "PHP-FPM monitoring with Netdata"
+custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/python.d.plugin/phpfpm/README.md
+sidebar_label: "PHP-FPM"
+-->
 
-This module will monitor one or more php-fpm instances depending on configuration.
+# PHP-FPM monitoring with Netdata
 
-**Requirements:**
+Monitors one or more PHP-FPM instances depending on configuration.
 
--   php-fpm with enabled `status` page
--   access to `status` page via web server
-
-It produces following charts:
+## Requirements
 
-1.  **Active Connections**
-
-    -   active
-    -   maxActive
-    -   idle
+-   `PHP-FPM` with [enabled `status` page](https://easyengine.io/tutorials/php/fpm-status-page/)
+-   access to `status` page via web server
 
-2.  **Requests** in requests/s
+## Charts
 
-    -   requests
+It produces following charts:
 
-3.  **Performance**
+-   Active Connections in `connections`
+-   Requests in `requests/s`
+-   Performance in `status`
+-   Requests Duration Among All Idle Processes in `milliseconds`
+-   Last Request CPU Usage Among All Idle Processes in `percentage`
+-   Last Request Memory Usage Among All Idle Processes in `KB`
 
-    -   reached
-    -   slow
+## Configuration
 
-## configuration
+Edit the `python.d/phpfpm.conf` configuration file using `edit-config` from the Netdata [config
+directory](/docs/configure/nodes.md), which is typically at `/etc/netdata`.
 
-Needs only `url` to server's `status`
+```bash
+cd /etc/netdata   # Replace this path with your Netdata config directory, if different
+sudo ./edit-config python.d/phpfpm.conf
+```
 
-Here is an example for local instance:
+Needs only `url` to server's `status`. Here is an example for local and remote instances:
 
 ```yaml
-update_every : 3
-priority     : 90100
-
 local:
-  url     : 'http://localhost/status'
+  url     : 'http://localhost/status?full&json'
+
+remote:
+  url     : 'http://203.0.113.10/status?full&json'
 ```
 
 Without configuration, module attempts to connect to `http://localhost/status`
diff --git a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py b/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
index d0e9960e0..226df99c6 100644
--- a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
+++ b/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
@@ -9,7 +9,6 @@ import re
 
 from bases.FrameworkServices.UrlService import UrlService
 
-
 REGEX = re.compile(r'([a-z][a-z ]+): ([\d.]+)')
 
 POOL_INFO = [
@@ -71,7 +70,8 @@ CHARTS = {
         ]
     },
     'request_duration': {
-        'options': [None, 'PHP-FPM Request Duration', 'milliseconds', 'request duration', 'phpfpm.request_duration',
+        'options': [None, 'PHP-FPM Requests Duration Among All Idle Processes', 'milliseconds', 'request duration',
+                    'phpfpm.request_duration',
                     'line'],
         'lines': [
             ['minReqDur', 'min', 'absolute', 1, 1000],
@@ -80,7 +80,8 @@ CHARTS = {
         ]
     },
     'request_cpu': {
-        'options': [None, 'PHP-FPM Request CPU', 'percentage', 'request CPU', 'phpfpm.request_cpu', 'line'],
+        'options': [None, 'PHP-FPM Last Request CPU Usage Among All Idle Processes', 'percentage', 'request CPU',
+                    'phpfpm.request_cpu', 'line'],
         'lines': [
             ['minReqCpu', 'min'],
             ['maxReqCpu', 'max'],
@@ -88,7 +89,8 @@ CHARTS = {
         ]
     },
     'request_mem': {
-        'options': [None, 'PHP-FPM Request Memory', 'KB', 'request memory', 'phpfpm.request_mem', 'line'],
+        'options': [None, 'PHP-FPM Last Request Memory Usage Among All Idle Processes', 'KB', 'request memory',
+                    'phpfpm.request_mem', 'line'],
         'lines': [
             ['minReqMem', 'min', 'absolute', 1, 1024],
             ['maxReqMem', 'max', 'absolute', 1, 1024],
-- 
cgit v1.2.3