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, 20 deletions

diff --git a/collectors/python.d.plugin/dovecot/README.md b/collectors/python.d.plugin/dovecot/README.md
index 50950ecc1..de8788b36 100644
--- a/collectors/python.d.plugin/dovecot/README.md
+++ b/collectors/python.d.plugin/dovecot/README.md
@@ -1,9 +1,13 @@
 # dovecot
 
 This module provides statistics information from Dovecot server.
+
 Statistics are taken from dovecot socket by executing `EXPORT global` command.
 More information about dovecot stats can be found on [project wiki page.](http://wiki2.dovecot.org/Statistics)
 
+Module isn't compatible with new statistic api (v2.3), but you are still able to use the module with Dovecot v2.3
+by following [upgrading steps.](https://wiki2.dovecot.org/Upgrading/2.3).
+
 **Requirement:**
 Dovecot UNIX socket with R/W permissions for user netdata or Dovecot with configured TCP/IP socket.
 
@@ -71,3 +75,5 @@ localsocket:
 If no configuration is given, module will attempt to connect to dovecot using unix socket localized in `/var/run/dovecot/stats`
 
 ---
+
+[![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%2Fdovecot%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/dovecot/dovecot.chart.py b/collectors/python.d.plugin/dovecot/dovecot.chart.py
index 7fee3bfac..be1fa53d5 100644
--- a/collectors/python.d.plugin/dovecot/dovecot.chart.py
+++ b/collectors/python.d.plugin/dovecot/dovecot.chart.py
@@ -5,12 +5,10 @@
 
 from bases.FrameworkServices.SocketService import SocketService
 
-# default module values (can be overridden per job in `config`)
-# update_every = 2
-priority = 60000
-retries = 60
 
-# charts order (can be overridden if you want less charts, or different order)
+UNIX_SOCKET = '/var/run/dovecot/stats'
+
+
 ORDER = [
     'sessions',
     'logins',
@@ -53,14 +51,14 @@ CHARTS = {
         ]
     },
     'context_switches': {
-        'options': [None, 'Dovecot Context Switches', '', 'context switches', 'dovecot.context_switches', 'line'],
+        'options': [None, 'Dovecot Context Switches', 'switches', 'context switches', 'dovecot.context_switches', 'line'],
         'lines': [
             ['vol_cs', 'voluntary', 'absolute'],
             ['invol_cs', 'involuntary', 'absolute']
         ]
     },
     'io': {
-        'options': [None, 'Dovecot Disk I/O', 'kilobytes/s', 'disk', 'dovecot.io', 'area'],
+        'options': [None, 'Dovecot Disk I/O', 'KiB/s', 'disk', 'dovecot.io', 'area'],
         'lines': [
             ['disk_input', 'read', 'incremental', 1, 1024],
             ['disk_output', 'write', 'incremental', -1, 1024]
@@ -69,8 +67,8 @@ CHARTS = {
     'net': {
         'options': [None, 'Dovecot Network Bandwidth', 'kilobits/s', 'network', 'dovecot.net', 'area'],
         'lines': [
-            ['read_bytes', 'read', 'incremental', 8, 1024],
-            ['write_bytes', 'write', 'incremental', -8, 1024]
+            ['read_bytes', 'read', 'incremental', 8, 1000],
+            ['write_bytes', 'write', 'incremental', -8, 1000]
         ]
     },
     'syscalls': {
@@ -113,13 +111,12 @@ CHARTS = {
 class Service(SocketService):
     def __init__(self, configuration=None, name=None):
         SocketService.__init__(self, configuration=configuration, name=name)
-        self.request = 'EXPORT\tglobal\r\n'
-        self.host = None  # localhost
-        self.port = None  # 24242
-        # self._keep_alive = True
-        self.unix_socket = '/var/run/dovecot/stats'
         self.order = ORDER
         self.definitions = CHARTS
+        self.host = None  # localhost
+        self.port = None  # 24242
+        self.unix_socket = UNIX_SOCKET
+        self.request = 'EXPORT\tglobal\r\n'
 
     def _get_data(self):
         """
diff --git a/collectors/python.d.plugin/dovecot/dovecot.conf b/collectors/python.d.plugin/dovecot/dovecot.conf
index 56c394991..451dbc9ac 100644
--- a/collectors/python.d.plugin/dovecot/dovecot.conf
+++ b/collectors/python.d.plugin/dovecot/dovecot.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, dovecot also supports the following:
@@ -94,3 +92,7 @@ localsocket:
   name     : 'local'
   socket   : '/var/run/dovecot/stats'
 
+localsocket_old:
+  name     : 'local'
+  socket   : '/var/run/dovecot/old-stats'
+