Adding upstream version 1.35.0.upstream/1.35.0

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

4 files changed, 0 insertions, 256 deletions

diff --git a/collectors/python.d.plugin/nginx/Makefile.inc b/collectors/python.d.plugin/nginx/Makefile.inc
deleted file mode 100644
index 4636aa830..000000000
--- a/collectors/python.d.plugin/nginx/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       += nginx/nginx.chart.py
-dist_pythonconfig_DATA += nginx/nginx.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += nginx/README.md nginx/Makefile.inc
-
diff --git a/collectors/python.d.plugin/nginx/README.md b/collectors/python.d.plugin/nginx/README.md
deleted file mode 100644
index 34f63cc52..000000000
--- a/collectors/python.d.plugin/nginx/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-title: "NGINX monitoring with Netdata"
-custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/python.d.plugin/nginx/README.md
-sidebar_label: "NGINX"
--->
-
-# NGINX monitoring with Netdata
-
-Monitors one or more NGINX servers depending on configuration. Servers can be either local or remote.
-
-## Requirements
-
--   nginx with configured 'ngx_http_stub_status_module'
--   'location /stub_status'
-
-Example nginx configuration can be found in 'python.d/nginx.conf'
-
-It produces following charts:
-
-1.  **Active Connections**
-
-    -   active
-
-2.  **Requests** in requests/s
-
-    -   requests
-
-3.  **Active Connections by Status**
-
-    -   reading
-    -   writing
-    -   waiting
-
-4.  **Connections Rate** in connections/s
-
-    -   accepts
-    -   handled
-
-## Configuration
-
-Edit the `python.d/nginx.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/nginx.conf
-```
-
-Needs only `url` to server's `stub_status`.
-
-Here is an example for local server:
-
-```yaml
-update_every : 10
-priority     : 90100
-
-local:
-  url     : 'http://localhost/stub_status'
-```
-
-Without configuration, module attempts to connect to `http://localhost/stub_status`
-
----
-
-
diff --git a/collectors/python.d.plugin/nginx/nginx.chart.py b/collectors/python.d.plugin/nginx/nginx.chart.py
deleted file mode 100644
index 7548d6a42..000000000
--- a/collectors/python.d.plugin/nginx/nginx.chart.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: nginx netdata python.d module
-# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from bases.FrameworkServices.UrlService import UrlService
-
-ORDER = [
-    'connections',
-    'requests',
-    'connection_status',
-    'connect_rate',
-]
-
-CHARTS = {
-    'connections': {
-        'options': [None, 'Active Connections', 'connections', 'active connections',
-                    'nginx.connections', 'line'],
-        'lines': [
-            ['active']
-        ]
-    },
-    'requests': {
-        'options': [None, 'Requests', 'requests/s', 'requests', 'nginx.requests', 'line'],
-        'lines': [
-            ['requests', None, 'incremental']
-        ]
-    },
-    'connection_status': {
-        'options': [None, 'Active Connections by Status', 'connections', 'status',
-                    'nginx.connection_status', 'line'],
-        'lines': [
-            ['reading'],
-            ['writing'],
-            ['waiting', 'idle']
-        ]
-    },
-    'connect_rate': {
-        'options': [None, 'Connections Rate', 'connections/s', 'connections rate',
-                    'nginx.connect_rate', 'line'],
-        'lines': [
-            ['accepts', 'accepted', 'incremental'],
-            ['handled', None, 'incremental']
-        ]
-    }
-}
-
-
-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/stub_status')
-
-    def _get_data(self):
-        """
-        Format data received from http request
-        :return: dict
-        """
-        try:
-            raw = self._get_raw_data().split(" ")
-            return {'active': int(raw[2]),
-                    'requests': int(raw[9]),
-                    'reading': int(raw[11]),
-                    'writing': int(raw[13]),
-                    'waiting': int(raw[15]),
-                    'accepts': int(raw[7]),
-                    'handled': int(raw[8])}
-        except (ValueError, AttributeError):
-            return None
diff --git a/collectors/python.d.plugin/nginx/nginx.conf b/collectors/python.d.plugin/nginx/nginx.conf
deleted file mode 100644
index 4001b4bbe..000000000
--- a/collectors/python.d.plugin/nginx/nginx.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-# netdata python.d.plugin configuration for nginx
-#
-# You must have ngx_http_stub_status_module configured on your nginx server for this
-# plugin to work. The following is an example config.
-# It must be located inside a server { } block.
-#  
-# location /stub_status {
-#   stub_status;
-#   # Security: Only allow access from the IP below.
-#   allow 192.168.1.200;
-#   # Deny anyone else
-#   deny all;
-#  }
-#
-# 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, this plugin also supports the following:
-#
-#     url: 'URL'       # the URL to fetch nginx's status stats
-#
-# if the URL is password protected, the following are supported:
-#
-#     user: 'username'
-#     pass: 'password'
-#
-# Example
-# 
-# RemoteNginx:
-#     name : 'Reverse_Proxy'
-#     url  : 'http://yourdomain.com/stub_status'
-#
-# "RemoteNginx" will show up in Netdata logs. "Reverse Proxy" will show up in the menu
-# in the nginx section.
-
-# ----------------------------------------------------------------------
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-
-localhost:
-  name : 'local'
-  url  : 'http://localhost/stub_status'
-
-localipv4:
-  name : 'local'
-  url  : 'http://127.0.0.1/stub_status'
-
-localipv6:
-  name : 'local'
-  url  : 'http://[::1]/stub_status'
-