diff options
| author | jonmv <venstad@gmail.com> | 2023-10-11 21:45:53 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-10-11 21:45:53 +0200 |
| commit | 894738eb2e0a88a8868c6abaa692da176ef83969 (patch) | |
| tree | b9edf37163471cb5bc55317c1b625493ba39af1a /metrics | |
| parent | f47b44fb69228c7a7ec316d5213508bd563bf907 (diff) | |
Revert "Merge pull request #28879 from vespa-engine/revert-28869-jonmv/job-runner-thread-metrics"
This reverts commit 67351aa3e2adbbb4872097ed799f1ca837f35e6d, reversing
changes made to aed7902ee0371efb89747d467c4a2f8124ddc08d.
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java | 2 | ||||
| -rw-r--r-- | metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java index 3676be90cd4..f03c54aa822 100644 --- a/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java @@ -9,6 +9,8 @@ public enum ControllerMetrics implements VespaMetrics { ATHENZ_REQUEST_ERROR("athenz.request.error", Unit.REQUEST, "Controller: Athenz request error"), ARCHIVE_BUCKET_COUNT("archive.bucketCount", Unit.BUCKET, "Controller: Archive bucket count"), + DEPLOYMENT_JOBS_QUEUED("deployment.jobsQueued", Unit.TASK, "The number of deployment jobs queued"), + DEPLOYMENT_JOBS_ACTIVE("deployment.jobsActive", Unit.TASK, "The number of deployment jobs active"), DEPLOYMENT_START("deployment.start", Unit.DEPLOYMENT, "The number of started deployment jobs"), DEPLOYMENT_NODE_ALLOCATION_FAILURE("deployment.nodeAllocationFailure", Unit.DEPLOYMENT, "The number of deployments failed due to node allocation failures"), DEPLOYMENT_ENDPOINT_CERTIFICATE_TIMEOUT("deployment.endpointCertificateTimeout", Unit.DEPLOYMENT, "The number of deployments failed due to timeout acquiring endpoint certificate"), diff --git a/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java b/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java index 6bffddb885a..9443a08e28b 100644 --- a/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java +++ b/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java @@ -143,6 +143,8 @@ public class InfrastructureMetricSet { addMetric(metrics, ControllerMetrics.ARCHIVE_BUCKET_COUNT.max()); addMetric(metrics, ControllerMetrics.BILLING_TENANTS.max()); + addMetric(metrics, ControllerMetrics.DEPLOYMENT_JOBS_QUEUED, EnumSet.of(count, sum)); + addMetric(metrics, ControllerMetrics.DEPLOYMENT_JOBS_ACTIVE, EnumSet.of(count, sum)); addMetric(metrics, ControllerMetrics.DEPLOYMENT_ABORT.count()); addMetric(metrics, ControllerMetrics.DEPLOYMENT_AVERAGE_DURATION.max()); addMetric(metrics, ControllerMetrics.DEPLOYMENT_CONVERGENCE_FAILURE.count()); |