From b466fbf4d9efbebf51a605f8c8b0d2aafb0cccbf Mon Sep 17 00:00:00 2001
From: Ilya Mashchenko <ilya@netdata.cloud>
Date: Tue, 28 Jan 2020 19:01:41 +0300
Subject: =?UTF-8?q?collectors/python.d/phpfpm:=20fix=20readme=20and=20per?=
 =?UTF-8?q?=20process=20chart=20ti=E2=80=A6=20(#7876)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* /collectors/python.d/phpfpm/README.md: update

* /collectors/python.d/phpfpm: update per process chart titles
---
 collectors/python.d.plugin/phpfpm/README.md       | 42 +++++++++--------------
 collectors/python.d.plugin/phpfpm/phpfpm.chart.py |  9 +++--
 2 files changed, 23 insertions(+), 28 deletions(-)

(limited to 'collectors')

diff --git a/collectors/python.d.plugin/phpfpm/README.md b/collectors/python.d.plugin/phpfpm/README.md
index 5f8284330b..58d4bed68b 100644
--- a/collectors/python.d.plugin/phpfpm/README.md
+++ b/collectors/python.d.plugin/phpfpm/README.md
@@ -1,41 +1,33 @@
 # phpfpm
 
-This module will monitor one or more php-fpm instances depending on configuration.
+This module will monitor one or more [`PHP-FPM`](https://php-fpm.org/) instances, depending on your configuration.
 
-**Requirements:**
+## Requirements
 
--   php-fpm with enabled `status` page
+-   `PHP-FPM` with [enabled `status` page](https://easyengine.io/tutorials/php/fpm-status-page/)
 -   access to `status` page via web server
 
-It produces following charts:
-
-1.  **Active Connections**
-
-    -   active
-    -   maxActive
-    -   idle
-
-2.  **Requests** in requests/s
-
-    -   requests
+## Charts
 
-3.  **Performance**
-
-    -   reached
-    -   slow
+It produces following charts:
 
-## configuration
+-   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`
 
-Needs only `url` to server's `status`
+## Configuration
 
-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 d4af11f033..226df99c64 100644
--- a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
+++ b/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
@@ -70,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],
@@ -79,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'],
@@ -87,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