summaryrefslogtreecommitdiffstats
path: root/service-monitor
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2018-06-05 12:33:38 +0200
committerHåkon Hallingstad <hakon@oath.com>2018-06-05 12:33:38 +0200
commit9cb70af75a2e34f574040eee59cf3d544639ca5b (patch)
treef3365103d89da7c935d0654ebb8574647a1b422b /service-monitor
parentc6e0e0ee297f401ce6c51a6f21ea574bda9c3898 (diff)
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.java11
1 files changed, 3 insertions, 8 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 97c4fdda0f3..8183d5e1960 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,7 +14,6 @@ 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;
@@ -47,13 +46,9 @@ public class ServiceMonitorImpl implements ServiceMonitor {
}
private List<String> toConfigServerList(ConfigserverConfig configserverConfig) {
- if (configserverConfig.multitenant()) {
- return configserverConfig.zookeeperserver().stream()
- .map(ConfigserverConfig.Zookeeperserver::hostname)
- .collect(Collectors.toList());
- }
-
- return Collections.emptyList();
+ return configserverConfig.zookeeperserver().stream()
+ .map(ConfigserverConfig.Zookeeperserver::hostname)
+ .collect(Collectors.toList());
}
@Override