Merge pull request #16738 from vespa-engine/jonmv/correct-dimension-in-clustercontroller-metrics

Use (override, really) the clusterid dimension in CCs content metrics

2 files changed, 4 insertions, 2 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java
index 40b10fe8145..53e62ab3e10 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java
@@ -35,6 +35,7 @@ public class MetricUpdater {
     public void updateClusterStateMetrics(ContentCluster cluster, ClusterState state, ResourceUsageStats resourceUsage) {
         Map<String, String> dimensions = new HashMap<>();
         dimensions.put("cluster", cluster.getName());
+        dimensions.put("clusterid", cluster.getName());
         for (NodeType type : NodeType.getTypes()) {
             dimensions.put("node-type", type.toString().toLowerCase());
             MetricReporter.Context context = createContext(dimensions);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MetricReporterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MetricReporterTest.java
index 68b5bf103a6..19b73e4194f 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MetricReporterTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MetricReporterTest.java
@@ -43,14 +43,15 @@ public class MetricReporterTest {
         // Dimensions that are always present
         HasMetricContext.Dimension controllerDim = withDimension("controller-index", "0");
         HasMetricContext.Dimension clusterDim = withDimension("cluster", "foo");
-        return new HasMetricContext.Dimension[] { controllerDim, clusterDim };
+        HasMetricContext.Dimension clusteridDim = withDimension("clusterid", "foo");
+        return new HasMetricContext.Dimension[] { controllerDim, clusterDim, clusteridDim };
     }
 
     private static HasMetricContext.Dimension[] withNodeTypeDimension(String type) {
         // Node type-specific dimension
         HasMetricContext.Dimension nodeType = withDimension("node-type", type);
         var otherDims = withClusterDimension();
-        return new HasMetricContext.Dimension[] { otherDims[0], otherDims[1], nodeType };
+        return new HasMetricContext.Dimension[] { otherDims[0], otherDims[1], otherDims[2], nodeType };
     }
 
     @Test