diff options
author | Martin Polden <mpolden@mpolden.no> | 2024-01-22 14:32:10 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2024-01-22 14:32:10 +0100 |
commit | 3f28d93bd8a740706d5c4e7e6c54f2255b398496 (patch) | |
tree | f5c13bd45f056586556897c4486f8e7a70255c3f | |
parent | d5c66a3900e0c6555e18dc2ac4f2d8501bb7595d (diff) |
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; |