From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 24 Feb 2015 13:18:52 +0000 (+0100)
Subject: SONAR-5936 remove "Disk Usage" from ES info
X-Git-Tag: 5.1-RC1~78
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9912d07d159b1cfdb319ffea7541665108738af9;p=sonarqube.git

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 98eb9c9bea9..743a5c11af7 100644
--- 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 b95584d1fb2..b633e5493d2 100644
--- 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();
   }