diff options
author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-08-01 10:20:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 10:20:45 +0200 |
commit | 5a682c36b257598915ad99d2fb8e29023b082119 (patch) | |
tree | 8c7fa7b6c2c2a4ee63ea0bd624cf95d25078c76d /node-repository | |
parent | dd36d60b716a1d785371e1316e33ced5871a1d5f (diff) | |
parent | ea9d53d09316663cf858eb8de2b5b7c754600a3a (diff) |
Merge pull request #27935 from vespa-engine/yngveaasheim/prepare-metricset-config-server
Add separate infrastructure metric set
Diffstat (limited to 'node-repository')
2 files changed, 6 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java index 585a7f341b5..5673b2d74ea 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.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.provision.maintenance; +import ai.vespa.metrics.ConfigServerMetrics; import com.yahoo.concurrent.UncheckedTimeoutException; import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.Deployment; @@ -45,10 +46,10 @@ public class NodeFailer extends NodeRepositoryMaintainer { private static final Logger log = Logger.getLogger(NodeFailer.class.getName()); /** Metric for number of hosts that we want to fail, but cannot due to throttling */ - static final String throttledHostFailuresMetric = "throttledHostFailures"; + static final String throttledHostFailuresMetric = ConfigServerMetrics.THROTTLED_HOST_FAILURES.baseName(); /** Metric for number of nodes that we want to fail, but cannot due to throttling */ - static final String throttledNodeFailuresMetric = "throttledNodeFailures"; + static final String throttledNodeFailuresMetric = ConfigServerMetrics.THROTTLED_NODE_FAILURES.baseName(); /** Metric that indicates whether throttling is active where 1 means active and 0 means inactive */ static final String throttlingActiveMetric = "nodeFailThrottling"; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java index dcdcbf09175..da05656fcee 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.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.provision.maintenance; +import ai.vespa.metrics.ConfigServerMetrics; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Deployer; @@ -75,7 +76,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { CapacityChecker capacityChecker = new CapacityChecker(allNodes); List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts(); - metric.set("overcommittedHosts", overcommittedHosts.size(), null); + metric.set(ConfigServerMetrics.OVERCOMMITTED_HOSTS.baseName(), overcommittedHosts.size(), null); retireOvercommitedHosts(allNodes, overcommittedHosts); boolean success = true; @@ -93,7 +94,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { success = false; } } - metric.set("spareHostCapacity", spareHostCapacity, null); + metric.set(ConfigServerMetrics.SPARE_HOST_CAPACITY.baseName(), spareHostCapacity, null); } return success ? 1.0 : 0.0; } |