diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-24 11:51:30 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-24 11:51:30 +0200 |
| commit | 004136e5baeb9535d53e460fac36bfbc816e45c7 (patch) | |
| tree | 5204f9ac4f2269f704f269c1cb0964f422c2b143 /node-admin | |
| parent | 78cfca5f6794f816adff2b33c9b35da67794f9b5 (diff) | |
Add vcpus metric
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 1 | ||||
| -rw-r--r-- | node-admin/src/test/resources/expected.container.system.metrics.txt | 1 |
2 files changed, 2 insertions, 0 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 761aee468ea..e414dfd3803 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 @@ -566,6 +566,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("disk.limit", diskTotalBytes); diskTotalBytesUsed.ifPresent(diskUsed -> systemMetricsBuilder.withMetric("disk.used", diskUsed)); 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 25de20803c7..19edf6e1843 100644 --- a/node-admin/src/test/resources/expected.container.system.metrics.txt +++ b/node-admin/src/test/resources/expected.container.system.metrics.txt @@ -15,6 +15,7 @@ s: "disk.used": 39625000000, "cpu.sys.util": 3.402, "disk.util": 15.85, + "cpu.vcpus": 8, "cpu.util": 5.4, "mem.util": 25.0, "disk.limit": 250000000000 |