Merging upstream version 1.11.0+dfsg.

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

4 files changed, 132 insertions, 49 deletions

diff --git a/collectors/python.d.plugin/rabbitmq/Makefile.inc b/collectors/python.d.plugin/rabbitmq/Makefile.inc
new file mode 100644
index 000000000..7e67ef512
--- /dev/null
+++ b/collectors/python.d.plugin/rabbitmq/Makefile.inc
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_python_DATA       += rabbitmq/rabbitmq.chart.py
+dist_pythonconfig_DATA += rabbitmq/rabbitmq.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += rabbitmq/README.md rabbitmq/Makefile.inc
+
diff --git a/collectors/python.d.plugin/rabbitmq/README.md b/collectors/python.d.plugin/rabbitmq/README.md
new file mode 100644
index 000000000..22d367c4d
--- /dev/null
+++ b/collectors/python.d.plugin/rabbitmq/README.md
@@ -0,0 +1,56 @@
+# rabbitmq
+
+Module monitor rabbitmq performance and health metrics.
+
+Following charts are drawn:
+
+1. **Queued Messages**
+ * ready
+ * unacknowledged
+
+2. **Message Rates**
+ * ack
+ * redelivered
+ * deliver
+ * publish
+
+3. **Global Counts**
+ * channels
+ * consumers
+ * connections
+ * queues
+ * exchanges
+
+4. **File Descriptors**
+ * used descriptors
+
+5. **Socket Descriptors**
+ * used descriptors
+
+6. **Erlang processes**
+ * used processes
+
+7. **Erlang run queue**
+ * Erlang run queue
+
+8. **Memory**
+ * free memory in megabytes
+
+9. **Disk Space**
+ * free disk space in gigabytes
+
+### configuration
+
+```yaml
+socket:
+  name     : 'local'
+  host     : '127.0.0.1'
+  port     :  15672
+  user     : 'guest'
+  pass     : 'guest'
+
+```
+
+When no configuration file is found, module tries to connect to: `localhost:15672`.
+
+---
diff --git a/python.d/rabbitmq.chart.py b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
index b8847e9f8..8298b4032 100644
--- a/python.d/rabbitmq.chart.py
+++ b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: rabbitmq netdata python.d module
 # Author: l2isbad
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from collections import namedtuple
 from json import loads
@@ -20,91 +21,104 @@ retries = 60
 
 METHODS = namedtuple('METHODS', ['get_data', 'url', 'stats'])
 
-NODE_STATS = ['fd_used',
-              'mem_used',
-              'sockets_used',
-              'proc_used',
-              'disk_free',
-              'run_queue'
-              ]
-OVERVIEW_STATS = ['object_totals.channels',
-                  'object_totals.consumers',
-                  'object_totals.connections',
-                  'object_totals.queues',
-                  'object_totals.exchanges',
-                  'queue_totals.messages_ready',
-                  'queue_totals.messages_unacknowledged',
-                  'message_stats.ack',
-                  'message_stats.redeliver',
-                  'message_stats.deliver',
-                  'message_stats.publish'
-                  ]
-ORDER = ['queued_messages', 'message_rates', 'global_counts',
-         'file_descriptors', 'socket_descriptors', 'erlang_processes', 'erlang_run_queue', 'memory', 'disk_space']
+NODE_STATS = [
+    'fd_used',
+    'mem_used',
+    'sockets_used',
+    'proc_used',
+    'disk_free',
+    'run_queue'
+]
+
+OVERVIEW_STATS = [
+    'object_totals.channels',
+    'object_totals.consumers',
+    'object_totals.connections',
+    'object_totals.queues',
+    'object_totals.exchanges',
+    'queue_totals.messages_ready',
+    'queue_totals.messages_unacknowledged',
+    'message_stats.ack',
+    'message_stats.redeliver',
+    'message_stats.deliver',
+    'message_stats.publish'
+]
+
+ORDER = [
+    'queued_messages',
+    'message_rates',
+    'global_counts',
+    'file_descriptors',
+    'socket_descriptors',
+    'erlang_processes',
+    'erlang_run_queue',
+    'memory',
+    'disk_space'
+]
 
 CHARTS = {
     'file_descriptors': {
-        'options': [None, 'File Descriptors', 'descriptors', 'overview',
-                    'rabbitmq.file_descriptors', 'line'],
+        'options': [None, 'File Descriptors', 'descriptors', 'overview', 'rabbitmq.file_descriptors', 'line'],
         'lines': [
             ['fd_used', 'used', 'absolute']
-        ]},
+        ]
+    },
     'memory': {
-        'options': [None, 'Memory', 'MB', 'overview',
-                    'rabbitmq.memory', 'line'],
+        'options': [None, 'Memory', 'MB', 'overview', 'rabbitmq.memory', 'line'],
         'lines': [
             ['mem_used', 'used', 'absolute', 1, 1024 << 10]
-        ]},
+        ]
+    },
     'disk_space': {
-        'options': [None, 'Disk Space', 'GB', 'overview',
-                    'rabbitmq.disk_space', 'line'],
+        'options': [None, 'Disk Space', 'GB', 'overview', 'rabbitmq.disk_space', 'line'],
         'lines': [
             ['disk_free', 'free', 'absolute', 1, 1024 ** 3]
-        ]},
+        ]
+    },
     'socket_descriptors': {
-        'options': [None, 'Socket Descriptors', 'descriptors', 'overview',
-                    'rabbitmq.sockets', 'line'],
+        'options': [None, 'Socket Descriptors', 'descriptors', 'overview', 'rabbitmq.sockets', 'line'],
         'lines': [
             ['sockets_used', 'used', 'absolute']
-        ]},
+        ]
+    },
     'erlang_processes': {
-        'options': [None, 'Erlang Processes', 'processes', 'overview',
-                    'rabbitmq.processes', 'line'],
+        'options': [None, 'Erlang Processes', 'processes', 'overview', 'rabbitmq.processes', 'line'],
         'lines': [
             ['proc_used', 'used', 'absolute']
-        ]},
+        ]
+    },
     'erlang_run_queue': {
-        'options': [None, 'Erlang Run Queue', 'processes', 'overview',
-                    'rabbitmq.erlang_run_queue', 'line'],
+        'options': [None, 'Erlang Run Queue', 'processes', 'overview', 'rabbitmq.erlang_run_queue', 'line'],
         'lines': [
-            ['run_queue',' length', 'absolute']
-        ]},
+            ['run_queue', 'length', 'absolute']
+        ]
+    },
     'global_counts': {
-        'options': [None, 'Global Counts', 'counts', 'overview',
-                    'rabbitmq.global_counts', 'line'],
+        'options': [None, 'Global Counts', 'counts', 'overview', 'rabbitmq.global_counts', 'line'],
         'lines': [
             ['object_totals_channels', 'channels', 'absolute'],
             ['object_totals_consumers', 'consumers', 'absolute'],
             ['object_totals_connections', 'connections', 'absolute'],
             ['object_totals_queues', 'queues', 'absolute'],
             ['object_totals_exchanges', 'exchanges', 'absolute']
-        ]},
+        ]
+    },
     'queued_messages': {
-        'options': [None, 'Queued Messages', 'messages', 'overview',
-                    'rabbitmq.queued_messages', 'stacked'],
+        'options': [None, 'Queued Messages', 'messages', 'overview', 'rabbitmq.queued_messages', 'stacked'],
         'lines': [
             ['queue_totals_messages_ready', 'ready', 'absolute'],
             ['queue_totals_messages_unacknowledged', 'unacknowledged', 'absolute']
-        ]},
+        ]
+    },
     'message_rates': {
-        'options': [None, 'Message Rates', 'messages/s', 'overview',
-                    'rabbitmq.message_rates', 'stacked'],
+        'options': [None, 'Message Rates', 'messages/s', 'overview', 'rabbitmq.message_rates', 'stacked'],
         'lines': [
             ['message_stats_ack', 'ack', 'incremental'],
             ['message_stats_redeliver', 'redeliver', 'incremental'],
             ['message_stats_deliver', 'deliver', 'incremental'],
             ['message_stats_publish', 'publish', 'incremental']
-        ]}
+        ]
+    }
 }
 
 
diff --git a/conf.d/python.d/rabbitmq.conf b/collectors/python.d.plugin/rabbitmq/rabbitmq.conf
index 3f90da8a2..3f90da8a2 100644
--- a/conf.d/python.d/rabbitmq.conf
+++ b/collectors/python.d.plugin/rabbitmq/rabbitmq.conf