elastic - add missing metrics

metrics are added for various versions of elasticsearch

checks.d/elastic.py

@@ -132,30 +132,47 @@ class ESCheck(AgentCheck):
         "elasticsearch.thread_pool.flush.active": ("gauge", "thread_pool.flush.active"),
         "elasticsearch.thread_pool.flush.threads": ("gauge", "thread_pool.flush.threads"),
         "elasticsearch.thread_pool.flush.queue": ("gauge", "thread_pool.flush.queue"),
+        "elasticsearch.thread_pool.flush.rejected": ("gauge", "thread_pool.flush.rejected"),
         "elasticsearch.thread_pool.generic.active": ("gauge", "thread_pool.generic.active"),
         "elasticsearch.thread_pool.generic.threads": ("gauge", "thread_pool.generic.threads"),
         "elasticsearch.thread_pool.generic.queue": ("gauge", "thread_pool.generic.queue"),
+        "elasticsearch.thread_pool.generic.rejected": ("gauge", "thread_pool.generic.rejected"),
         "elasticsearch.thread_pool.get.active": ("gauge", "thread_pool.get.active"),
         "elasticsearch.thread_pool.get.threads": ("gauge", "thread_pool.get.threads"),
         "elasticsearch.thread_pool.get.queue": ("gauge", "thread_pool.get.queue"),
+        "elasticsearch.thread_pool.get.rejected": ("gauge", "thread_pool.get.rejected"),
         "elasticsearch.thread_pool.index.active": ("gauge", "thread_pool.index.active"),
         "elasticsearch.thread_pool.index.threads": ("gauge", "thread_pool.index.threads"),
         "elasticsearch.thread_pool.index.queue": ("gauge", "thread_pool.index.queue"),
+        "elasticsearch.thread_pool.index.rejected": ("gauge", "thread_pool.index.rejected"),
         "elasticsearch.thread_pool.management.active": ("gauge", "thread_pool.management.active"),
         "elasticsearch.thread_pool.management.threads": ("gauge", "thread_pool.management.threads"),
         "elasticsearch.thread_pool.management.queue": ("gauge", "thread_pool.management.queue"),
+        "elasticsearch.thread_pool.management.rejected": ("gauge", "thread_pool.management.rejected"),
         "elasticsearch.thread_pool.percolate.active": ("gauge", "thread_pool.percolate.active"),
         "elasticsearch.thread_pool.percolate.threads": ("gauge", "thread_pool.percolate.threads"),
         "elasticsearch.thread_pool.percolate.queue": ("gauge", "thread_pool.percolate.queue"),
+        "elasticsearch.thread_pool.percolate.rejected": ("gauge", "thread_pool.percolate.rejected"),
         "elasticsearch.thread_pool.refresh.active": ("gauge", "thread_pool.refresh.active"),
         "elasticsearch.thread_pool.refresh.threads": ("gauge", "thread_pool.refresh.threads"),
         "elasticsearch.thread_pool.refresh.queue": ("gauge", "thread_pool.refresh.queue"),
+        "elasticsearch.thread_pool.refresh.rejected": ("gauge", "thread_pool.refresh.rejected"),
         "elasticsearch.thread_pool.search.active": ("gauge", "thread_pool.search.active"),
         "elasticsearch.thread_pool.search.threads": ("gauge", "thread_pool.search.threads"),
         "elasticsearch.thread_pool.search.queue": ("gauge", "thread_pool.search.queue"),
+        "elasticsearch.thread_pool.search.rejected": ("gauge", "thread_pool.search.rejected"),
         "elasticsearch.thread_pool.snapshot.active": ("gauge", "thread_pool.snapshot.active"),
         "elasticsearch.thread_pool.snapshot.threads": ("gauge", "thread_pool.snapshot.threads"),
         "elasticsearch.thread_pool.snapshot.queue": ("gauge", "thread_pool.snapshot.queue"),
+        "elasticsearch.thread_pool.snapshot.rejected": ("gauge", "thread_pool.snapshot.rejected"),
+        "elasticsearch.thread_pool.suggest.active": ("gauge", "thread_pool.suggest.active"),
+        "elasticsearch.thread_pool.suggest.threads": ("gauge", "thread_pool.suggest.threads"),
+        "elasticsearch.thread_pool.suggest.queue": ("gauge", "thread_pool.suggest.queue"),
+        "elasticsearch.thread_pool.suggest.rejected": ("gauge", "thread_pool.suggest.rejected"),
+        "elasticsearch.thread_pool.warmer.active": ("gauge", "thread_pool.warmer.active"),
+        "elasticsearch.thread_pool.warmer.threads": ("gauge", "thread_pool.warmer.threads"),
+        "elasticsearch.thread_pool.warmer.queue": ("gauge", "thread_pool.warmer.queue"),
+        "elasticsearch.thread_pool.warmer.rejected": ("gauge", "thread_pool.warmer.rejected"),
         "elasticsearch.http.current_open": ("gauge", "http.current_open"),
         "elasticsearch.http.total_opened": ("gauge", "http.total_opened"),
         "jvm.mem.heap_committed": ("gauge", "jvm.mem.heap_committed_in_bytes"),
@@ -227,14 +244,75 @@ class ESCheck(AgentCheck):
     }
 
     ADDITIONAL_METRICS_POST_1_4_0 = {
+        "elasticsearch.indices.indexing.throttle_time_in_millis": ("guage", "indices.indexing.throttle_time_in_millis", lambda v: float(v)/1000),
+        "elasticsearch.indices.query_cache.memory_size_in_bytes": ("guage", "indices.query_cache.memory_size_in_bytes"),
+        "elasticsearch.indices.query_cache.hit_count": ("guage", "indices.query_cache.hit_count"),
+        "elasticsearch.indices.query_cache.miss_count": ("guage", "indices.query_cache.miss_count"),
+        "elasticsearch.indices.query_cache.evictions": ("guage", "indices.query_cache.evictions"),
         "elasticsearch.indices.segments.index_writer_max_memory_in_bytes": ("gauge", "indices.segments.index_writer_max_memory_in_bytes"),
         "elasticsearch.indices.segments.fixed_bit_set_memory_in_bytes": ("gauge", "indices.segments.fixed_bit_set_memory_in_bytes"),
+        "elasticsearch.breakers.fielddata.estimated_size_in_bytes": ("guage", "breakers.fielddata.estimated_size_in_bytes"),
+        "elasticsearch.breakers.fielddata.overhead": ("guage", "breakers.fielddata.overhead"),
+        "elasticsearch.breakers.fielddata.tripped": ("guage", "breakers.fielddata.tripped"),
+        "elasticsearch.breakers.parent.estimated_size_in_bytes": ("guage", "breakers.fielddata.estimated_size_in_bytes"),
+        "elasticsearch.breakers.parent.overhead": ("guage", "breakers.fielddata.overhead"),
+        "elasticsearch.breakers.parent.tripped": ("guage", "breakers.fielddata.tripped"),
+        "elasticsearch.breakers.request.estimated_size_in_bytes": ("guage", "breakers.fielddata.estimated_size_in_bytes"),
+        "elasticsearch.breakers.request.overhead": ("guage", "breakers.fielddata.overhead"),
+        "elasticsearch.breakers.request.tripped": ("guage", "breakers.fielddata.tripped"),
+        "elasticsearch.thread_pool.listener.active": ("gauge", "thread_pool.listener.active"),
+        "elasticsearch.thread_pool.listener.threads": ("gauge", "thread_pool.listener.threads"),
+        "elasticsearch.thread_pool.listener.queue": ("gauge", "thread_pool.listener.queue"),
+        "elasticsearch.thread_pool.listener.rejected": ("gauge", "thread_pool.listener.rejected"),
+    }
+
+    ADDITIONAL_METRICS_POST_1_5_0 = {
+        "elasticsearch.indices.recovery.current_as_source": ("guage", "indices.recovery.current_as_source"),
+        "elasticsearch.indices.recovery.current_as_target": ("guage", "indices.recovery.current_as_target"),
+        "elasticsearch.indices.recovery.throttle_time_in_millis": ("guage", "indices.recovery.throttle_time_in_millis", lambda v: float(v)/1000),
+    }
+
+    ADDITIONAL_METRICS_POST_1_6_0 = {
+        "elasticsearch.thread_pool.fetch_shard_started.active": ("gauge", "thread_pool.fetch_shard_started.active"),
+        "elasticsearch.thread_pool.fetch_shard_started.threads": ("gauge", "thread_pool.fetch_shard_started.threads"),
+        "elasticsearch.thread_pool.fetch_shard_started.queue": ("gauge", "thread_pool.fetch_shard_started.queue"),
+        "elasticsearch.thread_pool.fetch_shard_started.rejected": ("gauge", "thread_pool.fetch_shard_started.rejected"),
+        "elasticsearch.thread_pool.fetch_shard_store.active": ("gauge", "thread_pool.fetch_shard_store.active"),
+        "elasticsearch.thread_pool.fetch_shard_store.threads": ("gauge", "thread_pool.fetch_shard_store.threads"),
+        "elasticsearch.thread_pool.fetch_shard_store.queue": ("gauge", "thread_pool.fetch_shard_store.queue"),
+        "elasticsearch.thread_pool.fetch_shard_store.rejected": ("gauge", "thread_pool.fetch_shard_store.rejected"),
     }
 
     ADDITIONAL_METRICS_PRE_2_0 = {
         "elasticsearch.thread_pool.merge.active": ("gauge", "thread_pool.merge.active"),
         "elasticsearch.thread_pool.merge.threads": ("gauge", "thread_pool.merge.threads"),
         "elasticsearch.thread_pool.merge.queue": ("gauge", "thread_pool.merge.queue"),
+        "elasticsearch.thread_pool.merge.rejected": ("gauge", "thread_pool.merge.rejected"),
+    }
+
+    ADDITIONAL_METRICS_POST_2_0 = {
+        # Some of these may very well exist in previous ES versions, but not worth the time/effort
+        # to find where they were introduced
+        "elasticsearch.indices.query_cache.cache_size": ("guage", "indices.query_cache.cache_size"),
+        "elasticsearch.indices.query_cache.cache_count": ("guage", "indices.query_cache.cache_count"),
+        "elasticsearch.indices.query_cache.total_count": ("guage", "indices.query_cache.total_count"),
+        "elasticsearch.indices.segments.doc_values_memory_in_bytes": ("guage", "indices.segments.doc_values_memory_in_bytes"),
+        "elasticsearch.indices.segments.norms_memory_in_bytes": ("guage", "indices.segments.norms_memory_in_bytes"),
+        "elasticsearch.indices.segments.stored_fields_memory_in_bytes": ("guage", "indices.segments.stored_fields_memory_in_bytes"),
+        "elasticsearch.indices.segments.term_memory_in_bytes": ("guage", "indices.segments.term_memory_in_bytes"),
+        "elasticsearch.indices.segments.terms_memory_in_bytes": ("guage", "indices.segments.terms_memory_in_bytes"),
+        "elasticsearch.indices.request_cache.memory_size_in_bytes": ("guage", "indices.request_cache.memory_size_in_bytes"),
+        "elasticsearch.indices.request_cache.evictions": ("guage", "indices.request_cache.evictions"),
+        "elasticsearch.indices.request_cache.hit_count": ("guage", "indices.request_cache.hit_count"),
+        "elasticsearch.indices.request_cache.miss_count": ("guage", "indices.request_cache.miss_count"),
+    }
+
+    ADDITIONAL_METRICS_POST_2_1 = {
+        "elasticsearch.indices.indexing.index_failed": ("guage", "indices.indexing.index_failed"),
+        "elasticsearch.thread_pool.force_merge.active": ("gauge", "thread_pool.force_merge.active"),
+        "elasticsearch.thread_pool.force_merge.threads": ("gauge", "thread_pool.force_merge.threads"),
+        "elasticsearch.thread_pool.force_merge.queue": ("gauge", "thread_pool.force_merge.queue"),
+        "elasticsearch.thread_pool.force_merge.rejected": ("gauge", "thread_pool.force_merge.rejected"),
     }
 
     CLUSTER_HEALTH_METRICS = {
@@ -431,6 +509,18 @@ def _define_params(self, version, cluster_stats):
             # ES versions 1.4 and above
             stats_metrics.update(self.ADDITIONAL_METRICS_POST_1_4_0)
 
+        if version >= [1, 5, 0]:
+            stats_metrics.update(self.ADDITIONAL_METRICS_POST_1_5_0)
+
+        if version >= [1, 6, 0]:
+            stats_metrics.update(self.ADDITIONAL_METRICS_POST_1_6_0)
+
+        if version >= [2, 0, 0]:
+            stats_metrics.update(self.ADDITIONAL_METRICS_POST_2_0)
+
+        if version >= [2, 1, 0]:
+            stats_metrics.update(self.ADDITIONAL_METRICS_POST_2_1)
+
         # Version specific stats metrics about the primary shards
         pshard_stats_metrics = dict(self.PRIMARY_SHARD_METRICS)