From f2a14381d42941a46a75bcb49e6d001752a3101c Mon Sep 17 00:00:00 2001 From: Yngve Aasheim Date: Fri, 20 Jan 2023 15:00:45 +0100 Subject: Use enums for deprecated metrics --- .../com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java index 296b58658b3..e064f48e740 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java @@ -62,10 +62,10 @@ public class DefaultMetrics { metrics.add(new Metric(ContainerMetrics.TOTAL_HITS_PER_QUERY.max())); metrics.add(new Metric(ContainerMetrics.DEGRADED_QUERIES.rate())); metrics.add(new Metric(ContainerMetrics.FAILED_QUERIES.rate())); - metrics.add(new Metric("query_latency.average")); // TODO: Remove with Vespa 9 - metrics.add(new Metric("hits_per_query.average")); // TODO: Remove with Vespa 9 - metrics.add(new Metric("totalhits_per_query.average")); // TODO: Remove with Vespa 9 - metrics.add(new Metric("serverActiveThreads.average")); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.active_threads. + metrics.add(new Metric(ContainerMetrics.QUERY_LATENCY.average())); // TODO: Remove with Vespa 9 + metrics.add(new Metric(ContainerMetrics.HITS_PER_QUERY.average())); // TODO: Remove with Vespa 9 + metrics.add(new Metric(ContainerMetrics.TOTAL_HITS_PER_QUERY.average())); // TODO: Remove with Vespa 9 + metrics.add(new Metric(ContainerMetrics.SERVER_ACTIVE_THREADS.average())); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.active_threads. } private static void addContentMetrics(Set metrics) { -- cgit v1.2.3