Whitelist correct non-docker metric names.

* disk.limit will be calculated in metricsproxy, so remove it
  from whitelisting.

1 files changed, 2 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
index 5f637090b73..5967771d904 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
@@ -35,10 +35,9 @@ public class SystemMetrics {
                 // Disk metrics should be based on /home, or else '/' - or simply add filesystem as dimension
                 ImmutableSet.of(new Metric("cpu.busy.pct", CPU_UTIL),
                                 new Metric("mem.used.pct", MEM_UTIL),
-                                new Metric("memory.usage", MEM_USED),
+                                new Metric("mem.active.kb", MEM_USED),
                                 new Metric("mem.total.kb", MEM_LIMIT),
-                                new Metric("fs.used.kb", DISK_USED),
-                                new Metric("fs.capacity.kb", DISK_LIMIT)
+                                new Metric("used.kb", DISK_USED)
                 );
 
         Set<Metric> systemMetrics = ImmutableSet.<Metric>builder()