diff options
| author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-03-15 11:06:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 11:06:21 +0100 |
| commit | 4a47573bd005edc461c8d80890eac2ced9eec07f (patch) | |
| tree | c3a7a2cdaca07f3df113d6fe53ac9088e7ecc7ec | |
| parent | d964ceed34454ef759dec0c21dd9763ce2605977 (diff) | |
| parent | 1f8d1a93d3cca765c43d1e9d713103853878ee6b (diff) | |
Merge pull request #26429 from vespa-engine/bratseth/percentage-unit
Add and use percentage unit
| -rw-r--r-- | container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java | 16 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/metrics/Unit.java | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java b/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java index 5624f1f92e3..1dc58090c69 100644 --- a/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java @@ -8,20 +8,20 @@ package com.yahoo.metrics; public enum HostedNodeAdminMetrics implements VespaMetrics { // System metrics - CPU_UTIL("cpu.util", Unit.FRACTION, "CPU utilisation"), - CPU_SYS_UTIL("cpu.sys.util", Unit.FRACTION, "System CPU utilisation"), - CPU_THROTTLED_TIME("cpu.throttled_time.rate", Unit.FRACTION, "Part of the time CPU is exhausted (CPU throttling enforced)"), - CPU_THROTTLED_CPU_TIME("cpu.throttled_cpu_time.rate", Unit.FRACTION, "Part of the time CPU is exhausted (CPU throttling enforced)"), + CPU_UTIL("cpu.util", Unit.PERCENTAGE, "CPU utilisation"), + CPU_SYS_UTIL("cpu.sys.util", Unit.PERCENTAGE, "System CPU utilisation"), + CPU_THROTTLED_TIME("cpu.throttled_time.rate", Unit.PERCENTAGE, "Part of the time CPU is exhausted (CPU throttling enforced)"), + CPU_THROTTLED_CPU_TIME("cpu.throttled_cpu_time.rate", Unit.PERCENTAGE, "Part of the time CPU is exhausted (CPU throttling enforced)"), CPU_VCPUS("cpu.vcpus", Unit.ITEM, "Number of virtual CPU threads allocation to the node"), DISK_LIMIT("disk.limit", Unit.BYTE, "Amount of disk space available on the node"), DISK_USED("disk.used", Unit.BYTE, "Amount of disk space used by the node"), - DISK_UTIL("disk.util", Unit.FRACTION, "Disk space utilisation"), + DISK_UTIL("disk.util", Unit.PERCENTAGE, "Disk space utilisation"), MEM_LIMIT("mem.limit", Unit.BYTE, "Amount of memory available on the node"), MEM_USED("mem.used", Unit.BYTE, "Amount of memory used by the node"), - MEM_UTIL("mem.util", Unit.FRACTION, "Memory utilisation"), + MEM_UTIL("mem.util", Unit.PERCENTAGE, "Memory utilisation"), MEM_TOTAL_USED("mem_total.used", Unit.BYTE, "Total amount of memory used by the node, including OS buffer caches"), - MEM_TOTAL_UTIL("mem_total.util", Unit.FRACTION, "Total memory utilisation"), - GPU_UTIL("gpu.util", Unit.FRACTION, "GPU utilisation"), + MEM_TOTAL_UTIL("mem_total.util", Unit.PERCENTAGE, "Total memory utilisation"), + GPU_UTIL("gpu.util", Unit.PERCENTAGE, "GPU utilisation"), GPU_MEM_USED("gpu.memory.used", Unit.BYTE, "GPU memory used"), GPU_MEM_TOTAL("gpu.memory.total", Unit.BYTE, "GPU memory available"), diff --git a/container-core/src/main/java/com/yahoo/metrics/Unit.java b/container-core/src/main/java/com/yahoo/metrics/Unit.java index 7411b5b0ca4..c79461a191f 100644 --- a/container-core/src/main/java/com/yahoo/metrics/Unit.java +++ b/container-core/src/main/java/com/yahoo/metrics/Unit.java @@ -26,6 +26,7 @@ public enum Unit { PACKET(BaseUnit.PACKET), OPERATION(BaseUnit.OPERATION), OPERATION_PER_SECOND(BaseUnit.OPERATION, BaseUnit.SECOND), + PERCENTAGE(BaseUnit.PERCENTAGE), QUERY(BaseUnit.QUERY), QUERY_PER_SECOND(BaseUnit.QUERY, BaseUnit.SECOND), RECORD(BaseUnit.RECORD), @@ -85,6 +86,7 @@ public enum Unit { NODE("node"), OPERATION("operation"), PACKET("packet"), + PERCENTAGE("percentage"), QUERY("query"), RECORD("record"), REQUEST("request"), |