Add content and storage metrics to the 'default' metric set.

1 files changed, 51 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java
index dc250179460..cec7f796302 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java
@@ -29,6 +29,8 @@ public class DefaultPublicMetrics {
 
     private static Set<Metric> getAllMetrics() {
         return ImmutableSet.<Metric>builder()
+                .addAll(getContentMetrics())
+                .addAll(getStorageMetrics())
                 .addAll(getContainerMetrics())
                 .addAll(getQrserverMetrics())
                 .build();
@@ -64,6 +66,55 @@ public class DefaultPublicMetrics {
         return metrics;
     }
 
+    private static Set<Metric> getContentMetrics() {
+        Set<Metric> metrics = new LinkedHashSet<>();
+
+        metrics.add(new Metric("content.proton.docsum.docs.rate"));
+        metrics.add(new Metric("content.proton.docsum.latency.average"));
+
+        metrics.add(new Metric("content.proton.transport.query.count.rate"));
+        metrics.add(new Metric("content.proton.transport.query.latency.average"));
+
+        metrics.add(new Metric("content.proton.documentdb.documents.total.last"));
+        metrics.add(new Metric("content.proton.documentdb.documents.ready.last"));
+        metrics.add(new Metric("content.proton.documentdb.documents.active.last"));
+        metrics.add(new Metric("content.proton.documentdb.index.docs_in_memory.last"));
+        metrics.add(new Metric("content.proton.documentdb.disk_usage.last"));
+
+        metrics.add(new Metric("content.proton.documentdb.job.total.average"));
+        metrics.add(new Metric("content.proton.documentdb.job.attribute_flush.average"));
+        metrics.add(new Metric("content.proton.documentdb.job.disk_index_fusion.average"));
+        metrics.add(new Metric("content.proton.documentdb.job.document_store_compact.average"));
+        metrics.add(new Metric("content.proton.documentdb.job.memory_index_flush.average"));
+
+        metrics.add(new Metric("content.proton.resource_usage.disk.average"));
+        metrics.add(new Metric("content.proton.resource_usage.disk_utilization.average"));
+        metrics.add(new Metric("content.proton.resource_usage.memory.average"));
+
+        metrics.add(new Metric("content.proton.documentdb.ready.document_store.memory_usage.allocated_bytes.average"));
+        metrics.add(new Metric("content.proton.documentdb.ready.document_store.cache.hit_rate.average"));
+        metrics.add(new Metric("content.proton.documentdb.index.memory_usage.allocated_bytes.average"));
+
+        metrics.add(new Metric("content.proton.documentdb.matching.docs_matched.rate"));
+        metrics.add(new Metric("content.proton.documentdb.matching.docs_reranked.rate"));
+        metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_latency.average"));
+        metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.rerank_time.average"));
+
+        return metrics;
+    }
+
+    private static Set<Metric> getStorageMetrics() {
+        Set<Metric> metrics = new LinkedHashSet<>();
+
+        metrics.add(new Metric("vds.filestor.alldisks.allthreads.put.sum.count.rate"));
+        metrics.add(new Metric("vds.filestor.alldisks.allthreads.remove.sum.count.rate"));
+        metrics.add(new Metric("vds.filestor.alldisks.allthreads.get.sum.count.rate"));
+        metrics.add(new Metric("vds.filestor.alldisks.allthreads.update.sum.count.rate"));
+        metrics.add(new Metric("vds.filestor.alldisks.allthreads.visit.sum.count.rate"));
+
+        return metrics;
+    }
+
     private DefaultPublicMetrics() { }
 
 }