From 70ca76a2fabe46a809d620d3192d57f95f114290 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 16 Nov 2020 12:48:43 +0100 Subject: Add in_rotation metric to containers --- .../yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java index acf9340fa7c..1d4babd7c1d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java @@ -16,11 +16,15 @@ public class AutoscalingMetrics { private static MetricSet create() { return new MetricSet("autoscaling", - metrics("cpu.util", "mem_total.util", "disk.util", "application_generation")); + metrics("cpu.util", + "mem_total.util", + "disk.util", + "application_generation", + "in_rotation")); } - private static Set metrics(String ... names) { - return Arrays.stream(names).map(Metric::new).collect(Collectors.toSet()); + private static Set metrics(String ... metrics) { + return Arrays.stream(metrics).map(Metric::new).collect(Collectors.toSet()); } } -- cgit v1.2.3 From 10ee0e734ba6cc9fce0f1555cf83ecf8cdfcb094 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 16 Nov 2020 23:03:38 +0100 Subject: Use a name that works better for content nodes --- .../yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java | 2 +- .../src/main/java/com/yahoo/container/handler/VipStatus.java | 2 +- .../test/java/com/yahoo/container/handler/VipStatusTestCase.java | 2 +- .../yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java | 8 ++++---- .../yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java | 6 +++--- .../hosted/provision/maintenance/NodeMetricsDbMaintainer.java | 2 +- .../hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java index 1d4babd7c1d..ab283a8fbd1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java @@ -20,7 +20,7 @@ public class AutoscalingMetrics { "mem_total.util", "disk.util", "application_generation", - "in_rotation")); + "in_service")); } private static Set metrics(String ... metrics) { diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java index bbedf723bfa..50b34d39751 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java @@ -149,7 +149,7 @@ public class VipStatus { else if (healthState.status() == StateMonitor.Status.up) healthState.status(StateMonitor.Status.down); - metric.set("in_rotation", currentlyInRotation ? 1 : 0, metric.createContext(Map.of())); + metric.set("in_service", currentlyInRotation ? 1 : 0, metric.createContext(Map.of())); } } diff --git a/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java b/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java index 640222e8351..bce9fe318d5 100644 --- a/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java +++ b/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java @@ -197,7 +197,7 @@ public class VipStatusTestCase { @Override public void set(String key, Number val, Context ctx) { - if ( ! key.equals("in_rotation")) + if ( ! key.equals("in_service")) throw new RuntimeException("Metric.set called with unexpected key " + key); inRotation = val.intValue(); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java index 7266fa67e90..6f6cd862c33 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java @@ -17,15 +17,15 @@ public class MetricSnapshot { private final double memory; private final double disk; private final long generation; - private final boolean inRotation; + private final boolean inService; - public MetricSnapshot(Instant at, double cpu, double memory, double disk, long generation, boolean inRotation) { + public MetricSnapshot(Instant at, double cpu, double memory, double disk, long generation, boolean inService) { this.at = at; this.cpu = cpu; this.memory = memory; this.disk = disk; this.generation = generation; - this.inRotation = inRotation; + this.inService = inService; } public Instant at() { return at; } @@ -33,7 +33,7 @@ public class MetricSnapshot { public double memory() { return memory; } public double disk() { return disk; } public long generation() { return generation; } - public boolean inRotation() { return inRotation; } + public boolean inService() { return inService; } @Override public String toString() { return "metrics at " + at + ":" + diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java index 8b9e116f844..4471d267416 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java @@ -49,7 +49,7 @@ public class MetricsResponse { Metric.memory.from(values), Metric.disk.from(values), (long)Metric.generation.from(values), - Metric.inRotation.from(values) > 0))); + Metric.inService.from(values) > 0))); } private void consumeServiceMetrics(String hostname, Inspector node) { @@ -87,8 +87,8 @@ public class MetricsResponse { public String metricResponseName() { return "application_generation"; } double convertValue(double metricValue) { return (float)metricValue; } // Really a long }, - inRotation { - public String metricResponseName() { return "in_rotation"; } + inService { + public String metricResponseName() { return "in_service"; } double convertValue(double metricValue) { return (float)metricValue; } // Really a boolean double defaultValue() { return 1.0; } }; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java index e1f23f2e280..ff7bc9393bd 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java @@ -62,7 +62,7 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer { /** Filter out uninformative snapshots before storing */ private Collection> filter(Collection> snapshots) { return snapshots.stream() - .filter(snapshot -> snapshot.getSecond().inRotation()) + .filter(snapshot -> snapshot.getSecond().inService()) .collect(Collectors.toList()); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java index 2f27409ba5e..722911569de 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java @@ -73,7 +73,7 @@ public class NodeMetricsDbMaintainerTest { " \"mem_total.util\": 15,\n" + " \"disk.util\": 20,\n" + " \"application_generation\": 3,\n" + - " \"in_rotation\": 1\n" + + " \"in_service\": 1\n" + " },\n" + " \"dimensions\": {\n" + " \"state\": \"active\"\n" + @@ -94,7 +94,7 @@ public class NodeMetricsDbMaintainerTest { " \"mem_total.util\": 2,\n" + " \"disk.util\": 3,\n" + " \"application_generation\": 3,\n" + - " \"in_rotation\": 0\n" + + " \"in_service\": 0\n" + " },\n" + " \"dimensions\": {\n" + " \"state\": \"active\"\n" + -- cgit v1.2.3