Add writeRate cluster metric

2 files changed, 18 insertions, 13 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 6bb3a62f234..f5e79ca2723 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
@@ -1,7 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -15,17 +18,19 @@ public class AutoscalingMetrics {
     public static final MetricSet autoscalingMetricSet = create();
 
     private static MetricSet create() {
-        return new MetricSet("autoscaling",
-                             metrics("cpu.util",
-                                     "mem.util",
-                                     "disk.util",
-                                     "application_generation",
-                                     "in_service",
-                                     "queries.rate"));
+        List<String> metrics = new ArrayList<>();
+        metrics.add("cpu.util");
+        metrics.add("mem.util");
+        metrics.add("disk.util");
+        metrics.add("application_generation");
+        metrics.add("in_service");
+        metrics.add("queries.rate");
+        metrics.add("feed.http-requests.rate");
+        return new MetricSet("autoscaling", toMetrics(metrics));
     }
 
-    private static Set<Metric> metrics(String ... metrics) {
-        return Arrays.stream(metrics).map(Metric::new).collect(Collectors.toSet());
+    private static Set<Metric> toMetrics(List<String> metrics) {
+        return metrics.stream().map(Metric::new).collect(Collectors.toSet());
     }
 
 }
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 869738223d4..aa2a43e0d60 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
@@ -140,10 +140,10 @@ public class VespaMetricSet {
         metrics.add(new Metric("serverNumConnections.last"));
 
         {
-            List<String> suffices = List.of("sum", "count", "last", "min", "max");
-            addMetric(metrics, "jdisc.thread_pool.unhandled_exceptions", suffices);
-            addMetric(metrics, "jdisc.thread_pool.work_queue.capacity", suffices);
-            addMetric(metrics, "jdisc.thread_pool.work_queue.size", suffices);
+            List<String> suffixes = List.of("sum", "count", "last", "min", "max");
+            addMetric(metrics, "jdisc.thread_pool.unhandled_exceptions", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.work_queue.capacity", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.work_queue.size", suffixes);
         }
 
         metrics.add(new Metric("httpapi_latency.max"));