From cc17135ac684896538e14633b262639667caa463 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 20 Oct 2017 13:27:09 +0200 Subject: Use VespaVersion instead of Version --- .../yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'node-repository') 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 09af884004b..3ac5b496f56 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 @@ -77,12 +77,12 @@ public class MetricsReporter extends Maintainer { Version wantedVersion = allocation.get().membership().cluster().vespaVersion(); double wantedVersionNumber = getVersionAsNumber(wantedVersion); - metric.set("wantedVersion", wantedVersionNumber, context); + metric.set("wantedVespaVersion", wantedVersionNumber, context); Optional currentVersion = node.status().vespaVersion(); boolean converged = currentVersion.isPresent() && currentVersion.get().equals(wantedVersion); - metric.set("wantToChangeVersion", converged ? 0 : 1, context); + metric.set("wantToChangeVespaVersion", converged ? 0 : 1, context); } else { context = getContextAt( "state", node.state().name(), @@ -93,7 +93,7 @@ public class MetricsReporter extends Maintainer { // Node repo checks for !isEmpty(), so let's do that here too. if (currentVersion.isPresent() && !currentVersion.get().isEmpty()) { double currentVersionNumber = getVersionAsNumber(currentVersion.get()); - metric.set("currentVersion", currentVersionNumber, context); + metric.set("currentVespaVersion", currentVersionNumber, context); } long wantedRebootGeneration = node.status().reboot().wanted(); -- cgit v1.2.3