diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-10-25 17:36:20 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-10-25 17:36:20 +0200 |
commit | 37ce355370e8483c05bd9a7ce9f4f248e19ad4fb (patch) | |
tree | a8f0ec831ee667ecd909fad6b5206fdae5307821 /service-monitor/src/main/java/com | |
parent | 9606e88b7ca082f36eb38b0e197a0513f76ef6eb (diff) |
Provide more info in host Orchestrator REST API
Diffstat (limited to 'service-monitor/src/main/java/com')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java | 6 | ||||
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java index 1a48ba870fb..7a76c072076 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java @@ -48,6 +48,12 @@ public class ConfigServerApplication { APPLICATION_INSTANCE_ID, serviceClusters); + // Fill back-references + serviceCluster.setApplicationInstance(applicationInstance); + for (ServiceInstance serviceInstance : serviceCluster.serviceInstances()) { + serviceInstance.setServiceCluster(serviceCluster); + } + return applicationInstance; } } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java index d9f019ade63..9716846dea4 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java @@ -101,6 +101,14 @@ public class ModelGenerator { toApplicationInstanceId(applicationInfo, zone), serviceClusters); + // Fill back-references + for (ServiceCluster serviceCluster : applicationInstance.serviceClusters()) { + serviceCluster.setApplicationInstance(applicationInstance); + for (ServiceInstance serviceInstance : serviceCluster.serviceInstances()) { + serviceInstance.setServiceCluster(serviceCluster); + } + } + return applicationInstance; } |