summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-11-27 12:41:56 +0100
committerGitHub <noreply@github.com>2017-11-27 12:41:56 +0100
commit3d3d44e357246d9f23c3face130729a52c0fb37b (patch)
treefbb03b0f6087a475959af810c6fc90c4216c047e /config-model
parent0b029516b14ccf7a8c15579117b78bdab8ba43a8 (diff)
parent5cc155fbac9306527b2451836ffad1ac74555046 (diff)
Merge pull request #4277 from vespa-engine/freva/docker-container-kernel-usage
Freva/docker container kernel usage
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java2
1 files changed, 2 insertions, 0 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 cafdf83608f..3db09f6b566 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
@@ -11,6 +11,7 @@ import java.util.Set;
@SuppressWarnings("UnusedDeclaration") // Used by model amenders
public class SystemMetrics {
public static final String CPU_UTIL = "cpu.util";
+ public static final String CPU_SYS_UTIL = "cpu.sys.util";
public static final String DISK_LIMIT = "disk.limit";
public static final String DISK_USED = "disk.used";
public static final String DISK_UTIL = "disk.util";
@@ -23,6 +24,7 @@ public class SystemMetrics {
private static MetricSet createSystemMetricSet() {
Set<Metric> dockerNodeMetrics =
ImmutableSet.of(new Metric(CPU_UTIL),
+ new Metric(CPU_SYS_UTIL),
new Metric(DISK_LIMIT),
new Metric(DISK_USED),
new Metric(DISK_UTIL),