summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2017-10-20 13:27:09 +0200
committerHåkon Hallingstad <hakon@oath.com>2017-10-20 13:27:09 +0200
commitcc17135ac684896538e14633b262639667caa463 (patch)
treebb1449b561492a1effb100529ebd8d581296dae4
parentaad3751786ae125f5f4bdc71b10ff77498e9454c (diff)
Use VespaVersion instead of Version
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java6
1 files changed, 3 insertions, 3 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 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<Version> 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();