Add 'up' history event

2 files changed, 8 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
index eae335ba36f..f1e62634235 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
@@ -157,7 +157,9 @@ public class History {
             // The active node was retired
             retired,
             // The active node went down according to the service monitor
-            down, 
+            down,
+            // The active node came up according to the service monitor
+            up,
             // The node made a config request, indicating it is live
             requested,
             // The node resources/flavor were changed
@@ -168,9 +170,9 @@ public class History {
             osUpgraded(false),
             // The node verified its firmware (whether this resulted in a reboot depends on the node model)
             firmwareVerified(false);
-            
+
             private final boolean applicationLevel;
-            
+
             /** Creates an application level event */
             Type() {
                 this.applicationLevel = true;
@@ -179,7 +181,7 @@ public class History {
             Type(boolean applicationLevel) {
                 this.applicationLevel = applicationLevel;
             }
-            
+
             /** Returns true if this is an application level event and false it it is a node level event */
             public boolean isApplicationLevel() { return applicationLevel; }
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index cd1b786afd1..4990c1e9db8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -460,6 +460,7 @@ public class NodeSerializer {
             case "failed" : return History.Event.Type.failed;
             case "deallocated" : return History.Event.Type.deallocated;
             case "down" : return History.Event.Type.down;
+            case "up" : return History.Event.Type.up;
             case "requested" : return History.Event.Type.requested;
             case "resized" : return History.Event.Type.resized;
             case "rebooted" : return History.Event.Type.rebooted;
@@ -486,6 +487,7 @@ public class NodeSerializer {
             case failed : return "failed";
             case deallocated : return "deallocated";
             case down : return "down";
+            case up : return "up";
             case requested: return "requested";
             case resized: return "resized";
             case rebooted: return "rebooted";