diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-10-10 10:02:22 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-10-10 10:02:22 +0200 |
| commit | c65a072b78328c6eb5826dc490550c217246eb76 (patch) | |
| tree | f570f37b5d61bfdd5e944bc07fd270848701b6a8 /controller-server | |
| parent | 37a64fc6dc3294261325e53b51e9355313e471b0 (diff) | |
Add lastUpdated field to endpoint status
Diffstat (limited to 'controller-server')
4 files changed, 10 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 51cd306767a..715d31d129f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -993,8 +993,10 @@ public class ApplicationApiHandler extends LoggingRequestHandler { var array = object.setArray("endpointStatus"); for (var rotation : rotations) { var statusObject = array.addObject(); + var targets = status.of(rotation.rotationId()); statusObject.setString("endpointId", rotation.endpointId().id()); statusObject.setString("status", rotationStateString(status.of(rotation.rotationId(), deployment))); + statusObject.setLong("lastUpdated", targets.lastUpdated().toEpochMilli()); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json index bcda7992d81..bec264a2053 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json @@ -222,7 +222,8 @@ "endpointStatus": [ { "endpointId": "default", - "status": "IN" + "status": "IN", + "lastUpdated": "(ignore)" } ], "environment": "prod", @@ -237,7 +238,8 @@ "endpointStatus": [ { "endpointId": "default", - "status": "UNKNOWN" + "status": "UNKNOWN", + "lastUpdated": "(ignore)" } ], "environment": "prod", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json index 009d6c74dd1..8af41dc66a1 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json @@ -214,7 +214,8 @@ "endpointStatus": [ { "endpointId": "default", - "status": "IN" + "status": "IN", + "lastUpdated":"(ignore)" } ], "environment": "prod", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json index 140be562fe9..7832230d94b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json @@ -5,7 +5,8 @@ "endpointStatus": [ { "endpointId": "default", - "status": "IN" + "status": "IN", + "lastUpdated": "(ignore)" } ], "tenant": "tenant1", |