Add event reason to /nodes/v2 API

vespa-engine · Dec 9, 2024 · 7b50dc3 · 7b50dc3
1 parent 610b2e6
commit 7b50dc3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -237,6 +237,7 @@ private void toSlime(Collection<History.Event> events, Cursor array) {
             object.setString("event", event.type().name());
             object.setLong("at", event.at().toEpochMilli());
             object.setString("agent", event.agent().name());
+            event.reason().ifPresent(reason -> object.setString("reason", reason));
         }
     }
 

diff --git a/...ository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json b/...ository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json
@@ -49,7 +49,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "operator"
+      "agent": "operator",
+      "reason": "MockNodeRepository"
     },
     {
       "event": "deprovisioned",
@@ -76,7 +77,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "operator"
+      "agent": "operator",
+      "reason": "MockNodeRepository"
     },
     {
       "event": "deprovisioned",

diff --git a/...src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/...src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json
@@ -88,7 +88,8 @@
     {
       "event": "wantToFail",
       "at": 123,
-      "agent": "operator"
+      "agent": "operator",
+      "reason": "Failed through the nodes/v2 API"
     },
     {
       "event": "rebooted",
@@ -135,7 +136,8 @@
     {
       "event": "wantToFail",
       "at": 123,
-      "agent": "operator"
+      "agent": "operator",
+      "reason": "Failed through the nodes/v2 API"
     },
     {
       "event": "rebooted",

diff --git a/...src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json b/...src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json
@@ -48,7 +48,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "system"
+      "agent": "system",
+      "reason": "MockNodeRepository"
     }
   ],
   "log": [
@@ -70,7 +71,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "system"
+      "agent": "system",
+      "reason": "MockNodeRepository"
     }
   ],
   "ipAddresses": ["::5:1", "127.0.5.1"],

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json
@@ -50,7 +50,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "system"
+      "agent": "system",
+      "reason": "MockNodeRepository"
     }
   ],
   "log": [
@@ -72,7 +73,8 @@
     {
       "event": "failed",
       "at": 123,
-      "agent": "system"
+      "agent": "system",
+      "reason": "MockNodeRepository"
     }
   ],
   "ipAddresses": ["::5:1", "127.0.5.1"],