Merge pull request #15356 from vespa-engine/bratseth/add-in-rotation-metric

Filter out metrics for nodes not in service

1 files changed, 7 insertions, 3 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 acf9340fa7c..ab283a8fbd1 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
@@ -16,11 +16,15 @@ public class AutoscalingMetrics {
 
     private static MetricSet create() {
         return new MetricSet("autoscaling",
-                             metrics("cpu.util", "mem_total.util", "disk.util", "application_generation"));
+                             metrics("cpu.util",
+                                     "mem_total.util",
+                                     "disk.util",
+                                     "application_generation",
+                                     "in_service"));
     }
 
-    private static Set<Metric> metrics(String ... names) {
-        return Arrays.stream(names).map(Metric::new).collect(Collectors.toSet());
+    private static Set<Metric> metrics(String ... metrics) {
+        return Arrays.stream(metrics).map(Metric::new).collect(Collectors.toSet());
     }
 
 }