aboutsummaryrefslogtreecommitdiffstats
path: root/metrics
diff options
context:
space:
mode:
authorBjørn Meland <bjormel@users.noreply.github.com>2024-02-05 13:41:45 +0000
committerGitHub <noreply@github.com>2024-02-05 13:41:45 +0000
commit84b426e04d3aab526a492573e052860a1b9db3c6 (patch)
treec67198a2e73999f0d6d8a169dd106ad8167fac01 /metrics
parentd45399e3ab1d07781f71473e4a8fe2b67b197941 (diff)
parent4944fc97c6fdfae6a12c6d99ceab39992a03046a (diff)
Merge pull request #30178 from vespa-engine/bjormel/expose_expire_metrics
Expose expire metrics
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java5
-rw-r--r--metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java
index 94731945038..c413dc5e7d7 100644
--- a/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java
+++ b/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java
@@ -56,6 +56,11 @@ public enum ConfigServerMetrics implements VespaMetrics {
NODES_NON_ACTIVE_FRACTION("nodes.nonActiveFraction", Unit.NODE, "The fraction of non-active nodes vs total nodes in a cluster"),
NODES_EXCLUSIVE_SWITCH_FRACTION("nodes.exclusiveSwitchFraction", Unit.FRACTION, "The fraction of nodes in a cluster on exclusive network switches"),
NODES_EMPTY_EXCLUSIVE("nodes.emptyExclusive", Unit.NODE, "The number of exclusive hosts that do not have any nodes allocated to them"),
+ NODES_EXPIRED_DEPROVISIONED("nodes.expired.deprovisioned", Unit.NODE, "The number of deprovisioned nodes that have expired"),
+ NODES_EXPIRED_DIRTY("nodes.expired.dirty", Unit.NODE, "The number of dirty nodes that have expired"),
+ NODES_EXPIRED_INACTIVE("nodes.expired.inactive", Unit.NODE, "The number of inactive nodes that have expired"),
+ NODES_EXPIRED_PROVISIONED("nodes.expired.provisioned", Unit.NODE, "The number of provisioned nodes that have expired"),
+ NODES_EXPIRED_RESERVED("nodes.expired.reserved", Unit.NODE, "The number of reserved nodes that have expired"),
CLUSTER_COST("cluster.cost", Unit.DOLLAR_PER_HOUR, "The cost of the nodes allocated to a certain cluster, in $/hr"),
CLUSTER_LOAD_IDEAL_CPU("cluster.load.ideal.cpu", Unit.FRACTION, "The ideal cpu load of a certain cluster"),
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 a9d078e2a44..61ab8cea941 100644
--- a/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java
+++ b/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java
@@ -68,6 +68,11 @@ public class InfrastructureMetricSet {
addMetric(metrics, ConfigServerMetrics.CLUSTER_LOAD_IDEAL_MEMORY.max());
addMetric(metrics, ConfigServerMetrics.CLUSTER_LOAD_IDEAL_DISK.max());
addMetric(metrics, ConfigServerMetrics.NODES_EMPTY_EXCLUSIVE.max());
+ addMetric(metrics, ConfigServerMetrics.NODES_EXPIRED_DEPROVISIONED.sum());
+ addMetric(metrics, ConfigServerMetrics.NODES_EXPIRED_DIRTY.sum());
+ addMetric(metrics, ConfigServerMetrics.NODES_EXPIRED_INACTIVE.sum());
+ addMetric(metrics, ConfigServerMetrics.NODES_EXPIRED_PROVISIONED.sum());
+ addMetric(metrics, ConfigServerMetrics.NODES_EXPIRED_RESERVED.sum());
addMetric(metrics, ConfigServerMetrics.WANT_TO_REBOOT.max());
addMetric(metrics, ConfigServerMetrics.WANT_TO_RESTART.max());
addMetric(metrics, ConfigServerMetrics.WANT_TO_RETIRE.max());