diff options
author | yngveaasheim <yngve@yahooinc.com> | 2023-08-02 11:59:04 +0200 |
---|---|---|
committer | yngveaasheim <yngve@yahooinc.com> | 2023-08-02 11:59:04 +0200 |
commit | f648478b9f50cee8edf7d1ca9683da554b23c64d (patch) | |
tree | d32d1a622250c080409b6d557ebb5f08f8ebd7eb /metrics | |
parent | ef8786173aacd4cb9f12b05ce1eacce0bcc39a76 (diff) |
Add metrics as needed for the summary dashboard
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/main/java/ai/vespa/metrics/set/DefaultMetrics.java | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/metrics/src/main/java/ai/vespa/metrics/set/DefaultMetrics.java b/metrics/src/main/java/ai/vespa/metrics/set/DefaultMetrics.java index ffc947828ff..634afdf2693 100644 --- a/metrics/src/main/java/ai/vespa/metrics/set/DefaultMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/set/DefaultMetrics.java @@ -4,6 +4,8 @@ package ai.vespa.metrics.set; import ai.vespa.metrics.ContainerMetrics; import ai.vespa.metrics.SearchNodeMetrics; +import ai.vespa.metrics.StorageMetrics; +import ai.vespa.metrics.DistributorMetrics; import ai.vespa.metrics.Suffix; import ai.vespa.metrics.VespaMetrics; @@ -15,6 +17,7 @@ import java.util.Set; import static ai.vespa.metrics.Suffix.average; import static ai.vespa.metrics.Suffix.count; import static ai.vespa.metrics.Suffix.max; +import static ai.vespa.metrics.Suffix.min; import static ai.vespa.metrics.Suffix.ninety_five_percentile; import static ai.vespa.metrics.Suffix.ninety_nine_percentile; import static ai.vespa.metrics.Suffix.sum; @@ -41,9 +44,12 @@ public class DefaultMetrics { private static Set<Metric> getAllMetrics() { Set<Metric> metrics = new LinkedHashSet<>(); - addContentMetrics(metrics); addContainerMetrics(metrics); addSearchChainMetrics(metrics); + addDocprocMetrics(metrics); + addContentMetrics(metrics); + addStorageMetrics(metrics); + addDistributorMetrics(metrics); return Collections.unmodifiableSet(metrics); } @@ -55,7 +61,13 @@ public class DefaultMetrics { addMetric(metrics, ContainerMetrics.HTTP_STATUS_5XX.rate()); addMetric(metrics, ContainerMetrics.JDISC_GC_MS.average()); addMetric(metrics, ContainerMetrics.MEM_HEAP_FREE.average()); - } + addMetric(metrics, ContainerMetrics.FEED_LATENCY, EnumSet.of(sum, count)); + addMetric(metrics, ContainerMetrics.JDISC_GC_MS.max()); + // addMetric(metrics, ContainerMetrics.CPU.baseName()); // TODO: Add to container metrics + addMetric(metrics, ContainerMetrics.JDISC_THREAD_POOL_SIZE.max()); + addMetric(metrics, ContainerMetrics.JDISC_THREAD_POOL_ACTIVE_THREADS, EnumSet.of(sum, count, min, max)); + addMetric(metrics, ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_CAPACITY.max()); + addMetric(metrics, ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_SIZE, EnumSet.of(sum, count, min, max));} private static void addSearchChainMetrics(Set<Metric> metrics) { addMetric(metrics, ContainerMetrics.QUERIES.rate()); @@ -67,6 +79,10 @@ public class DefaultMetrics { addMetric(metrics, ContainerMetrics.SERVER_ACTIVE_THREADS.average()); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.active_threads. } + private static void addDocprocMetrics(Set<Metric> metrics) { + addMetric(metrics, ContainerMetrics.DOCPROC_DOCUMENTS.sum()); + } + private static void addContentMetrics(Set<Metric> metrics) { addMetric(metrics, SearchNodeMetrics.CONTENT_PROTON_SEARCH_PROTOCOL_DOCSUM_REQUESTED_DOCUMENTS.rate()); addMetric(metrics, SearchNodeMetrics.CONTENT_PROTON_SEARCH_PROTOCOL_DOCSUM_LATENCY, EnumSet.of(sum, count, max, average)); // TODO: Remove average with Vespa 9 @@ -89,6 +105,16 @@ public class DefaultMetrics { addMetric(metrics, SearchNodeMetrics.CONTENT_PROTON_TRANSACTIONLOG_DISK_USAGE.last()); } + private static void addStorageMetrics(Set<Metric> metrics) { + addMetric(metrics, StorageMetrics.VDS_FILESTOR_ALLTHREADS_PUT_COUNT.rate()); + addMetric(metrics, StorageMetrics.VDS_FILESTOR_ALLTHREADS_UPDATE_COUNT.rate()); + addMetric(metrics, StorageMetrics.VDS_FILESTOR_ALLTHREADS_REMOVE_COUNT.rate()); + } + + private static void addDistributorMetrics(Set<Metric> metrics) { + addMetric(metrics, DistributorMetrics.VDS_DISTRIBUTOR_DOCSSTORED.average()); + } + private static void addMetric(Set<Metric> metrics, String nameWithSuffix) { metrics.add(new Metric(nameWithSuffix)); } |