Merge pull request #30012 from vespa-engine/mpolden/add-dimension

Add cluster type dimension to autoscaling metric

2 files changed, 10 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
index e6d0c339e5a..2bec9aa6115 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
@@ -158,7 +158,15 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
         log.info("Autoscaling " + application + " " + clusterNodes.clusterSpec() + ":" +
                  "\nfrom " + toString(from) + "\nto   " + toString(to));
         metric.add(ConfigServerMetrics.CLUSTER_AUTOSCALED.baseName(), 1,
-                   metric.createContext(MetricsReporter.dimensions(application, clusterNodes.clusterSpec().id())));
+                   metric.createContext(dimensions(application, clusterNodes.clusterSpec())));
+    }
+
+    private static Map<String, String> dimensions(ApplicationId application, ClusterSpec clusterSpec) {
+        return Map.of("tenantName", application.tenant().value(),
+                      "applicationId", application.serializedForm().replace(':', '.'),
+                      "app", application.application().value() + "." + application.instance().value(),
+                      "clusterid", clusterSpec.id().value(),
+                      "clustertype", clusterSpec.type().name());
     }
 
     static String toString(ClusterResources r) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
index b644e5d8a08..b82d1809085 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
@@ -408,7 +408,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
         metric.set(ConfigServerMetrics.NODES_EMPTY_EXCLUSIVE.baseName(), emptyHosts, null);
     }
 
-    public static Map<String, String> dimensions(ApplicationId application, ClusterSpec.Id cluster) {
+    static Map<String, String> dimensions(ApplicationId application, ClusterSpec.Id cluster) {
         Map<String, String> dimensions = new HashMap<>(dimensions(application));
         dimensions.put("clusterid", cluster.value());
         return dimensions;