Merging upstream version 1.11.0+dfsg.

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

1 files changed, 0 insertions, 75 deletions

diff --git a/python.d/nginx.chart.py b/python.d/nginx.chart.py
deleted file mode 100644
index 2e4f0d1b..00000000
--- a/python.d/nginx.chart.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: nginx netdata python.d module
-# Author: Pawel Krupa (paulfantom)
-
-from bases.FrameworkServices.UrlService import UrlService
-
-# default module values (can be overridden per job in `config`)
-# update_every = 2
-priority = 60000
-retries = 60
-
-# default job configuration (overridden by python.d.plugin)
-# config = {'local': {
-#             'update_every': update_every,
-#             'retries': retries,
-#             'priority': priority,
-#             'url': 'http://localhost/stub_status'
-#          }}
-
-# charts order (can be overridden if you want less charts, or different order)
-ORDER = ['connections', 'requests', 'connection_status', 'connect_rate']
-
-CHARTS = {
-    'connections': {
-        'options': [None, 'nginx Active Connections', 'connections', 'active connections',
-                    'nginx.connections', 'line'],
-        'lines': [
-            ["active"]
-        ]},
-    'requests': {
-        'options': [None, 'nginx Requests', 'requests/s', 'requests', 'nginx.requests', 'line'],
-        'lines': [
-            ["requests", None, 'incremental']
-        ]},
-    'connection_status': {
-        'options': [None, 'nginx Active Connections by Status', 'connections', 'status',
-                    'nginx.connection_status', 'line'],
-        'lines': [
-            ["reading"],
-            ["writing"],
-            ["waiting", "idle"]
-        ]},
-    'connect_rate': {
-        'options': [None, 'nginx 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.url = self.configuration.get('url', 'http://localhost/stub_status')
-        self.order = ORDER
-        self.definitions = CHARTS
-
-    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