Merge pull request ganglia#205 from jeffk/dyn_elasticsearch_version

jbuchbinder · jbuchbinder · commit 12ff387273ef · 2015-07-17T12:38:45.000-04:00
Dyn elasticsearch version
diff --git a/elasticsearch/python_modules/elasticsearch.py b/elasticsearch/python_modules/elasticsearch.py
@@ -187,12 +187,20 @@ def metric_init(params):
 
     host = params.get('host', 'http://localhost:9200/')
 
-    version = params.get('version', '1.2')
-    
+    try:
+        result = json.load(urllib.urlopen(host))
+    except (ValueError, IOError):
+        result = {}
+
+    host_version = result.get('version',{}).get('number') or "1.2"
+    version = params.get('version', host_version)
+
     m = re.match('(?P<major>\d+)\.(?P<minor>(\d+(\.\d+)*))', version)
-     
+
     if m and m.group('major') == '0':
         url_cluster = '{0}_cluster/nodes/_local/stats?all=true'.format(host)
+    elif m and m.group('major') == '1' and m.group('minor') == '3.2':
+        url_cluster = '{0}_nodes/_local/stats'.format(host)
     else:
         url_cluster = '{0}_cluster/state/nodes'.format(host)
 
