diff options
| author | gjoranv <gjoranv@gmail.com> | 2023-01-17 12:13:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 12:13:29 +0100 |
| commit | 2d96663b5067e6646e0e3b737a8607865ea6d586 (patch) | |
| tree | e21624ec84bcc7a0948baf606a125d3941cdf3b0 | |
| parent | ce2471b9eee8e26b81a9289d2e1690c3de1b0203 (diff) | |
| parent | 62a85aa028d84970e907ec5f24c45d75adeb5da8 (diff) | |
Merge pull request #25600 from vespa-engine/yngveaasheim/use-enums-for-remaining-container-metrics
Use enums for remaining container metrics
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 16 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java | 3 |
2 files changed, 11 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")); diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java index f2ef7f5b0e0..e4c513fb7ac 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java @@ -100,6 +100,9 @@ public enum ContainerMetrics { MEM_NATIVE_FREE("mem.native.free", Unit.BYTE, "Currently free native memory"), MEM_NATIVE_USED("mem.native.used", Unit.BYTE, "Native memory currently used"), + ATHENZ_TENANT_CERT_EXPIRY_SECONDS("athenz-tenant-cert.expiry.seconds", Unit.SECOND, "Time remaining until Athenz tenant certificate expires"), + CONTAINER_IAM_ROLE_EXPIRY_SECONDS("container-iam-role.expiry.seconds", Unit.SECOND, "Time remaining until IAM role expires"), + // SearchChain metrics PEAK_QPS("peak_qps", Unit.OPERATION_PER_SECOND, "The highest number of qps for a second for this metrics shapshot"), |