diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-06-06 15:02:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 15:02:30 +0200 |
commit | ae350244db7eabb456597dec3a62781cfb25d8f9 (patch) | |
tree | 364319480750bcf199418b0bea18213d6c63d374 /service-monitor | |
parent | 62ae46a58d9501ad60431634f374b3cfa2856a48 (diff) |
Revert "Always enable synthetic config server app in service monitor"
Diffstat (limited to 'service-monitor')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java index 8183d5e1960..97c4fdda0f3 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java @@ -14,6 +14,7 @@ import com.yahoo.vespa.service.monitor.ServiceMonitor; import com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager; import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -46,9 +47,13 @@ public class ServiceMonitorImpl implements ServiceMonitor { } private List<String> toConfigServerList(ConfigserverConfig configserverConfig) { - return configserverConfig.zookeeperserver().stream() - .map(ConfigserverConfig.Zookeeperserver::hostname) - .collect(Collectors.toList()); + if (configserverConfig.multitenant()) { + return configserverConfig.zookeeperserver().stream() + .map(ConfigserverConfig.Zookeeperserver::hostname) + .collect(Collectors.toList()); + } + + return Collections.emptyList(); } @Override |