diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-19 07:57:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 07:57:46 +0200 |
| commit | 97128add3d85ece0efda63a4be1262dd5eaac812 (patch) | |
| tree | 8ce5471e5328a84bfb74a82d63f71e6659d275f4 /controller-api/src | |
| parent | 55788b03e5980f75e93aef00657128e37c16491f (diff) | |
| parent | d8d8834a5688e3a3dd32f4c71ffb5571c1014bc5 (diff) | |
Merge branch 'master' into jonmv/remove-compatibility-application-version-serialisation
Diffstat (limited to 'controller-api/src')
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 6dccf493d92..0b23f1c2f3f 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 @@ -60,6 +60,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", |