Merge pull request ganglia#126 from avleen/elasticsearch

jbuchbinder · jbuchbinder · commit 37eee4c616d9 · 2013-12-24T20:05:42.000-08:00
Update elasticsearch.py
diff --git a/elasticsearch/python_modules/elasticsearch.py b/elasticsearch/python_modules/elasticsearch.py
@@ -127,7 +127,7 @@ def update_result(result, url):
     diff = now - last_update
     if diff > 20:
         print '[elasticsearch] ' + str(diff) + ' seconds passed - Fetching ' + url
-        result = json.load(urllib.urlopen(url, None, 2))
+        result = json.load(urllib.urlopen(url))
         last_update = now
 
     return result
@@ -199,7 +199,7 @@ def metric_init(params):
 
     # First iteration - Grab statistics
     print('[elasticsearch] Fetching ' + url_cluster)
-    result = json.load(urllib.urlopen(url_cluster, None, 2))
+    result = json.load(urllib.urlopen(url_cluster))
 
     metric_group = params.get('metric_group', 'elasticsearch')
 
@@ -220,7 +220,7 @@ def metric_init(params):
         url_indices = '{0}{1}/_stats'.format(host, index)
         print('[elasticsearch] Fetching ' + url_indices)
 
-        r_indices = json.load(urllib.urlopen(url_indices, None, 2))
+        r_indices = json.load(urllib.urlopen(url_indices))
         descriptors += get_indices_descriptors(index,
                                                Desc_Skel,
                                                r_indices,
