Adding upstream version 1.12.0.upstream/1.12.0

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

3 files changed, 17 insertions, 26 deletions

diff --git a/collectors/python.d.plugin/nginx/README.md b/collectors/python.d.plugin/nginx/README.md
index 007f45c7..7854105b 100644
--- a/collectors/python.d.plugin/nginx/README.md
+++ b/collectors/python.d.plugin/nginx/README.md
@@ -37,9 +37,10 @@ priority     : 90100
 
 local:
   url     : 'http://localhost/stub_status'
-  retries : 10
 ```
 
 Without configuration, module attempts to connect to `http://localhost/stub_status`
 
 ---
+
+[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fnginx%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/nginx/nginx.chart.py b/collectors/python.d.plugin/nginx/nginx.chart.py
index 09c6bbd3..84a5985e 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):
         """
diff --git a/collectors/python.d.plugin/nginx/nginx.conf b/collectors/python.d.plugin/nginx/nginx.conf
index 71c52106..4001b4bb 100644
--- a/collectors/python.d.plugin/nginx/nginx.conf
+++ b/collectors/python.d.plugin/nginx/nginx.conf
@@ -39,11 +39,9 @@
 # If unset, the default for python.d.plugin is used.
 # priority: 60000
 
-# retries sets the number of retries to be made in case of failures.
-# If unset, the default for python.d.plugin is used.
-# Attempts to restore the service are made once every update_every
-# and only if the module has collected values in the past.
-# retries: 60
+# 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.
@@ -70,7 +68,7 @@
 #                             # 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
-#     retries: 60             # the JOB's number of restoration attempts
+#     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: