summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-06-21 11:51:16 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-06-21 11:51:16 +0200
commitecf4464a633104d180fad9ca5da15baae36a8514 (patch)
tree0b95251a800450b8b18740410935c3919a5ac5b2 /node-admin
parent5951ad48fc938e014c84a1d68ac053e39725460b (diff)
Add ns suffix to metric name
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java2
-rw-r--r--node-admin/src/test/resources/expected.container.system.metrics.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index c1ecb1a9a7e..5ca02f82aa5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -562,7 +562,7 @@ public class NodeAgentImpl implements NodeAgent {
.withMetric("mem_total.util", 100 * memoryTotalUsageRatio)
.withMetric("cpu.util", 100 * cpuUsageRatioOfAllocated)
.withMetric("cpu.sys.util", 100 * cpuKernelUsageRatioOfAllocated)
- .withMetric("cpu.throttled_time", cpuThrottledTime)
+ .withMetric("cpu.throttled_time.ns", cpuThrottledTime)
.withMetric("cpu.vcpus", node.vcpus())
.withMetric("disk.limit", diskTotalBytes);
diff --git a/node-admin/src/test/resources/expected.container.system.metrics.txt b/node-admin/src/test/resources/expected.container.system.metrics.txt
index f5ba06ef867..5400edfec65 100644
--- a/node-admin/src/test/resources/expected.container.system.metrics.txt
+++ b/node-admin/src/test/resources/expected.container.system.metrics.txt
@@ -10,7 +10,7 @@ s:
},
"metrics": {
"cpu.sys.util": 3.402,
- "cpu.throttled_time": 33,
+ "cpu.throttled_time.ns": 33,
"cpu.util": 5.4,
"cpu.vcpus": 2.0,
"disk.limit": 250000000000,