diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-03-02 21:14:40 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2023-03-02 21:14:40 +0100 |
commit | 464a1ec34d9bb04872e799980378bc6e904c48c9 (patch) | |
tree | 579e663b3243fd866218b4d10862db8aba5ad672 /config-model/src/main | |
parent | 3a55a18eeac23e95a456e09084c96a5fa3a374a2 (diff) |
Define application_generation in containermetrics and add to the vespa set
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java index a3fdce98c73..9cb8b4e00ca 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java @@ -31,7 +31,7 @@ public class AutoscalingMetrics { metrics.add("disk.util"); // node level -default metrics.add(SearchNodeMetrics.CONTENT_PROTON_RESOURCE_USAGE_DISK.average()); // better for content as it is the basis for blocking - metrics.add("application_generation"); + metrics.add(ContainerMetrics.APPLICATION_GENERATION.baseName()); metrics.add("in_service"); 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 d6f0df8e051..000ac92a8a0 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 @@ -131,6 +131,8 @@ public class VespaMetricSet { private static Set<Metric> getContainerMetrics() { Set<Metric> metrics = new LinkedHashSet<>(); + addMetric(metrics, ContainerMetrics.APPLICATION_GENERATION.baseName()); + addMetric(metrics, ContainerMetrics.HANDLED_REQUESTS.count()); addMetric(metrics, ContainerMetrics.HANDLED_LATENCY, EnumSet.of(sum, count, max)); |