From 652b69ad7f649c4d8dcee2e38b3b91f0f73a37a9 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Mon, 4 Apr 2016 13:53:09 +0200
Subject: [PATCH] Monitoring: Ship segment stats with node stats

This commit adds all the following segments stats to the current node_stats document:
 - memory_in_bytes
- terms_memory_in_bytes
- stored_fields_memory_in_bytes
- term_vectors_memory_in_bytes
- norms_memory_in_bytes
- doc_values_memory_in_bytes
- index_writer_memory_in_bytes
- version_map_memory_in_bytes
- fixed_bit_set_memory_in_bytes

Original commit: elastic/x-pack-elasticsearch@ea4b8034baad0eb92966153cd0f31de8559bd498
---
 .../resolver/node/NodeStatsResolver.java      |  9 +++
 .../src/main/resources/monitoring-es.json     | 77 ++++++++++++++++++-
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
index ca88b019f74..699d80efd66 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
@@ -41,6 +41,15 @@ public class NodeStatsResolver extends MonitoringIndexNameResolver.Timestamped<N
             "node_stats.indices.search.query_total",
             "node_stats.indices.search.query_time_in_millis",
             "node_stats.indices.segments.count",
+            "node_stats.indices.segments.memory_in_bytes",
+            "node_stats.indices.segments.terms_memory_in_bytes",
+            "node_stats.indices.segments.stored_fields_memory_in_bytes",
+            "node_stats.indices.segments.term_vectors_memory_in_bytes",
+            "node_stats.indices.segments.norms_memory_in_bytes",
+            "node_stats.indices.segments.doc_values_memory_in_bytes",
+            "node_stats.indices.segments.index_writer_memory_in_bytes",
+            "node_stats.indices.segments.version_map_memory_in_bytes",
+            "node_stats.indices.segments.fixed_bit_set_memory_in_bytes",
             "node_stats.fs.total.total_in_bytes",
             "node_stats.fs.total.free_in_bytes",
             "node_stats.fs.total.available_in_bytes",
diff --git a/elasticsearch/x-pack/marvel/src/main/resources/monitoring-es.json b/elasticsearch/x-pack/marvel/src/main/resources/monitoring-es.json
index 5919d19c1d8..cf95b493406 100644
--- a/elasticsearch/x-pack/marvel/src/main/resources/monitoring-es.json
+++ b/elasticsearch/x-pack/marvel/src/main/resources/monitoring-es.json
@@ -318,7 +318,82 @@
               "type": "short"
             },
             "indices": {
-              "type": "object"
+              "properties": {
+                "docs": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "indexing": {
+                  "properties": {
+                    "index_time_in_millis": {
+                      "type": "long"
+                    },
+                    "index_total": {
+                      "type": "long"
+                    },
+                    "throttle_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "query_time_in_millis": {
+                      "type": "long"
+                    },
+                    "query_total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "segments": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "terms_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "stored_fields_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "term_vectors_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "norms_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "doc_values_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "index_writer_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "version_map_memory_in_bytes": {
+                      "type": "long"
+                    },
+                    "fixed_bit_set_memory_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "store": {
+                  "properties": {
+                    "size_in_bytes": {
+                      "type": "long"
+                    },
+                    "throttle_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
             },
             "fs": {
               "type": "object"