diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-06-07 10:58:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 10:58:53 +0200 |
| commit | ed73af668198f21e861dd4ae11a53c9bf2b17475 (patch) | |
| tree | 157c8a50fa6603df728d59f4fd6fc4b6a40d8c9d /config-model | |
| parent | 86e1f3e7b711c2d7787ed8a546f9c809c4ccc787 (diff) | |
| parent | cf3decd1e1683ba24081ddf067ce34ca2c4c331d (diff) | |
Merge pull request #2641 from yahoo/gjoranv/system-metric-names
Whitelist correct non-docker metric names.
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java | 5 |
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() |