Merge pull request #23297 from vespa-engine/olaa/ignore-non-prod-zones

Filter on production deployments

1 files changed, 3 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MeteringMonitorMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MeteringMonitorMaintainer.java
index eadbdf74c3c..519b1001be4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MeteringMonitorMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MeteringMonitorMaintainer.java
@@ -51,14 +51,15 @@ public class MeteringMonitorMaintainer extends ControllerMaintainer {
         return controller().applications().asList()
                 .stream()
                 .flatMap(app -> app.instances().values().stream())
-                .flatMap(this::instancesToDeployments)
+                .flatMap(this::toProdDeployments)
                 .collect(Collectors.toSet());
     }
 
-    private Stream<DeploymentId> instancesToDeployments(Instance instance) {
+    private Stream<DeploymentId> toProdDeployments(Instance instance) {
         return instance.deployments()
                 .keySet()
                 .stream()
+                .filter(deployment -> deployment.environment().isProduction())
                 .map(deployment -> new DeploymentId(instance.id(), deployment));
     }
 }