Merge pull request #22163 from vespa-engine/bjorncs/container-threadpool

Introduce new metrics for container threadpool

1 files changed, 11 insertions, 6 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 34586df424f..3a8cf23a49e 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
@@ -154,6 +154,17 @@ public class VespaMetricSet {
             addMetric(metrics, "jdisc.thread_pool.unhandled_exceptions", suffixes);
             addMetric(metrics, "jdisc.thread_pool.work_queue.capacity", suffixes);
             addMetric(metrics, "jdisc.thread_pool.work_queue.size", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.rejected_tasks", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.size", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.max_allowed_size", suffixes);
+            addMetric(metrics, "jdisc.thread_pool.active_threads", suffixes);
+
+            addMetric(metrics, "jdisc.http.jetty.threadpool.thread.max", suffixes);
+            addMetric(metrics, "jdisc.http.jetty.threadpool.thread.min", suffixes);
+            addMetric(metrics, "jdisc.http.jetty.threadpool.thread.reserved", suffixes);
+            addMetric(metrics, "jdisc.http.jetty.threadpool.thread.busy", suffixes);
+            addMetric(metrics, "jdisc.http.jetty.threadpool.thread.total", suffixes);
+            addMetric(metrics, "jdisc.http.jetty.threadpool.queue.size", suffixes);
         }
 
         metrics.add(new Metric("httpapi_latency.max"));
@@ -223,12 +234,6 @@ public class VespaMetricSet {
 
         metrics.add(new Metric("jdisc.http.handler.unhandled_exceptions.rate"));
 
-        addMetric(metrics, "jdisc.http.jetty.threadpool.thread.max", List.of("last"));
-        addMetric(metrics, "jdisc.http.jetty.threadpool.thread.reserved", List.of("last"));
-        addMetric(metrics, "jdisc.http.jetty.threadpool.thread.busy", List.of("sum", "count", "min", "max"));
-        addMetric(metrics, "jdisc.http.jetty.threadpool.thread.total", List.of("sum", "count", "min", "max"));
-        addMetric(metrics, "jdisc.http.jetty.threadpool.queue.size", List.of("sum", "count", "min", "max"));
-
         addMetric(metrics, "jdisc.http.filtering.request.handled", List.of("rate"));
         addMetric(metrics, "jdisc.http.filtering.request.unhandled", List.of("rate"));
         addMetric(metrics, "jdisc.http.filtering.response.handled", List.of("rate"));