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.

1 files changed, 3 insertions, 6 deletions

diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 77192d24786..09df5063989 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -150,13 +150,11 @@ vespalib::Slime slime; \
     for (size_t j=0; j<metricCount; j++) { \
         const vespalib::string name = slime.get()["metrics"]["values"][j]["name"] \
                                  .asString().make_string(); \
-        if (name.compare("vds.filestor.alldisks.allthreads." \
-                         "get.sum.count") == 0) \
+        if (name.compare("vds.filestor.allthreads.get.count") == 0) \
         { \
             getCount = slime.get()["metrics"]["values"][j]["values"]["count"] \
                        .asDouble(); \
-        } else if (name.compare("vds.filestor.alldisks.allthreads." \
-                                "put.sum.count") == 0) \
+        } else if (name.compare("vds.filestor.allthreads.put.count") == 0) \
         { \
             putCount = slime.get()["metrics"]["values"][j]["values"]["count"] \
                        .asDouble(); \
@@ -217,8 +215,7 @@ TEST_F(StateReporterTest, report_health) {
 }
 
 TEST_F(StateReporterTest, report_metrics) {
-    FileStorDiskMetrics& disk0(*_filestorMetrics->disk);
-    FileStorThreadMetrics& thread0(*disk0.threads[0]);
+    FileStorThreadMetrics& thread0(*_filestorMetrics->threads[0]);
 
     LOG(debug, "Adding to get metric");