Consider admin clusters

2 files changed, 6 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index f65eaaf3fa3..70d8931acaa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -649,9 +649,11 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         var clusters = getClustersOfApplication(applicationId);
         var clusterMetrics = new LinkedHashMap<ClusterInfo, MetricsAggregator>();
 
-        clusters.forEach(cluster -> {
-            var metrics = metricsRetriever.requestMetricsForCluster(cluster);
-            clusterMetrics.put(cluster, metrics);
+        clusters.stream()
+                .filter(cluster -> !cluster.getClusterType().equals(ClusterInfo.ClusterType.admin))
+                .forEach(cluster -> {
+                    var metrics = metricsRetriever.requestMetricsForCluster(cluster);
+                    clusterMetrics.put(cluster, metrics);
         });
 
         return new MetricsResponse(200, applicationId, clusterMetrics);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterInfo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterInfo.java
index ef9a73fedd4..052aa71d48a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterInfo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterInfo.java
@@ -40,5 +40,5 @@ public class ClusterInfo {
         hostnames.add(host);
     }
 
-    public enum ClusterType {content, container};
+    public enum ClusterType {content, container, admin};
 }