diff options
| author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-12 12:32:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 12:32:55 +0100 |
| commit | 1805fc5647994f9d4035c37fbeb4bbb7cf3b1246 (patch) | |
| tree | be824726d65d79a430508fee7b6df9c1ea3495e0 /config-model | |
| parent | f4e7b6dfc71d7c8f42381c27452baccff1618788 (diff) | |
Use enum for mem metrics
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index 4f4e7657509..5d5aa605b20 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -176,21 +176,19 @@ public class VespaMetricSet { addMetric(metrics, ContainerMetrics.HTTPAPI_CONDITION_NOT_MET.baseName(), List.of("rate")); addMetric(metrics, ContainerMetrics.HTTPAPI_NOT_FOUND.baseName(), List.of("rate")); - metrics.add(new Metric("mem.heap.total.average")); - metrics.add(new Metric("mem.heap.free.average")); - metrics.add(new Metric("mem.heap.used.average")); - metrics.add(new Metric("mem.heap.used.max")); + addMetric(metrics, ContainerMetrics.MEM_HEAP_TOTAL.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_HEAP_FREE.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_HEAP_USED.baseName(), List.of("average", "max")); + addMetric(metrics, ContainerMetrics.MEM_DIRECT_TOTAL.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_DIRECT_FREE.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_DIRECT_USED.baseName(), List.of("average", "max")); + addMetric(metrics, ContainerMetrics.MEM_DIRECT_COUNT.baseName(), List.of("max")); + addMetric(metrics, ContainerMetrics.MEM_NATIVE_TOTAL.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_NATIVE_FREE.baseName(), List.of("average")); + addMetric(metrics, ContainerMetrics.MEM_NATIVE_USED.baseName(), List.of("average", "max")); + metrics.add(new Metric("jdisc.memory_mappings.max")); metrics.add(new Metric("jdisc.open_file_descriptors.max")); - metrics.add(new Metric("mem.direct.total.average")); - metrics.add(new Metric("mem.direct.free.average")); - metrics.add(new Metric("mem.direct.used.average")); - metrics.add(new Metric("mem.direct.used.max")); - metrics.add(new Metric("mem.direct.count.max")); - metrics.add(new Metric("mem.native.total.average")); - metrics.add(new Metric("mem.native.free.average")); - metrics.add(new Metric("mem.native.used.average")); - metrics.add(new Metric("mem.native.used.max")); metrics.add(new Metric("jdisc.gc.count.average")); metrics.add(new Metric("jdisc.gc.count.max")); |