1 files changed, 16 insertions, 0 deletions
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 973f7f5cc40..12f0f717a19 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
@@ -429,6 +429,7 @@ public class VespaMetricSet {
         addSearchNodeExecutorMetrics(metrics, "content.proton.executor.docsum");
         addSearchNodeExecutorMetrics(metrics, "content.proton.executor.shared");
         addSearchNodeExecutorMetrics(metrics, "content.proton.executor.warmup");
+        addSearchNodeExecutorMetrics(metrics, "content.proton.executor.field_writer");
 
         // jobs
         metrics.add(new Metric("content.proton.documentdb.job.total.average"));
@@ -583,6 +584,15 @@ public class VespaMetricSet {
         metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.docs_matched.count"));
         metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.limited_queries.rate"));
 
+        // feeding
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.max"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.sum"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.count"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.rate"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.max"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.sum"));
+        metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.count"));
+
         return metrics;
     }
 
@@ -618,6 +628,12 @@ public class VespaMetricSet {
         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.allthreads.mergemetadatareadlatency.max"));
         metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergemetadatareadlatency.sum"));
         metrics.add(new Metric("vds.filestor.alldisks.allthreads.mergemetadatareadlatency.count"));