]> arthur.barton.de Git - netdata.git/commitdiff
elastic_search plugin: check if json is callable or not
authorIlya <ilyamaschenko@gmail.com>
Fri, 17 Feb 2017 05:41:40 +0000 (14:41 +0900)
committerIlya <ilyamaschenko@gmail.com>
Fri, 17 Feb 2017 05:41:40 +0000 (14:41 +0900)
python.d/elasticsearch.chart.py

index 798238c91b12417aa0c3fb6f1244139d2111159e..12c0c1ee7d37771a3803feb8114e4b8e996cec48 100644 (file)
@@ -300,7 +300,7 @@ class Service(UrlService):
         if not data:
             queue.put({})
         else:
-            data = data.json()
+            data = data.json() if '__call__' in dir(data.json) else data.json
 
             to_netdata = dict()
             to_netdata.update(update_key('health', data))
@@ -321,7 +321,7 @@ class Service(UrlService):
         if not data:
             queue.put({})
         else:
-            data = data.json()
+            data = data.json() if '__call__' in dir(data.json) else data.json
 
             to_netdata = dict()
             to_netdata.update(update_key('count', data['nodes']['count']))
@@ -344,7 +344,8 @@ class Service(UrlService):
         if not data:
             queue.put({})
         else:
-            data = data.json()
+            data = data.json() if '__call__' in dir(data.json) else data.json
+
             node = list(data['nodes'].keys())[0]
             to_netdata = dict()
             # Search performance metrics