diff options
5 files changed, 20 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/InfrastructureMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/InfrastructureMetricSet.java index 306138106e0..92156c959a0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/InfrastructureMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/InfrastructureMetricSet.java @@ -123,6 +123,10 @@ public class InfrastructureMetricSet { private static Set<Metric> getControllerMetrics() { Set<Metric> metrics = new LinkedHashSet<>(); + addMetric(metrics, ControllerMetrics.ATHENZ_REQUEST_ERROR.count()); + addMetric(metrics, ControllerMetrics.ARCHIVE_BUCKET_COUNT.last()); + addMetric(metrics, ControllerMetrics.BILLING_TENANTS.last()); + addMetric(metrics, ControllerMetrics.DEPLOYMENT_ABORT.count()); addMetric(metrics, ControllerMetrics.DEPLOYMENT_AVERAGE_DURATION, EnumSet.of(max, last)); // TODO: Vespa 9: Remove last. addMetric(metrics, ControllerMetrics.DEPLOYMENT_CONVERGENCE_FAILURE.count()); @@ -136,16 +140,22 @@ public class InfrastructureMetricSet { addMetric(metrics, ControllerMetrics.DEPLOYMENT_SUCCESS.count()); addMetric(metrics, ControllerMetrics.DEPLOYMENT_TEST_FAILURE.count()); addMetric(metrics, ControllerMetrics.DEPLOYMENT_WARNINGS.last()); + addMetric(metrics, ControllerMetrics.DEPLOYMENT_ENDPOINT_CERTIFICATE_TIMEOUT.count()); + addMetric(metrics, ControllerMetrics.DEPLOYMENT_BROKEN_SYSTEM_VERSION.last()); - addMetric(metrics, ControllerMetrics.OPERATION_API.last()); addMetric(metrics, ControllerMetrics.OPERATION_APPLICATION.last()); + addMetric(metrics, ControllerMetrics.OPERATION_CHANGEMANAGEMENT.last()); addMetric(metrics, ControllerMetrics.OPERATION_CONFIGSERVER.last()); addMetric(metrics, ControllerMetrics.OPERATION_CONTROLLER.last()); addMetric(metrics, ControllerMetrics.OPERATION_FLAGS.last()); addMetric(metrics, ControllerMetrics.OPERATION_OS.last()); addMetric(metrics, ControllerMetrics.OPERATION_ROUTING.last()); addMetric(metrics, ControllerMetrics.OPERATION_ZONE.last()); + + addMetric(metrics, ControllerMetrics.REMAINING_ROTATIONS.last()); + addMetric(metrics, ControllerMetrics.DNS_QUEUED_REQUESTS.last()); addMetric(metrics, ControllerMetrics.ZMS_QUOTA_USAGE.last()); + addMetric(metrics, ControllerMetrics.COREDUMP_PROCESSED.count()); addMetric(metrics, ControllerMetrics.METERING_AGE_SECONDS.last()); 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 b05122f22e2..a0d866fb001 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 @@ -2,9 +2,7 @@ package com.yahoo.vespa.model.admin.monitoring; import ai.vespa.metrics.ClusterControllerMetrics; -import ai.vespa.metrics.ConfigServerMetrics; import ai.vespa.metrics.ContainerMetrics; -import ai.vespa.metrics.ControllerMetrics; import ai.vespa.metrics.DistributorMetrics; import ai.vespa.metrics.LogdMetrics; import ai.vespa.metrics.NodeAdminMetrics; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java index c88eb2f1b86..aa50f9d3a87 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.athenz.impl; +import ai.vespa.metrics.ControllerMetrics; import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.athenz.api.AthenzIdentity; @@ -22,7 +23,7 @@ import java.util.Map; */ public class AthenzClientFactoryImpl implements AthenzClientFactory { - private static final String METRIC_NAME = "athenz.request.error"; + private static final String METRIC_NAME = ControllerMetrics.ATHENZ_REQUEST_ERROR.baseName(); private static final String ATHENZ_SERVICE_DIMENSION = "athenz-service"; private static final String EXCEPTION_DIMENSION = "exception"; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java index b2ed0941c8e..33a4802360e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.maintenance; +import ai.vespa.metrics.ControllerMetrics; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.jdisc.Metric; @@ -24,7 +25,7 @@ import java.util.stream.Collectors; */ public class ArchiveAccessMaintainer extends ControllerMaintainer { - private static final String bucketCountMetricName = "archive.bucketCount"; + private static final String bucketCountMetricName = ControllerMetrics.ARCHIVE_BUCKET_COUNT.baseName(); private final CuratorArchiveBucketDb archiveBucketDb; private final ArchiveService archiveService; diff --git a/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java index 01146adb8f0..c2307eb1376 100644 --- a/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java @@ -5,7 +5,9 @@ package ai.vespa.metrics; */ public enum ControllerMetrics implements VespaMetrics { - // The metrics enumerated in this file is intentionally not added to the metrics reference documentation. + ATHENZ_REQUEST_ERROR("athenz.request.error", Unit.REQUEST, "Controller: Athenz request error"), + ARCHIVE_BUCKET_COUNT("archive.bucketCount", Unit.BUCKET, "Controller: Archive bucket count"), + 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"), @@ -37,10 +39,11 @@ public enum ControllerMetrics implements VespaMetrics { DNS_QUEUED_REQUESTS("dns.queuedRequests", Unit.REQUEST, "Queued DNS requests"), ZMS_QUOTA_USAGE("zms.quota.usage", Unit.FRACTION, "ZMS Quota usage per resource type"), + COREDUMP_PROCESSED("coredump.processed", Unit.FAILURE,"Controller: Core dumps processed"), // Metrics per API, metrics created in ControllerMaintainer/MetricsReporter - OPERATION_API("operation.api.last", Unit.REQUEST, "Controller: Requests for /api API"), OPERATION_APPLICATION("operation.application", Unit.REQUEST, "Controller: Requests for /application API"), + OPERATION_CHANGEMANAGEMENT("operation.changemanagement", Unit.REQUEST, "Controller: Requests for /changemanagement API"), OPERATION_CONFIGSERVER("operation.configserver", Unit.REQUEST, "Controller: Requests for /configserver API"), OPERATION_CONTROLLER("operation.controller", Unit.REQUEST, "Controller: Requests for /controller API"), OPERATION_FLAGS("operation.flags", Unit.REQUEST, "Controller: Requests for /flags API"), |