From 17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 28 Nov 2019 05:53:29 +0100 Subject: Merging upstream version 1.19.0. Signed-off-by: Daniel Baumann --- collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py') 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'] -- cgit v1.2.3