Add metrics to metric set.

1 files changed, 20 insertions, 24 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 001e6a9a407..09128e741b9 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
@@ -301,6 +301,14 @@ public class VespaMetricSet {
         return metrics;
     }
 
+    private static void addSearchNodeExecutorMetrics(Set<Metric> metrics, String prefix) {
+        metrics.add(new Metric(prefix + ".queuesize.max"));
+        metrics.add(new Metric(prefix + ".queuesize.sum"));
+        metrics.add(new Metric(prefix + ".queuesize.count"));
+        metrics.add(new Metric(prefix + ".maxpending.last")); // TODO: Remove in Vespa 8
+        metrics.add(new Metric(prefix + ".accepted.rate"));
+    }
+
     private static Set<Metric> getSearchNodeMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
@@ -345,18 +353,12 @@ public class VespaMetricSet {
         metrics.add(new Metric("content.proton.search_protocol.docsum.requested_documents.count"));        
         
         // Executors shared between all document dbs
-        metrics.add(new Metric("content.proton.executor.proton.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.proton.accepted.rate"));
-        metrics.add(new Metric("content.proton.executor.flush.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.flush.accepted.rate"));
-        metrics.add(new Metric("content.proton.executor.match.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.match.accepted.rate"));
-        metrics.add(new Metric("content.proton.executor.docsum.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.docsum.accepted.rate"));
-        metrics.add(new Metric("content.proton.executor.shared.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.shared.accepted.rate"));
-        metrics.add(new Metric("content.proton.executor.warmup.maxpending.last"));
-        metrics.add(new Metric("content.proton.executor.warmup.accepted.rate"));
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.proton");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.flush");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.match");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.docsum");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.shared");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.warmup");
 
         // jobs
         metrics.add(new Metric("content.proton.documentdb.job.total.average"));
@@ -370,18 +372,12 @@ public class VespaMetricSet {
         metrics.add(new Metric("content.proton.documentdb.job.removed_documents_prune.average"));
 
         // Threading service (per document db)
-        metrics.add(new Metric("content.proton.documentdb.threading_service.master.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.master.accepted.rate"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index.accepted.rate"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.summary.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.summary.accepted.rate"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index_field_inverter.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index_field_inverter.accepted.rate"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index_field_writer.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.index_field_writer.accepted.rate"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.attribute_field_writer.maxpending.last"));
-        metrics.add(new Metric("content.proton.documentdb.threading_service.attribute_field_writer.accepted.rate"));
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.master");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.index");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.summary");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.index_field_inverter");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.index_field_writer");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.documentdb.threading_service.attribute_field_writer");
 
         // lid space
         metrics.add(new Metric("content.proton.documentdb.ready.lid_space.lid_bloat_factor.average"));