Remove '.sum' form vds sum metrics.

Remove '.sum' from metric names for storage node and also remove the average metrics for the same.
Remove '.sum' from distributor metrics set and remove distributor average metrics.
GC '.sum' from distributor metric names.
Remove '.alldisks' from metric names and update tests.
GC '.alldisks' from filestor metrics.

4 files changed, 185 insertions, 208 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
index 26e3d952080..cd6de7ac7fb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
@@ -2,8 +2,6 @@
 package com.yahoo.vespa.model.admin.monitoring;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -41,9 +39,9 @@ public class AutoscalingMetrics {
 
         // Write rate
         metrics.add("feed.http-requests.rate"); // container
-        metrics.add("vds.filestor.alldisks.allthreads.put.sum.count.rate"); // content
-        metrics.add("vds.filestor.alldisks.allthreads.remove.sum.count.rate"); // content
-        metrics.add("vds.filestor.alldisks.allthreads.update.sum.count.rate"); // content
+        metrics.add("vds.filestor.allthreads.put.count.rate"); // content
+        metrics.add("vds.filestor.allthreads.remove.count.rate"); // content
+        metrics.add("vds.filestor.allthreads.update.count.rate"); // content
 
         return new MetricSet("autoscaling", toMetrics(metrics));
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index b26150dab47..bf967cfc53d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -648,136 +648,120 @@ public class VespaMetricSet {
         // TODO: disregarded when considering metric names. Consider cleaning up for Vespa 9.
         metrics.add(new Metric("vds.datastored.alldisks.docs.average"));
         metrics.add(new Metric("vds.datastored.alldisks.bytes.average"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum.max"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum.sum"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum.count"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum.max"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum.sum"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum.count"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.visitor.allthreads.queuesize.count.max"));
-        metrics.add(new Metric("vds.visitor.allthreads.queuesize.count.sum"));
-        metrics.add(new Metric("vds.visitor.allthreads.queuesize.count.count"));
-        metrics.add(new Metric("vds.visitor.allthreads.queuesize.count.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.visitor.allthreads.completed.sum.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.visitor.allthreads.completed.sum.rate"));
-        metrics.add(new Metric("vds.visitor.allthreads.created.sum.rate"));
-        metrics.add(new Metric("vds.visitor.allthreads.failed.sum.rate"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum.max"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum.sum"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum.count"));
-        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum.max"));
-        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum.sum"));
-        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum.count"));
-        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum.average")); // TODO: Remove in Vespa 8
-
-        metrics.add(new Metric("vds.filestor.alldisks.queuesize.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.queuesize.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.queuesize.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.queuesize.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.averagequeuewait.sum.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.averagequeuewait.sum.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.averagequeuewait.sum.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.averagequeuewait.sum.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.active_operations.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_window_size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_window_size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_window_size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_waiting_threads.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_waiting_threads.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_waiting_threads.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_active_tokens.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_active_tokens.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.throttle_active_tokens.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergemetadatareadlatency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergemetadatareadlatency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergemetadatareadlatency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatareadlatency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatareadlatency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatareadlatency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatawritelatency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatawritelatency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergedatawritelatency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put_latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put_latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put_latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allstripes.throttled_rpc_direct_dispatches.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allstripes.throttled_persistence_thread_polls.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allstripes.timeouts_waiting_for_throttle_token.rate"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.max"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.count"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.max"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.count"));
+        metrics.add(new Metric("vds.visitor.allthreads.queuesize.max"));
+        metrics.add(new Metric("vds.visitor.allthreads.queuesize.sum"));
+        metrics.add(new Metric("vds.visitor.allthreads.queuesize.count"));
+        metrics.add(new Metric("vds.visitor.allthreads.completed.rate"));
+        metrics.add(new Metric("vds.visitor.allthreads.created.rate"));
+        metrics.add(new Metric("vds.visitor.allthreads.failed.rate"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.max"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum"));
+        metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.count"));
+        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.max"));
+        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum"));
+        metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.count"));
+
+        metrics.add(new Metric("vds.filestor.queuesize.max"));
+        metrics.add(new Metric("vds.filestor.queuesize.sum"));
+        metrics.add(new Metric("vds.filestor.queuesize.count"));
+        metrics.add(new Metric("vds.filestor.averagequeuewait.max"));
+        metrics.add(new Metric("vds.filestor.averagequeuewait.sum"));
+        metrics.add(new Metric("vds.filestor.averagequeuewait.count"));
+        metrics.add(new Metric("vds.filestor.active_operations.size.max"));
+        metrics.add(new Metric("vds.filestor.active_operations.size.sum"));
+        metrics.add(new Metric("vds.filestor.active_operations.size.count"));
+        metrics.add(new Metric("vds.filestor.active_operations.latency.max"));
+        metrics.add(new Metric("vds.filestor.active_operations.latency.sum"));
+        metrics.add(new Metric("vds.filestor.active_operations.latency.count"));
+        metrics.add(new Metric("vds.filestor.throttle_window_size.max"));
+        metrics.add(new Metric("vds.filestor.throttle_window_size.sum"));
+        metrics.add(new Metric("vds.filestor.throttle_window_size.count"));
+        metrics.add(new Metric("vds.filestor.throttle_waiting_threads.max"));
+        metrics.add(new Metric("vds.filestor.throttle_waiting_threads.sum"));
+        metrics.add(new Metric("vds.filestor.throttle_waiting_threads.count"));
+        metrics.add(new Metric("vds.filestor.throttle_active_tokens.max"));
+        metrics.add(new Metric("vds.filestor.throttle_active_tokens.sum"));
+        metrics.add(new Metric("vds.filestor.throttle_active_tokens.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.put_latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.put_latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.put_latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_latency.count"));
+        metrics.add(new Metric("vds.filestor.allstripes.throttled_rpc_direct_dispatches.rate"));
+        metrics.add(new Metric("vds.filestor.allstripes.throttled_persistence_thread_polls.rate"));
+        metrics.add(new Metric("vds.filestor.allstripes.timeouts_waiting_for_throttle_token.rate"));
         
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.request_size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.request_size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.request_size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.request_size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.request_size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.request_size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.request_size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.request_size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.request_size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.request_size.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.request_size.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.request_size.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.createiterator.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.createiterator.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.createiterator.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.createiterator.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.createiterator.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_location.sum.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_location.sum.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_location.sum.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_location.sum.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove_location.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.splitbuckets.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.joinbuckets.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.count.rate"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.failed.rate"));        
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.latency.max"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.latency.sum"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.latency.count"));
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.deletebuckets.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.filestor.alldisks.allthreads.setbucketstates.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.request_size.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.request_size.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.put.request_size.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.request_size.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.request_size.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.get.request_size.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.request_size.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.request_size.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.update.request_size.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.createiterator.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.visit.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.visit.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.visit.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.visit.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_location.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.splitbuckets.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.joinbuckets.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.count.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.failed.rate"));
+        metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.max"));
+        metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.sum"));
+        metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.count"));
+        metrics.add(new Metric("vds.filestor.allthreads.setbucketstates.count.rate"));
         return metrics;
     }
     private static Set<Metric> getDistributorMetrics() {
@@ -816,66 +800,61 @@ public class VespaMetricSet {
         metrics.add(new Metric("vds.idealstate.garbage_collection.documents_removed.count"));
         metrics.add(new Metric("vds.idealstate.garbage_collection.documents_removed.rate"));
 
-        metrics.add(new Metric("vds.distributor.puts.sum.latency.max"));
-        metrics.add(new Metric("vds.distributor.puts.sum.latency.sum"));
-        metrics.add(new Metric("vds.distributor.puts.sum.latency.count"));
-        metrics.add(new Metric("vds.distributor.puts.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.distributor.puts.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.notfound.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.concurrent_mutations.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.notconnected.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.notready.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.wrongdistributor.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.safe_time_not_reached.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.storagefailure.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.timeout.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.busy.rate"));
-        metrics.add(new Metric("vds.distributor.puts.sum.failures.inconsistent_bucket.rate"));
-        metrics.add(new Metric("vds.distributor.removes.sum.latency.max"));
-        metrics.add(new Metric("vds.distributor.removes.sum.latency.sum"));
-        metrics.add(new Metric("vds.distributor.removes.sum.latency.count"));
-        metrics.add(new Metric("vds.distributor.removes.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.distributor.removes.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.removes.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.removes.sum.failures.notfound.rate"));
-        metrics.add(new Metric("vds.distributor.removes.sum.failures.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.distributor.removes.sum.failures.concurrent_mutations.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.latency.max"));
-        metrics.add(new Metric("vds.distributor.updates.sum.latency.sum"));
-        metrics.add(new Metric("vds.distributor.updates.sum.latency.count"));
-        metrics.add(new Metric("vds.distributor.updates.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.distributor.updates.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.failures.notfound.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.failures.test_and_set_failed.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.failures.concurrent_mutations.rate"));
-        metrics.add(new Metric("vds.distributor.updates.sum.diverging_timestamp_updates.rate"));
-        metrics.add(new Metric("vds.distributor.removelocations.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.removelocations.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.gets.sum.latency.max"));
-        metrics.add(new Metric("vds.distributor.gets.sum.latency.sum"));
-        metrics.add(new Metric("vds.distributor.gets.sum.latency.count"));
-        metrics.add(new Metric("vds.distributor.gets.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.distributor.gets.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.gets.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.gets.sum.failures.notfound.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.latency.max"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.latency.sum"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.latency.count"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.latency.average")); // TODO: Remove in Vespa 8
-        metrics.add(new Metric("vds.distributor.visitor.sum.ok.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.total.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.notready.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.notconnected.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.wrongdistributor.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.safe_time_not_reached.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.storagefailure.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.timeout.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.busy.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.inconsistent_bucket.rate"));
-        metrics.add(new Metric("vds.distributor.visitor.sum.failures.notfound.rate"));
+        metrics.add(new Metric("vds.distributor.puts.latency.max"));
+        metrics.add(new Metric("vds.distributor.puts.latency.sum"));
+        metrics.add(new Metric("vds.distributor.puts.latency.count"));
+        metrics.add(new Metric("vds.distributor.puts.ok.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.notfound.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.concurrent_mutations.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.notconnected.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.notready.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.wrongdistributor.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.safe_time_not_reached.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.storagefailure.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.timeout.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.busy.rate"));
+        metrics.add(new Metric("vds.distributor.puts.failures.inconsistent_bucket.rate"));
+        metrics.add(new Metric("vds.distributor.removes.latency.max"));
+        metrics.add(new Metric("vds.distributor.removes.latency.sum"));
+        metrics.add(new Metric("vds.distributor.removes.latency.count"));
+        metrics.add(new Metric("vds.distributor.removes.ok.rate"));
+        metrics.add(new Metric("vds.distributor.removes.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.removes.failures.notfound.rate"));
+        metrics.add(new Metric("vds.distributor.removes.failures.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.distributor.removes.failures.concurrent_mutations.rate"));
+        metrics.add(new Metric("vds.distributor.updates.latency.max"));
+        metrics.add(new Metric("vds.distributor.updates.latency.sum"));
+        metrics.add(new Metric("vds.distributor.updates.latency.count"));
+        metrics.add(new Metric("vds.distributor.updates.ok.rate"));
+        metrics.add(new Metric("vds.distributor.updates.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.updates.failures.notfound.rate"));
+        metrics.add(new Metric("vds.distributor.updates.failures.test_and_set_failed.rate"));
+        metrics.add(new Metric("vds.distributor.updates.failures.concurrent_mutations.rate"));
+        metrics.add(new Metric("vds.distributor.updates.diverging_timestamp_updates.rate"));
+        metrics.add(new Metric("vds.distributor.removelocations.ok.rate"));
+        metrics.add(new Metric("vds.distributor.removelocations.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.gets.latency.max"));
+        metrics.add(new Metric("vds.distributor.gets.latency.sum"));
+        metrics.add(new Metric("vds.distributor.gets.latency.count"));
+        metrics.add(new Metric("vds.distributor.gets.ok.rate"));
+        metrics.add(new Metric("vds.distributor.gets.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.gets.failures.notfound.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.latency.max"));
+        metrics.add(new Metric("vds.distributor.visitor.latency.sum"));
+        metrics.add(new Metric("vds.distributor.visitor.latency.count"));
+        metrics.add(new Metric("vds.distributor.visitor.ok.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.total.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.notready.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.notconnected.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.wrongdistributor.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.safe_time_not_reached.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.storagefailure.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.timeout.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.busy.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.inconsistent_bucket.rate"));
+        metrics.add(new Metric("vds.distributor.visitor.failures.notfound.rate"));
 
         metrics.add(new Metric("vds.distributor.docsstored.average"));
         metrics.add(new Metric("vds.distributor.bytesstored.average"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
index c87fb8d120e..a3f32fcb44b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
@@ -80,18 +80,18 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode>
                 addedmetrics("vds.datastored.bucket_space.buckets_total");
 
         ContentCluster.getMetricBuilder("log", builder).
-                addedmetrics("vds.filestor.alldisks.allthreads.put.sum").
-                addedmetrics("vds.filestor.alldisks.allthreads.get.sum").
-                addedmetrics("vds.filestor.alldisks.allthreads.remove.sum").
-                addedmetrics("vds.filestor.alldisks.allthreads.update.sum").
+                addedmetrics("vds.filestor.allthreads.put").
+                addedmetrics("vds.filestor.allthreads.get").
+                addedmetrics("vds.filestor.allthreads.remove").
+                addedmetrics("vds.filestor.allthreads.update").
                 addedmetrics("vds.datastored.alldisks.docs").
                 addedmetrics("vds.datastored.alldisks.bytes").
-                addedmetrics("vds.filestor.alldisks.queuesize").
-                addedmetrics("vds.filestor.alldisks.averagequeuewait.sum").
+                addedmetrics("vds.filestor.queuesize").
+                addedmetrics("vds.filestor.averagequeuewait").
                 addedmetrics("vds.visitor.cv_queuewaittime").
                 addedmetrics("vds.visitor.allthreads.averagequeuewait").
                 addedmetrics("vds.visitor.allthreads.averagevisitorlifetime").
-                addedmetrics("vds.visitor.allthreads.created.sum");
+                addedmetrics("vds.visitor.allthreads.created");
     }
 
     public String getClusterName() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 10a2feaba5b..8c263e21a21 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -744,18 +744,18 @@ public class ContentClusterTest extends ContentBaseTest {
             MetricsmanagerConfig config = new MetricsmanagerConfig(builder);
 
             String expected =
-                    "[vds.filestor.alldisks.allthreads.put.sum\n" +
-                    "vds.filestor.alldisks.allthreads.get.sum\n" +
-                    "vds.filestor.alldisks.allthreads.remove.sum\n" +
-                    "vds.filestor.alldisks.allthreads.update.sum\n" +
+                    "[vds.filestor.allthreads.put\n" +
+                    "vds.filestor.allthreads.get\n" +
+                    "vds.filestor.allthreads.remove\n" +
+                    "vds.filestor.allthreads.update\n" +
                     "vds.datastored.alldisks.docs\n" +
                     "vds.datastored.alldisks.bytes\n" +
-                    "vds.filestor.alldisks.queuesize\n" +
-                    "vds.filestor.alldisks.averagequeuewait.sum\n" +
+                    "vds.filestor.queuesize\n" +
+                    "vds.filestor.averagequeuewait\n" +
                     "vds.visitor.cv_queuewaittime\n" +
                     "vds.visitor.allthreads.averagequeuewait\n" +
                     "vds.visitor.allthreads.averagevisitorlifetime\n" +
-                    "vds.visitor.allthreads.created.sum]";
+                    "vds.visitor.allthreads.created]";
             String actual = getConsumer("log", config).addedmetrics().toString().replaceAll(", ", "\n");
             assertEquals(expected, actual);
             assertEquals("[logdefault]", getConsumer("log", config).tags().toString());