diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-17 13:40:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-17 13:40:48 +0200 |
| commit | ecc1d05760fedf9c49a24a949160aa7930838dcc (patch) | |
| tree | 846847b018d480cbfd399921d447a9656b817629 /controller-api | |
| parent | e593f6bf57a63b71e0e078466104fc110a60d267 (diff) | |
| parent | 5dd851d5c5fce2e95b236cd1f5385270077f0450 (diff) | |
Merge branch 'master' into jonmv/no-more-serviceview/v1
Diffstat (limited to 'controller-api')
2 files changed, 4 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index cc0baf09c6b..97128d4c980 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -55,6 +55,9 @@ public interface ConfigServer { /** Returns a proxied response from a given path running on a given service and node */ ProxyResponse getServiceNodePage(DeploymentId deployment, String serviceName, DomainName node, Path subPath, Query query); + /** Returns health status for the services of an application */ + ProxyResponse getServiceNodes(DeploymentId deployment); + /** * Gets the Vespa logs of the given deployment. * diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java index b7874734e11..b5f03756777 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java @@ -115,6 +115,7 @@ enum PathGroup { "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/clusters", "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/content/{*}", "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/logs", + "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/orchestrator", "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/suspended", "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/service/{*}", "/application/v4/tenant/{tenant}/application/{application}/instance/{ignored}/environment/{environment}/region/{region}/access/support", |