1 files changed, 5 insertions, 13 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..bd8fd4a50e0 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,9 +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.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class ServiceMonitorImpl implements ServiceMonitor {
     private final ServiceModelCache serviceModelCache;
@@ -31,26 +29,20 @@ public class ServiceMonitorImpl implements ServiceMonitor {
         Zone zone = superModelProvider.getZone();
         ServiceMonitorMetrics metrics = new ServiceMonitorMetrics(metric, timer);
 
-        UnionMonitorManager monitorManager = new UnionMonitorManager(
-                slobrokMonitorManager,
-                healthMonitorManager,
-                configserverConfig);
+        DuperModel duperModel = new DuperModel(configserverConfig);
+        UnionMonitorManager monitorManager =
+                new UnionMonitorManager(slobrokMonitorManager, healthMonitorManager);
 
         SuperModelListenerImpl superModelListener = new SuperModelListenerImpl(
                 monitorManager,
                 metrics,
-                new ModelGenerator(toConfigServerList(configserverConfig)),
+                duperModel,
+                new ModelGenerator(),
                 zone);
         superModelListener.start(superModelProvider);
         serviceModelCache = new ServiceModelCache(superModelListener, timer);
     }
 
-    private List<String> toConfigServerList(ConfigserverConfig configserverConfig) {
-        return configserverConfig.zookeeperserver().stream()
-                .map(ConfigserverConfig.Zookeeperserver::hostname)
-                .collect(Collectors.toList());
-    }
-
     @Override
     public Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances() {
         return serviceModelCache.get().getAllApplicationInstances();