Adding upstream version 1.12.0.upstream/1.12.0

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

3 files changed, 14 insertions, 20 deletions

diff --git a/collectors/python.d.plugin/uwsgi/README.md b/collectors/python.d.plugin/uwsgi/README.md
index a062710df..9d455cfca 100644
--- a/collectors/python.d.plugin/uwsgi/README.md
+++ b/collectors/python.d.plugin/uwsgi/README.md
@@ -35,3 +35,5 @@ localhost:
 ```
 
 When no configuration file is found, module tries to connect to TCP/IP socket: `localhost:1717`.
+
+[![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%2Fuwsgi%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/uwsgi/uwsgi.chart.py b/collectors/python.d.plugin/uwsgi/uwsgi.chart.py
index 5ebcfb55b..511b770cf 100644
--- a/collectors/python.d.plugin/uwsgi/uwsgi.chart.py
+++ b/collectors/python.d.plugin/uwsgi/uwsgi.chart.py
@@ -7,10 +7,6 @@ import json
 from copy import deepcopy
 from bases.FrameworkServices.SocketService import SocketService
 
-# default module values (can be overridden per job in `config`)
-# update_every = 2
-priority = 60000
-retries = 60
 
 ORDER = [
     'requests',
@@ -40,27 +36,27 @@ CHARTS = {
         ]
     },
     'tx': {
-        'options': [None, 'Transmitted data', 'KB/s', 'requests', 'uwsgi.tx', 'stacked'],
+        'options': [None, 'Transmitted data', 'KiB/s', 'requests', 'uwsgi.tx', 'stacked'],
         'lines': [
             ['tx', 'tx', 'incremental']
         ]
     },
     'avg_rt': {
-        'options': [None, 'Average request time', 'ms', 'requests', 'uwsgi.avg_rt', 'line'],
+        'options': [None, 'Average request time', 'milliseconds', 'requests', 'uwsgi.avg_rt', 'line'],
         'lines': [
             ['avg_rt', 'avg_rt', 'absolute']
         ]
     },
     'memory_rss': {
-        'options': [None, 'RSS (Resident Set Size)', 'MB', 'memory', 'uwsgi.memory_rss', 'stacked'],
+        'options': [None, 'RSS (Resident Set Size)', 'MiB', 'memory', 'uwsgi.memory_rss', 'stacked'],
         'lines': [
-            ['memory_rss', 'memory_rss', 'absolute', 1, 1024 * 1024]
+            ['memory_rss', 'memory_rss', 'absolute', 1, 1 << 20]
         ]
     },
     'memory_vsz': {
-        'options': [None, 'VSZ (Virtual Memory Size)', 'MB', 'memory', 'uwsgi.memory_vsz', 'stacked'],
+        'options': [None, 'VSZ (Virtual Memory Size)', 'MiB', 'memory', 'uwsgi.memory_vsz', 'stacked'],
         'lines': [
-            ['memory_vsz', 'memory_vsz', 'absolute', 1, 1024 * 1024]
+            ['memory_vsz', 'memory_vsz', 'absolute', 1, 1 << 20]
         ]
     },
     'exceptions': {
@@ -87,15 +83,13 @@ CHARTS = {
 class Service(SocketService):
     def __init__(self, configuration=None, name=None):
         super(Service, self).__init__(configuration=configuration, name=name)
-        self.url = self.configuration.get('host', 'localhost')
-        self.port = self.configuration.get('port', 1717)
         self.order = ORDER
         self.definitions = deepcopy(CHARTS)
-
+        self.url = self.configuration.get('host', 'localhost')
+        self.port = self.configuration.get('port', 1717)
         # Clear dynamic dimensions, these are added during `_get_data()` to allow adding workers at run-time
         for chart in DYNAMIC_CHARTS:
             self.definitions[chart]['lines'] = []
-
         self.last_result = {}
         self.workers = []
 
diff --git a/collectors/python.d.plugin/uwsgi/uwsgi.conf b/collectors/python.d.plugin/uwsgi/uwsgi.conf
index be1c2ada3..7d09e7330 100644
--- a/collectors/python.d.plugin/uwsgi/uwsgi.conf
+++ b/collectors/python.d.plugin/uwsgi/uwsgi.conf
@@ -27,11 +27,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.
@@ -58,7 +56,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, uwsgi also supports the following: