aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
diff options
context:
space:
mode:
authorYngve Aasheim <yngveaasheim@users.noreply.github.com>2023-01-17 11:44:37 +0100
committerGitHub <noreply@github.com>2023-01-17 11:44:37 +0100
commit62a85aa028d84970e907ec5f24c45d75adeb5da8 (patch)
treee21624ec84bcc7a0948baf606a125d3941cdf3b0 /config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
parent147500b3223ef29520ed7049853f1dc5d198d135 (diff)
Use enums for remaining container metrics
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java16
1 files changed, 8 insertions, 8 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 b549025fa19..66073b1d7d1 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
@@ -194,14 +194,14 @@ public class VespaMetricSet {
addMetric(metrics, ContainerMetrics.JDISC_SINGLETON_DEACTIVATION_FAILURE_COUNT.last());
addMetric(metrics, ContainerMetrics.JDISC_SINGLETON_DEACTIVATION_MILLIS.last());
- metrics.add(new Metric("athenz-tenant-cert.expiry.seconds.last"));
- metrics.add(new Metric("container-iam-role.expiry.seconds"));
-
- metrics.add(new Metric(ContainerMetrics.HTTP_STATUS_1XX.rate()));
- metrics.add(new Metric(ContainerMetrics.HTTP_STATUS_2XX.rate()));
- metrics.add(new Metric(ContainerMetrics.HTTP_STATUS_3XX.rate()));
- metrics.add(new Metric(ContainerMetrics.HTTP_STATUS_4XX.rate()));
- metrics.add(new Metric(ContainerMetrics.HTTP_STATUS_5XX.rate()));
+ addMetric(metrics, ContainerMetrics.ATHENZ_TENANT_CERT_EXPIRY_SECONDS.last());
+ addMetric(metrics, ContainerMetrics.CONTAINER_IAM_ROLE_EXPIRY_SECONDS.baseName());
+
+ addMetric(metrics, ContainerMetrics.HTTP_STATUS_1XX.rate());
+ addMetric(metrics, ContainerMetrics.HTTP_STATUS_2XX.rate());
+ addMetric(metrics, ContainerMetrics.HTTP_STATUS_3XX.rate());
+ addMetric(metrics, ContainerMetrics.HTTP_STATUS_4XX.rate());
+ addMetric(metrics, ContainerMetrics.HTTP_STATUS_5XX.rate());
addMetric(metrics, ContainerMetrics.JDISC_HTTP_REQUEST_PREMATURELY_CLOSED.rate());
addMetric(metrics, ContainerMetrics.JDISC_HTTP_REQUEST_REQUESTS_PER_CONNECTION.baseName(), List.of("sum", "count", "min", "max", "average"));