summaryrefslogtreecommitdiffstats
path: root/node-admin/src/main/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2019-05-26 18:47:29 +0200
committerGitHub <noreply@github.com>2019-05-26 18:47:29 +0200
commit385926a6309fe6fd4ddd5cae78fe7137267a51a7 (patch)
treee09f682f38489f5e0f3660fbd660db6f954bbf86 /node-admin/src/main/java
parent49a7ce17b79820d3fa85f8a81f94bf3328d6f56c (diff)
parent452b703741b35561177a588abc7efcc1fcae8c1a (diff)
Merge pull request #9557 from vespa-engine/freva/fix-metric
Report vcpus of the node rather than the host
Diffstat (limited to 'node-admin/src/main/java')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java2
1 files changed, 1 insertions, 1 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 4c21bc47483..f999ef0ffc6 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
@@ -570,7 +570,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.vcpus", totalNumCpuCores)
+ .withMetric("cpu.vcpus", node.getMinCpuCores())
.withMetric("disk.limit", diskTotalBytes);
diskTotalBytesUsed.ifPresent(diskUsed -> systemMetricsBuilder.withMetric("disk.used", diskUsed));