Adding upstream version 1.12.0.upstream/1.12.0

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

3 files changed, 25 insertions, 15 deletions

diff --git a/collectors/python.d.plugin/dockerd/README.md b/collectors/python.d.plugin/dockerd/README.md
index d3f603808..b09a5d59f 100644
--- a/collectors/python.d.plugin/dockerd/README.md
+++ b/collectors/python.d.plugin/dockerd/README.md
@@ -3,7 +3,7 @@
 Module monitor docker health metrics.
 
 **Requirement:**
-* `docker` package
+* `docker` package, required version 3.2.0+
 
 Following charts are drawn:
 
@@ -24,3 +24,5 @@ Following charts are drawn:
  ```
 
 ---
+
+[![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%2Fdockerd%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/dockerd/dockerd.chart.py b/collectors/python.d.plugin/dockerd/dockerd.chart.py
index a0d3d7e65..8bd45df9e 100644
--- a/collectors/python.d.plugin/dockerd/dockerd.chart.py
+++ b/collectors/python.d.plugin/dockerd/dockerd.chart.py
@@ -10,10 +10,8 @@ except ImportError:
 
 from bases.FrameworkServices.SimpleService import SimpleService
 
-# default module values (can be overridden per job in `config`)
-# update_every = 1
-priority = 60000
-retries = 60
+from distutils.version import StrictVersion
+
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = [
@@ -24,21 +22,21 @@ ORDER = [
 
 CHARTS = {
     'running_containers': {
-        'options': [None, 'Number of running containers', 'running containers', 'running containers',
+        'options': [None, 'Number of running containers', 'containers', 'running containers',
                     'docker.running_containers', 'line'],
         'lines': [
             ['running_containers', 'running']
         ]
     },
     'healthy_containers': {
-        'options': [None, 'Number of healthy containers', 'healthy containers', 'healthy containers',
+        'options': [None, 'Number of healthy containers', 'containers', 'healthy containers',
                     'docker.healthy_containers', 'line'],
         'lines': [
             ['healthy_containers', 'healthy']
         ]
     },
     'unhealthy_containers': {
-        'options': [None, 'Number of unhealthy containers', 'unhealthy containers', 'unhealthy containers',
+        'options': [None, 'Number of unhealthy containers', 'containers', 'unhealthy containers',
                     'docker.unhealthy_containers', 'line'],
         'lines': [
             ['unhealthy_containers', 'unhealthy']
@@ -47,15 +45,26 @@ CHARTS = {
 }
 
 
+MIN_REQUIRED_VERSION = '3.2.0'
+
+
 class Service(SimpleService):
     def __init__(self, configuration=None, name=None):
         SimpleService.__init__(self, configuration=configuration, name=name)
         self.order = ORDER
         self.definitions = CHARTS
+        self.client = None
 
     def check(self):
         if not HAS_DOCKER:
-            self.error('\'docker\' package is needed to use docker.chart.py')
+            self.error("'docker' package is needed to use dockerd module")
+            return False
+
+        if StrictVersion(docker.__version__) < StrictVersion(MIN_REQUIRED_VERSION):
+            self.error("installed 'docker' package version {0}, minimum required version {1}, please upgrade".format(
+                docker.__version__,
+                MIN_REQUIRED_VERSION,
+            ))
             return False
 
         self.client = docker.DockerClient(base_url=self.configuration.get('url', 'unix://var/run/docker.sock'))
@@ -70,6 +79,7 @@ class Service(SimpleService):
 
     def get_data(self):
         data = dict()
+
         data['running_containers'] = len(self.client.containers.list(sparse=True))
         data['healthy_containers'] = len(self.client.containers.list(filters={'health': 'healthy'}, sparse=True))
         data['unhealthy_containers'] = len(self.client.containers.list(filters={'health': 'unhealthy'}, sparse=True))
diff --git a/collectors/python.d.plugin/dockerd/dockerd.conf b/collectors/python.d.plugin/dockerd/dockerd.conf
index 5ef17a1f5..96c8ee0d8 100644
--- a/collectors/python.d.plugin/dockerd/dockerd.conf
+++ b/collectors/python.d.plugin/dockerd/dockerd.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: 10             # 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, dockerd plugin also supports the following: