updates for ES 1.4.4 compatibility

frankfarmer · frankfarmer · commit 61f9ddc75a2a · 2015-03-10T18:38:13.000-07:00
diff --git a/elasticsearch/python_modules/elasticsearch.py b/elasticsearch/python_modules/elasticsearch.py
@@ -21,13 +21,10 @@
 # INDICES METRICS #
 
 ## CACHE
-keyToPath['es_cache_field_eviction'] = "nodes.%s.indices.cache.field_evictions"
-keyToPath['es_cache_field_size'] = "nodes.%s.indices.cache.field_size_in_bytes"
-keyToPath['es_cache_filter_count'] = "nodes.%s.indices.cache.filter_count"
-keyToPath[
-    'es_cache_filter_evictions'] = "nodes.%s.indices.cache.filter_evictions"
-keyToPath[
-    'es_cache_filter_size'] = "nodes.%s.indices.cache.filter_size_in_bytes"
+keyToPath['es_cache_field_eviction'] = "nodes.%s.indices.fielddata.evictions"
+keyToPath['es_cache_field_size'] = "nodes.%s.indices.fielddata.memory_size_in_bytes"
+keyToPath['es_cache_filter_evictions'] = "nodes.%s.indices.filter_cache.evictions"
+keyToPath['es_cache_filter_size'] = "nodes.%s.indices.cache.filter_size_in_bytes"
 
 ## DOCS
 keyToPath['es_docs_count'] = "nodes.%s.indices.docs.count"
@@ -91,8 +88,10 @@
 keyToPath['es_threads_peak'] = "nodes.%s.jvm.threads.peak_count"
 
 ## GC
-keyToPath['es_gc_time'] = "nodes.%s.jvm.gc.collection_time_in_millis"
-keyToPath['es_gc_count'] = "nodes.%s.jvm.gc.collection_count"
+keyToPath['es_gc_time_old'] = "nodes.%s.jvm.gc.collectors.old.collection_time_in_millis"
+keyToPath['es_gc_count_old'] = "nodes.%s.jvm.gc.collectors.old.collection_count"
+keyToPath['es_gc_time_young'] = "nodes.%s.jvm.gc.collectors.young.collection_time_in_millis"
+keyToPath['es_gc_count_young'] = "nodes.%s.jvm.gc.collectors.young.collection_count"
 
 # TRANSPORT METRICS #
 keyToPath['es_transport_open'] = "nodes.%s.transport.server_open"
@@ -288,7 +287,17 @@ def metric_init(params):
 
     descriptors.append(
         _create_desc({
-            'name': 'es_gc_time',
+            'name': 'es_gc_time_old',
+            'units': 'ms',
+            'format': '%d',
+            'slope': 'positive',
+            'description': 'Java GC Time (ms)'
+        })
+    )
+
+    descriptors.append(
+        _create_desc({
+            'name': 'es_gc_time_young',
             'units': 'ms',
             'format': '%d',
             'slope': 'positive',
@@ -376,7 +385,16 @@ def metric_init(params):
 
     descriptors.append(
         _create_desc({
-            'name': 'es_gc_count',
+            'name': 'es_gc_count_old',
+            'format': '%d',
+            'slope': 'positive',
+            'description': 'Java GC Count',
+        })
+    )
+
+    descriptors.append(
+        _create_desc({
+            'name': 'es_gc_count_young',
             'format': '%d',
             'slope': 'positive',
             'description': 'Java GC Count',
@@ -516,14 +534,6 @@ def metric_init(params):
         })
     )
 
-    descriptors.append(
-        _create_desc({
-            'name': 'es_cache_filter_count',
-            'format': '%d',
-            'description': 'Filter Cache Count',
-        })
-    )
-
     descriptors.append(
         _create_desc({
             'name': 'es_cache_filter_evictions',
