Allow deleting metrics by name

1 files changed, 11 insertions, 0 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/metrics/Metrics.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/metrics/Metrics.java
index 07a8d545178..e9dbfa0c524 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/metrics/Metrics.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/metrics/Metrics.java
@@ -102,6 +102,17 @@ public class Metrics {
         }
     }
 
+    public void deleteMetricByName(String application, String metricName, DimensionType type) {
+        synchronized (monitor) {
+            Optional.ofNullable(metrics.get(type))
+                    .map(m -> m.get(application))
+                    .map(ApplicationMetrics::metricsByDimensions)
+                    .ifPresent(dims ->
+                        dims.values().forEach(metrics -> metrics.remove(metricName))
+                    );
+        }
+    }
+
     Map<Dimensions, Map<String, MetricValue>> getOrCreateApplicationMetrics(String application, DimensionType type) {
         return metrics.computeIfAbsent(type, m -> new HashMap<>())
                 .computeIfAbsent(application, app -> new ApplicationMetrics())