Adding upstream version 1.19.0.upstream/1.19.0

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

1 files changed, 9 insertions, 0 deletions

diff --git a/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
index ad7dcce21..d581c14e7 100644
--- a/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
+++ b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
@@ -231,6 +231,7 @@ class Service(UrlService):
 
         data = loads(raw)
         stats = fetch_data(raw_data=data, metrics=NODE_STATS)
+        handle_disabled_disk_monitoring(stats)
         self.debug("number of metrics: {0}".format(len(stats)))
         return stats
 
@@ -284,3 +285,11 @@ def fetch_data(raw_data, metrics):
         data['_'.join(metrics_list)] = value
 
     return data
+
+
+def handle_disabled_disk_monitoring(node_stats):
+    # https://github.com/netdata/netdata/issues/7218
+    # can be "disk_free": "disk_free_monitoring_disabled"
+    v = node_stats.get('disk_free')
+    if v and isinstance(v, str):
+        del node_stats['disk_free']