Always report metric for every possible status

2 files changed, 8 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
index 86f8dd65bcc..daba7e74f34 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
@@ -362,12 +362,14 @@ public class VcmrMaintainer extends ControllerMaintainer {
     }
 
     private void updateMetrics() {
-        curator.readChangeRequests()
+        var cmrsByStatus = curator.readChangeRequests()
                 .stream()
-                .collect(Collectors.groupingBy(VespaChangeRequest::getStatus))
-                .forEach((status, cmrs) ->
-                        metric.set(TRACKED_CMRS_METRIC, cmrs.size(), metric.createContext(Map.of("status", status.name())))
-                );
+                .collect(Collectors.groupingBy(VespaChangeRequest::getStatus));
+
+        for (var status : Status.values()) {
+            var count = cmrsByStatus.getOrDefault(status, List.of()).size();
+            metric.set(TRACKED_CMRS_METRIC, count, metric.createContext(Map.of("status", status.name())));
+        }
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
index bc497222b03..321ec3ad8ea 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
@@ -249,6 +249,7 @@ public class VcmrMaintainerTest {
         assertEquals(State.OUT_OF_SYNC, action.getState());
         assertEquals(Status.OUT_OF_SYNC, writtenChangeRequest.getStatus());
         assertEquals(1, metrics.getMetric(context -> "OUT_OF_SYNC".equals(context.get("status")), TRACKED_CMRS_METRIC).get());
+        assertEquals(0, metrics.getMetric(context -> "REQUIRES_OPERATOR_ACTION".equals(context.get("status")), TRACKED_CMRS_METRIC).get());
     }
 
     @Test