From 50485bedfd9818165aa1d039d0abe95a559134b7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:31:03 +0100
Subject: Merging upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/python.d.plugin/nginx/nginx.chart.py | 30 +++++++++----------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'collectors/python.d.plugin/nginx/nginx.chart.py')

diff --git a/collectors/python.d.plugin/nginx/nginx.chart.py b/collectors/python.d.plugin/nginx/nginx.chart.py
index 09c6bbd37..84a5985e4 100644
--- a/collectors/python.d.plugin/nginx/nginx.chart.py
+++ b/collectors/python.d.plugin/nginx/nginx.chart.py
@@ -5,38 +5,30 @@
 
 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']
+ORDER = [
+    'connections',
+    'requests',
+    'connection_status',
+    'connect_rate',
+]
 
 CHARTS = {
     'connections': {
-        'options': [None, 'nginx Active Connections', 'connections', 'active connections',
+        'options': [None, 'Active Connections', 'connections', 'active connections',
                     'nginx.connections', 'line'],
         'lines': [
             ['active']
         ]
     },
     'requests': {
-        'options': [None, 'nginx Requests', 'requests/s', 'requests', 'nginx.requests', 'line'],
+        'options': [None, 'Requests', 'requests/s', 'requests', 'nginx.requests', 'line'],
         'lines': [
             ['requests', None, 'incremental']
         ]
     },
     'connection_status': {
-        'options': [None, 'nginx Active Connections by Status', 'connections', 'status',
+        'options': [None, 'Active Connections by Status', 'connections', 'status',
                     'nginx.connection_status', 'line'],
         'lines': [
             ['reading'],
@@ -45,7 +37,7 @@ CHARTS = {
         ]
     },
     'connect_rate': {
-        'options': [None, 'nginx Connections Rate', 'connections/s', 'connections rate',
+        'options': [None, 'Connections Rate', 'connections/s', 'connections rate',
                     'nginx.connect_rate', 'line'],
         'lines': [
             ['accepts', 'accepted', 'incremental'],
@@ -58,9 +50,9 @@ CHARTS = {
 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
+        self.url = self.configuration.get('url', 'http://localhost/stub_status')
 
     def _get_data(self):
         """
-- 
cgit v1.2.3