SONAR-5936 remove "Disk Usage" from ES info

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java
index 98eb9c9bea9d5c72f86f834c025cfdf6d8a87d3c..743a5c11af72c93fa8c98ae16ad10d6df9a8b831 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsMonitor.java
@@ -101,7 +101,6 @@ public class EsMonitor extends BaseMonitorMBean implements EsMonitorMBean {
       NodeStats stats = entry.getValue();
       nodeAttributes.put("Address", stats.getNode().getAddress().toString());
       nodeAttributes.put("Type", stats.getNode().isMasterNode() ? "Master" : "Slave");
-      nodeAttributes.put("Disk Usage", byteCountToDisplaySize(stats.getFs().getTotal().getTotal().bytes()));
       nodeAttributes.put("Disk Available", byteCountToDisplaySize(stats.getFs().getTotal().getAvailable().bytes()));
       nodeAttributes.put("Store Size", byteCountToDisplaySize(stats.getIndices().getStore().getSizeInBytes()));
       nodeAttributes.put("Open Files", stats.getProcess().getOpenFileDescriptors());

diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java
index b95584d1fb268ff9fe4c1f55772f16a32fe96f3b..b633e5493d2568899465b9dca56e04b4e9861b66 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsMonitorTest.java
@@ -62,7 +62,6 @@ public class EsMonitorTest {
     assertThat(nodesAttributes).hasSize(1);
     Map nodeAttributes = (Map)nodesAttributes.values().iterator().next();
     assertThat(nodeAttributes.get("Type")).isEqualTo("Master");
-    assertThat(nodeAttributes.get("Disk Usage")).isNotNull();
     assertThat(nodeAttributes.get("Store Size")).isNotNull();
   }