diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-02-18 13:25:39 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-02-18 14:44:12 +0100 |
commit | 49c817f7e8272685c73f49802a84bd613cb77d9a (patch) | |
tree | 6b52ef6fbaf1874d56b1fad4fe8b509d0c8b9cfd /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java | |
parent | 5b35f35f8a300e467689e956a535a8551b7272b0 (diff) |
Less Docker
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java index 9504a73f21e..8d8c7ef42f2 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java @@ -75,7 +75,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer { nodes.forEach(node -> updateNodeMetrics(node, serviceModel)); updateNodeCountMetrics(nodes); updateLockMetrics(); - updateDockerMetrics(nodes); + updateContainerMetrics(nodes); updateTenantUsageMetrics(nodes); updateRepairTicketMetrics(nodes); updateAllocationMetrics(nodes); @@ -315,7 +315,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer { } } - private void updateDockerMetrics(NodeList nodes) { + private void updateContainerMetrics(NodeList nodes) { NodeResources totalCapacity = getCapacityTotal(nodes); metric.set("hostedVespa.docker.totalCapacityCpu", totalCapacity.vcpu(), null); metric.set("hostedVespa.docker.totalCapacityMem", totalCapacity.memoryGb(), null); @@ -381,10 +381,10 @@ public class MetricsReporter extends NodeRepositoryMaintainer { .reduce(new NodeResources(0, 0, 0, 0, any), NodeResources::add); } - private static NodeResources freeCapacityOf(NodeList nodes, Node dockerHost) { - return nodes.childrenOf(dockerHost).asList().stream() + private static NodeResources freeCapacityOf(NodeList nodes, Node host) { + return nodes.childrenOf(host).asList().stream() .map(node -> node.flavor().resources().justNumbers()) - .reduce(dockerHost.flavor().resources().justNumbers(), NodeResources::subtract); + .reduce(host.flavor().resources().justNumbers(), NodeResources::subtract); } private static class ClusterKey { |