Merging upstream version 1.35.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 0 insertions, 326 deletions

diff --git a/collectors/python.d.plugin/phpfpm/Makefile.inc b/collectors/python.d.plugin/phpfpm/Makefile.inc
deleted file mode 100644
index ff312fe18..000000000
--- a/collectors/python.d.plugin/phpfpm/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += phpfpm/phpfpm.chart.py
-dist_pythonconfig_DATA += phpfpm/phpfpm.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += phpfpm/README.md phpfpm/Makefile.inc
-
diff --git a/collectors/python.d.plugin/phpfpm/README.md b/collectors/python.d.plugin/phpfpm/README.md
deleted file mode 100644
index fe81971b2..000000000
--- a/collectors/python.d.plugin/phpfpm/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-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"
--->
-
-# PHP-FPM monitoring with Netdata
-
-Monitors one or more PHP-FPM instances depending on configuration.
-
-## Requirements
-
--   `PHP-FPM` with [enabled `status` page](https://easyengine.io/tutorials/php/fpm-status-page/)
--   access to `status` page via web server
-
-## Charts
-
-It produces following charts:
-
--   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`
-
-## 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`.
-
-```bash
-cd /etc/netdata   # Replace this path with your Netdata config directory, if different
-sudo ./edit-config python.d/phpfpm.conf
-```
-
-Needs only `url` to server's `status`. Here is an example for local and remote instances:
-
-```yaml
-local:
-  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
deleted file mode 100644
index 226df99c6..000000000
--- a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: PHP-FPM netdata python.d module
-# Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (ilyam8)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import json
-import re
-
-from bases.FrameworkServices.UrlService import UrlService
-
-REGEX = re.compile(r'([a-z][a-z ]+): ([\d.]+)')
-
-POOL_INFO = [
-    ('active processes', 'active'),
-    ('max active processes', 'maxActive'),
-    ('idle processes', 'idle'),
-    ('accepted conn', 'requests'),
-    ('max children reached', 'reached'),
-    ('slow requests', 'slow')
-]
-
-PER_PROCESS_INFO = [
-    ('request duration', 'ReqDur'),
-    ('last request cpu', 'ReqCpu'),
-    ('last request memory', 'ReqMem')
-]
-
-
-def average(collection):
-    return sum(collection, 0.0) / max(len(collection), 1)
-
-
-CALC = [
-    ('min', min),
-    ('max', max),
-    ('avg', average)
-]
-
-ORDER = [
-    'connections',
-    'requests',
-    'performance',
-    'request_duration',
-    'request_cpu',
-    'request_mem',
-]
-
-CHARTS = {
-    'connections': {
-        'options': [None, 'PHP-FPM Active Connections', 'connections', 'active connections', 'phpfpm.connections',
-                    'line'],
-        'lines': [
-            ['active'],
-            ['maxActive', 'max active'],
-            ['idle']
-        ]
-    },
-    'requests': {
-        'options': [None, 'PHP-FPM Requests', 'requests/s', 'requests', 'phpfpm.requests', 'line'],
-        'lines': [
-            ['requests', None, 'incremental']
-        ]
-    },
-    'performance': {
-        'options': [None, 'PHP-FPM Performance', 'status', 'performance', 'phpfpm.performance', 'line'],
-        'lines': [
-            ['reached', 'max children reached'],
-            ['slow', 'slow requests']
-        ]
-    },
-    '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],
-            ['maxReqDur', 'max', 'absolute', 1, 1000],
-            ['avgReqDur', 'avg', 'absolute', 1, 1000]
-        ]
-    },
-    'request_cpu': {
-        'options': [None, 'PHP-FPM Last Request CPU Usage Among All Idle Processes', 'percentage', 'request CPU',
-                    'phpfpm.request_cpu', 'line'],
-        'lines': [
-            ['minReqCpu', 'min'],
-            ['maxReqCpu', 'max'],
-            ['avgReqCpu', 'avg']
-        ]
-    },
-    'request_mem': {
-        '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],
-            ['avgReqMem', 'avg', 'absolute', 1, 1024]
-        ]
-    }
-}
-
-
-class Service(UrlService):
-    def __init__(self, configuration=None, name=None):
-        UrlService.__init__(self, configuration=configuration, name=name)
-        self.order = ORDER
-        self.definitions = CHARTS
-        self.url = self.configuration.get('url', 'http://localhost/status?full&json')
-        self.json = '&json' in self.url or '?json' in self.url
-        self.json_full = self.url.endswith(('?full&json', '?json&full'))
-        self.if_all_processes_running = dict(
-            [(c_name + p_name, 0) for c_name, func in CALC for metric, p_name in PER_PROCESS_INFO]
-        )
-
-    def _get_data(self):
-        """
-        Format data received from http request
-        :return: dict
-        """
-        raw = self._get_raw_data()
-        if not raw:
-            return None
-
-        raw_json = parse_raw_data_(is_json=self.json, raw_data=raw)
-
-        # Per Pool info: active connections, requests and performance charts
-        to_netdata = fetch_data_(raw_data=raw_json, metrics_list=POOL_INFO)
-
-        # Per Process Info: duration, cpu and memory charts (min, max, avg)
-        if self.json_full:
-            p_info = dict()
-            to_netdata.update(self.if_all_processes_running)  # If all processes are in running state
-            # Metrics are always 0 if the process is not in Idle state because calculation is done
-            #  when the request processing has terminated
-            for process in [p for p in raw_json['processes'] if p['state'] == 'Idle']:
-                p_info.update(fetch_data_(raw_data=process, metrics_list=PER_PROCESS_INFO, pid=str(process['pid'])))
-
-            if p_info:
-                for new_name in PER_PROCESS_INFO:
-                    for name, func in CALC:
-                        to_netdata[name + new_name[1]] = func([p_info[k] for k in p_info if new_name[1] in k])
-
-        return to_netdata or None
-
-
-def fetch_data_(raw_data, metrics_list, pid=''):
-    """
-    :param raw_data: dict
-    :param metrics_list: list
-    :param pid: str
-    :return: dict
-    """
-    result = dict()
-    for metric, new_name in metrics_list:
-        if metric in raw_data:
-            result[new_name + pid] = float(raw_data[metric])
-    return result
-
-
-def parse_raw_data_(is_json, raw_data):
-    """
-    :param is_json: bool
-    :param regex: compiled regular expr
-    :param raw_data: dict
-    :return: dict
-    """
-    if is_json:
-        try:
-            return json.loads(raw_data)
-        except ValueError:
-            return dict()
-    else:
-        raw_data = ' '.join(raw_data.split())
-        return dict(REGEX.findall(raw_data))
diff --git a/collectors/python.d.plugin/phpfpm/phpfpm.conf b/collectors/python.d.plugin/phpfpm/phpfpm.conf
deleted file mode 100644
index d31853903..000000000
--- a/collectors/python.d.plugin/phpfpm/phpfpm.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-# netdata python.d.plugin configuration for PHP-FPM
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-# There are 2 sections:
-#  - global variables
-#  - one or more JOBS
-#
-# JOBS allow you to collect values from multiple sources.
-# Each source will have its own set of charts.
-#
-# JOB parameters have to be indented (using spaces only, example below).
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
-
-# ----------------------------------------------------------------------
-# JOBS (data collection sources)
-#
-# The default JOBS share the same *name*. JOBS with the same name
-# are mutually exclusive. Only one of them will be allowed running at
-# any time. This allows autodetection to try several alternatives and
-# pick the one that works.
-#
-# Any number of jobs is supported.
-#
-# All python.d.plugin JOBS (for all its modules) support a set of
-# predefined parameters. These are:
-#
-# job_name:
-#     name: myname            # the JOB's name as it will appear at the
-#                             # dashboard (by default is the job_name)
-#                             # JOBs sharing a name are mutually exclusive
-#     update_every: 1         # the JOB's data collection frequency
-#     priority: 60000         # the JOB's order on the dashboard
-#     penalty: yes            # the JOB's penalty
-#     autodetection_retry: 0  # the JOB's re-check interval in seconds
-#
-# Additionally to the above, PHP-FPM also supports the following:
-#
-#     url: 'URL'       # the URL to fetch nginx's status stats
-#                      # Be sure and include ?full&status at the end of the url
-#
-# if the URL is password protected, the following are supported:
-#
-#     user: 'username'
-#     pass: 'password'
-#
-
-# ----------------------------------------------------------------------
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-
-localhost:
-  name : 'local'
-  url  : "http://localhost/status?full&json"
-
-localipv4:
-  name : 'local'
-  url  : "http://127.0.0.1/status?full&json"
-
-localipv6:
-  name : 'local'
-  url  : "http://[::1]/status?full&json"
-