From 6085c5aba9b33ef32e880dfaae5e7800e39e134d Mon Sep 17 00:00:00 2001
From: Chris Earle <chris.earle@elastic.co>
Date: Tue, 13 Sep 2016 16:34:22 -0400
Subject: [PATCH] [Monitoring UI] Cleanup Cluster Overview and Node Summary

This cleans up some of the reported stats to be a little clearer, including making the JVM Heap chart behave like Kibana's memory chart. This solves two problems: you can now determine the max heap size and you know what "x%" actually means relative to it.

Original commit: elastic/x-pack-elasticsearch@450f6fd546a5f7bb88a8af2247cd962146da70ab
---
 .../xpack/monitoring/resolver/cluster/ClusterStatsResolver.java | 2 ++
 .../xpack/monitoring/resolver/node/NodeStatsResolver.java       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java
index 4295c59a791..8e8213ad910 100644
--- a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java
+++ b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java
@@ -31,6 +31,8 @@ public class ClusterStatsResolver extends MonitoringIndexNameResolver.Timestampe
             "cluster_stats.nodes.count.total",
             "cluster_stats.indices.count",
             "cluster_stats.indices.shards.total",
+            "cluster_stats.indices.shards.primaries",
+            "cluster_stats.indices.shards.replication",
             "cluster_stats.indices.shards.index.replication.min",
             "cluster_stats.indices.docs.count",
             "cluster_stats.indices.store.size_in_bytes",
diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
index 48898c800c3..53234c4c707 100644
--- a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
+++ b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
@@ -70,6 +70,7 @@ public class NodeStatsResolver extends MonitoringIndexNameResolver.Timestamped<N
             "node_stats.process.cpu.percent",
             "node_stats.process.max_file_descriptors",
             "node_stats.process.open_file_descriptors",
+            "node_stats.jvm.mem.heap_max_in_bytes",
             "node_stats.jvm.mem.heap_used_in_bytes",
             "node_stats.jvm.mem.heap_used_percent",
             "node_stats.jvm.gc.collectors.young",