[service-monitor] Make it easier to add synthesized apps

18 files changed, 294 insertions, 216 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ApplicationInstanceGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ApplicationInstanceGenerator.java
new file mode 100644
index 00000000000..ec2702bcfaf
--- /dev/null
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ApplicationInstanceGenerator.java
@@ -0,0 +1,13 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.application;
+
+import com.yahoo.vespa.applicationmodel.ApplicationInstance;
+import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
+
+/**
+ * @author hakon
+ */
+public interface ApplicationInstanceGenerator {
+    /** Make an ApplicationInstance based on current service status. */
+    ApplicationInstance makeApplicationInstance(ServiceStatusProvider serviceStatusProvider);
+}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerAppGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerAppGenerator.java
new file mode 100644
index 00000000000..76ca59cf583
--- /dev/null
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerAppGenerator.java
@@ -0,0 +1,67 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.application;
+
+import com.yahoo.vespa.applicationmodel.ApplicationInstance;
+import com.yahoo.vespa.applicationmodel.ConfigId;
+import com.yahoo.vespa.applicationmodel.HostName;
+import com.yahoo.vespa.applicationmodel.ServiceCluster;
+import com.yahoo.vespa.applicationmodel.ServiceInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Class for generating an ApplicationInstance for the synthesized config server application.
+ *
+ * @author hakon
+ */
+public class ConfigServerAppGenerator implements ApplicationInstanceGenerator {
+    private final List<String> hostnames;
+
+    public ConfigServerAppGenerator(List<String> hostnames) {
+        this.hostnames = hostnames;
+    }
+
+    @Override
+    public ApplicationInstance makeApplicationInstance(ServiceStatusProvider statusProvider) {
+        Set<ServiceInstance> serviceInstances = hostnames.stream()
+                .map(hostname -> makeServiceInstance(hostname, statusProvider))
+                .collect(Collectors.toSet());
+
+        ServiceCluster serviceCluster = new ServiceCluster(
+                ConfigServerApplication.CLUSTER_ID,
+                ConfigServerApplication.SERVICE_TYPE,
+                serviceInstances);
+
+        Set<ServiceCluster> serviceClusters = new HashSet<>();
+        serviceClusters.add(serviceCluster);
+
+        ApplicationInstance applicationInstance = new ApplicationInstance(
+                ConfigServerApplication.TENANT_ID,
+                ConfigServerApplication.APPLICATION_INSTANCE_ID,
+                serviceClusters);
+
+        // Fill back-references
+        serviceCluster.setApplicationInstance(applicationInstance);
+        for (ServiceInstance serviceInstance : serviceCluster.serviceInstances()) {
+            serviceInstance.setServiceCluster(serviceCluster);
+        }
+
+        return applicationInstance;
+    }
+
+    private ServiceInstance makeServiceInstance(String hostname, ServiceStatusProvider statusProvider) {
+        ConfigId configId = new ConfigId(ConfigServerApplication.CONFIG_ID_PREFIX + hostname);
+        ServiceStatus status = statusProvider.getStatus(
+                ConfigServerApplication.CONFIG_SERVER_APPLICATION.getApplicationId(),
+                ConfigServerApplication.CLUSTER_ID,
+                ConfigServerApplication.SERVICE_TYPE,
+                configId);
+
+        return new ServiceInstance(configId, new HostName(hostname), status);
+    }
+}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
index 120a12609e1..132bb0927b8 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
@@ -3,22 +3,11 @@ package com.yahoo.vespa.service.monitor.application;
 
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceId;
 import com.yahoo.vespa.applicationmodel.ClusterId;
-import com.yahoo.vespa.applicationmodel.ConfigId;
-import com.yahoo.vespa.applicationmodel.HostName;
-import com.yahoo.vespa.applicationmodel.ServiceCluster;
-import com.yahoo.vespa.applicationmodel.ServiceInstance;
-import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
 import com.yahoo.vespa.applicationmodel.TenantId;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 /**
  * A service/application model of the config server with health status.
  */
@@ -36,34 +25,4 @@ public class ConfigServerApplication extends HostedVespaApplication {
         super("zone-config-servers", NodeType.config,
                 ClusterSpec.Type.admin, ClusterSpec.Id.from("zone-config-servers"));
     }
-
-    public ApplicationInstance toApplicationInstance(List<String> hostnames) {
-        Set<ServiceInstance> serviceInstances = hostnames.stream()
-                .map(hostname -> new ServiceInstance(
-                        new ConfigId(CONFIG_ID_PREFIX + hostname),
-                        new HostName(hostname),
-                        ServiceStatus.NOT_CHECKED))
-                .collect(Collectors.toSet());
-
-        ServiceCluster serviceCluster = new ServiceCluster(
-                CLUSTER_ID,
-                SERVICE_TYPE,
-                serviceInstances);
-
-        Set<ServiceCluster> serviceClusters =
-                Stream.of(serviceCluster).collect(Collectors.toSet());
-
-        ApplicationInstance applicationInstance = new ApplicationInstance(
-                TENANT_ID,
-                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/application/DeployedAppGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/DeployedAppGenerator.java
new file mode 100644
index 00000000000..2691a8bf1ee
--- /dev/null
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/DeployedAppGenerator.java
@@ -0,0 +1,127 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.application;
+
+import com.yahoo.config.model.api.ApplicationInfo;
+import com.yahoo.config.model.api.HostInfo;
+import com.yahoo.config.model.api.ServiceInfo;
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.Zone;
+import com.yahoo.vespa.applicationmodel.ApplicationInstance;
+import com.yahoo.vespa.applicationmodel.ApplicationInstanceId;
+import com.yahoo.vespa.applicationmodel.ClusterId;
+import com.yahoo.vespa.applicationmodel.ConfigId;
+import com.yahoo.vespa.applicationmodel.HostName;
+import com.yahoo.vespa.applicationmodel.ServiceCluster;
+import com.yahoo.vespa.applicationmodel.ServiceClusterKey;
+import com.yahoo.vespa.applicationmodel.ServiceInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceType;
+import com.yahoo.vespa.applicationmodel.TenantId;
+import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Class to generate an ApplicationInstance given service status for a standard (deployed) application.
+ *
+ * @author hakon
+ */
+public class DeployedAppGenerator implements ApplicationInstanceGenerator {
+    public static final String CLUSTER_ID_PROPERTY_NAME = "clustername";
+
+    private final ApplicationInfo applicationInfo;
+    private final Zone zone;
+
+    public DeployedAppGenerator(ApplicationInfo applicationInfo, Zone zone) {
+        this.applicationInfo = applicationInfo;
+        this.zone = zone;
+    }
+
+    @Override
+    public ApplicationInstance makeApplicationInstance(ServiceStatusProvider serviceStatusProvider) {
+        Map<ServiceClusterKey, Set<ServiceInstance>> groupedServiceInstances = new HashMap<>();
+
+        for (HostInfo host : applicationInfo.getModel().getHosts()) {
+            HostName hostName = new HostName(host.getHostname());
+            for (ServiceInfo serviceInfo : host.getServices()) {
+                ServiceClusterKey serviceClusterKey = toServiceClusterKey(serviceInfo);
+                ServiceInstance serviceInstance =
+                        toServiceInstance(
+                                applicationInfo.getApplicationId(),
+                                serviceClusterKey.clusterId(),
+                                serviceInfo,
+                                hostName,
+                                serviceStatusProvider);
+
+                if (!groupedServiceInstances.containsKey(serviceClusterKey)) {
+                    groupedServiceInstances.put(serviceClusterKey, new HashSet<>());
+                }
+                groupedServiceInstances.get(serviceClusterKey).add(serviceInstance);
+            }
+        }
+
+        Set<ServiceCluster> serviceClusters = groupedServiceInstances.entrySet().stream()
+                .map(entry -> new ServiceCluster(
+                        entry.getKey().clusterId(),
+                        entry.getKey().serviceType(),
+                        entry.getValue()))
+                .collect(Collectors.toSet());
+
+        ApplicationInstance applicationInstance = new ApplicationInstance(
+                new TenantId(applicationInfo.getApplicationId().tenant().toString()),
+                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;
+    }
+
+    static ClusterId getClusterId(ServiceInfo serviceInfo) {
+        return new ClusterId(serviceInfo.getProperty(CLUSTER_ID_PROPERTY_NAME).orElse(""));
+    }
+
+    private ServiceClusterKey toServiceClusterKey(ServiceInfo serviceInfo) {
+        ClusterId clusterId = getClusterId(serviceInfo);
+        ServiceType serviceType = toServiceType(serviceInfo);
+        return new ServiceClusterKey(clusterId, serviceType);
+    }
+
+    private ServiceInstance toServiceInstance(
+            ApplicationId applicationId,
+            ClusterId clusterId,
+            ServiceInfo serviceInfo,
+            HostName hostName,
+            ServiceStatusProvider serviceStatusProvider) {
+        ConfigId configId = new ConfigId(serviceInfo.getConfigId());
+
+        ServiceStatus status = serviceStatusProvider.getStatus(
+                applicationId,
+                clusterId,
+                toServiceType(serviceInfo), configId);
+
+        return new ServiceInstance(configId, hostName, status);
+    }
+
+    private ApplicationInstanceId toApplicationInstanceId(ApplicationInfo applicationInfo, Zone zone) {
+        return new ApplicationInstanceId(String.format("%s:%s:%s:%s",
+                applicationInfo.getApplicationId().application().value(),
+                zone.environment().value(),
+                zone.region().value(),
+                applicationInfo.getApplicationId().instance().value()));
+    }
+
+    private ServiceType toServiceType(ServiceInfo serviceInfo) {
+        return new ServiceType(serviceInfo.getServiceType());
+    }
+}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java
index c4952979518..9da449289a7 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java
@@ -1,33 +1,21 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.monitor.internal;
 
-import com.yahoo.config.model.api.ApplicationInfo;
-import com.yahoo.config.model.api.HostInfo;
-import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.model.api.SuperModel;
-import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
-import com.yahoo.vespa.applicationmodel.ApplicationInstanceId;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
-import com.yahoo.vespa.applicationmodel.ClusterId;
-import com.yahoo.vespa.applicationmodel.ConfigId;
-import com.yahoo.vespa.applicationmodel.HostName;
-import com.yahoo.vespa.applicationmodel.ServiceCluster;
-import com.yahoo.vespa.applicationmodel.ServiceClusterKey;
-import com.yahoo.vespa.applicationmodel.ServiceInstance;
-import com.yahoo.vespa.applicationmodel.ServiceStatus;
-import com.yahoo.vespa.applicationmodel.ServiceType;
-import com.yahoo.vespa.applicationmodel.TenantId;
 import com.yahoo.vespa.service.monitor.ServiceModel;
 import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
-import com.yahoo.vespa.service.monitor.application.ConfigServerApplication;
+import com.yahoo.vespa.service.monitor.application.ApplicationInstanceGenerator;
+import com.yahoo.vespa.service.monitor.application.ConfigServerAppGenerator;
+import com.yahoo.vespa.service.monitor.application.DeployedAppGenerator;
 
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +24,16 @@ import java.util.stream.Collectors;
 public class ModelGenerator {
     public static final String CLUSTER_ID_PROPERTY_NAME = "clustername";
 
+    private final List<ApplicationInstanceGenerator> staticGenerators;
+
+    public ModelGenerator(List<String> configServerHosts) {
+        if (configServerHosts.isEmpty()) {
+            staticGenerators = Collections.emptyList();
+        } else {
+            staticGenerators = Collections.singletonList(new ConfigServerAppGenerator(configServerHosts));
+        }
+    }
+
     /**
      * Create service model based primarily on super model.
      *
@@ -44,113 +42,15 @@ public class ModelGenerator {
     ServiceModel toServiceModel(
             SuperModel superModel,
             Zone zone,
-            List<String> configServerHosts,
             ServiceStatusProvider serviceStatusProvider) {
-        Map<ApplicationInstanceReference, ApplicationInstance> applicationInstances = new HashMap<>();
+        List<ApplicationInstanceGenerator> generators = new ArrayList<>(staticGenerators);
+        superModel.getAllApplicationInfos()
+                .forEach(info -> generators.add(new DeployedAppGenerator(info, zone)));
 
-        for (ApplicationInfo applicationInfo : superModel.getAllApplicationInfos()) {
-
-            ApplicationInstance applicationInstance = toApplicationInstance(
-                    applicationInfo,
-                    zone,
-                    serviceStatusProvider);
-            applicationInstances.put(applicationInstance.reference(), applicationInstance);
-        }
-
-        // The config server is part of the service model (but not super model)
-        if (!configServerHosts.isEmpty()) {
-            ConfigServerApplication configServerApplication = ConfigServerApplication.CONFIG_SERVER_APPLICATION;
-            ApplicationInstance configServerApplicationInstance =
-                    configServerApplication.toApplicationInstance(configServerHosts);
-            applicationInstances.put(configServerApplicationInstance.reference(), configServerApplicationInstance);
-        }
+        Map<ApplicationInstanceReference, ApplicationInstance> applicationInstances = generators.stream()
+                .map(generator -> generator.makeApplicationInstance(serviceStatusProvider))
+                .collect(Collectors.toMap(ApplicationInstance::reference, Function.identity()));
 
         return new ServiceModel(applicationInstances);
     }
-
-    ApplicationInstance toApplicationInstance(
-            ApplicationInfo applicationInfo,
-            Zone zone,
-            ServiceStatusProvider serviceStatusProvider) {
-        Map<ServiceClusterKey, Set<ServiceInstance>> groupedServiceInstances = new HashMap<>();
-
-        for (HostInfo host : applicationInfo.getModel().getHosts()) {
-            HostName hostName = new HostName(host.getHostname());
-            for (ServiceInfo serviceInfo : host.getServices()) {
-                ServiceClusterKey serviceClusterKey = toServiceClusterKey(serviceInfo);
-                ServiceInstance serviceInstance =
-                        toServiceInstance(
-                                applicationInfo.getApplicationId(),
-                                serviceClusterKey.clusterId(),
-                                serviceInfo,
-                                hostName,
-                                serviceStatusProvider);
-
-                if (!groupedServiceInstances.containsKey(serviceClusterKey)) {
-                    groupedServiceInstances.put(serviceClusterKey, new HashSet<>());
-                }
-                groupedServiceInstances.get(serviceClusterKey).add(serviceInstance);
-            }
-        }
-
-        Set<ServiceCluster> serviceClusters = groupedServiceInstances.entrySet().stream()
-                .map(entry -> new ServiceCluster(
-                        entry.getKey().clusterId(),
-                        entry.getKey().serviceType(),
-                        entry.getValue()))
-                .collect(Collectors.toSet());
-
-        ApplicationInstance applicationInstance = new ApplicationInstance(
-                new TenantId(applicationInfo.getApplicationId().tenant().toString()),
-                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;
-    }
-
-    static ClusterId getClusterId(ServiceInfo serviceInfo) {
-        return new ClusterId(serviceInfo.getProperty(CLUSTER_ID_PROPERTY_NAME).orElse(""));
-    }
-
-    private ServiceClusterKey toServiceClusterKey(ServiceInfo serviceInfo) {
-        ClusterId clusterId = getClusterId(serviceInfo);
-        ServiceType serviceType = toServiceType(serviceInfo);
-        return new ServiceClusterKey(clusterId, serviceType);
-    }
-
-    private ServiceInstance toServiceInstance(
-            ApplicationId applicationId,
-            ClusterId clusterId,
-            ServiceInfo serviceInfo,
-            HostName hostName,
-            ServiceStatusProvider serviceStatusProvider) {
-        ConfigId configId = new ConfigId(serviceInfo.getConfigId());
-
-        ServiceStatus status = serviceStatusProvider.getStatus(
-                applicationId,
-                clusterId,
-                toServiceType(serviceInfo), configId);
-
-        return new ServiceInstance(configId, hostName, status);
-    }
-
-    private ApplicationInstanceId toApplicationInstanceId(ApplicationInfo applicationInfo, Zone zone) {
-        return new ApplicationInstanceId(String.format("%s:%s:%s:%s",
-                applicationInfo.getApplicationId().application().value(),
-                zone.environment().value(),
-                zone.region().value(),
-                applicationInfo.getApplicationId().instance().value()));
-    }
-
-    private ServiceType toServiceType(ServiceInfo serviceInfo) {
-        return new ServiceType(serviceInfo.getServiceType());
-    }
 }
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 b2b6538fe6c..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
@@ -11,6 +11,8 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.service.monitor.ServiceModel;
 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;
@@ -28,7 +30,6 @@ public class ServiceMonitorImpl implements ServiceMonitor {
                               Metric metric,
                               Timer timer) {
         Zone zone = superModelProvider.getZone();
-        List<String> configServerHosts = toConfigServerList(configserverConfig);
         ServiceMonitorMetrics metrics = new ServiceMonitorMetrics(metric, timer);
 
         UnionMonitorManager monitorManager = new UnionMonitorManager(
@@ -39,9 +40,8 @@ public class ServiceMonitorImpl implements ServiceMonitor {
         SuperModelListenerImpl superModelListener = new SuperModelListenerImpl(
                 monitorManager,
                 metrics,
-                new ModelGenerator(),
-                zone,
-                configServerHosts);
+                new ModelGenerator(toConfigServerList(configserverConfig)),
+                zone);
         superModelListener.start(superModelProvider);
         serviceModelCache = new ServiceModelCache(superModelListener, timer);
     }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java
index 5e309d3c18d..b2f3617131b 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.service.monitor.ServiceModel;
 
-import java.util.List;
 import java.util.function.Supplier;
 import java.util.logging.Logger;
 
@@ -19,24 +18,21 @@ public class SuperModelListenerImpl implements SuperModelListener, Supplier<Serv
     private final ServiceMonitorMetrics metrics;
     private final ModelGenerator modelGenerator;
     private final Zone zone;
-    private final List<String> configServerHosts;
 
-    // superModel and slobrokMonitorManager are always updated together
+    // superModel and monitorManager are always updated together
     // and atomically using this monitor.
     private final Object monitor = new Object();
-    private final MonitorManager slobrokMonitorManager;
+    private final MonitorManager monitorManager;
     private SuperModel superModel;
 
-    SuperModelListenerImpl(MonitorManager slobrokMonitorManager,
+    SuperModelListenerImpl(MonitorManager monitorManager,
                            ServiceMonitorMetrics metrics,
                            ModelGenerator modelGenerator,
-                           Zone zone,
-                           List<String> configServerHosts) {
-        this.slobrokMonitorManager = slobrokMonitorManager;
+                           Zone zone) {
+        this.monitorManager = monitorManager;
         this.metrics = metrics;
         this.modelGenerator = modelGenerator;
         this.zone = zone;
-        this.configServerHosts = configServerHosts;
     }
 
     void start(SuperModelProvider superModelProvider) {
@@ -46,7 +42,7 @@ public class SuperModelListenerImpl implements SuperModelListener, Supplier<Serv
             // asynchronously even before snapshot() returns.
             this.superModel = superModelProvider.snapshot(this);
             superModel.getAllApplicationInfos().stream().forEach(application ->
-                    slobrokMonitorManager.applicationActivated(superModel, application));
+                    monitorManager.applicationActivated(superModel, application));
         }
     }
 
@@ -54,7 +50,7 @@ public class SuperModelListenerImpl implements SuperModelListener, Supplier<Serv
     public void applicationActivated(SuperModel superModel, ApplicationInfo application) {
         synchronized (monitor) {
             this.superModel = superModel;
-            slobrokMonitorManager.applicationActivated(superModel, application);
+            monitorManager.applicationActivated(superModel, application);
         }
     }
 
@@ -62,7 +58,7 @@ public class SuperModelListenerImpl implements SuperModelListener, Supplier<Serv
     public void applicationRemoved(SuperModel superModel, ApplicationId id) {
         synchronized (monitor) {
             this.superModel = superModel;
-            slobrokMonitorManager.applicationRemoved(superModel, id);
+            monitorManager.applicationRemoved(superModel, id);
         }
     }
 
@@ -75,11 +71,7 @@ public class SuperModelListenerImpl implements SuperModelListener, Supplier<Serv
             dummy(measurement);
 
             // WARNING: The slobrok monitor manager may be out-of-sync with super model (no locking)
-            return modelGenerator.toServiceModel(
-                    superModel,
-                    zone,
-                    configServerHosts,
-                    slobrokMonitorManager);
+            return modelGenerator.toServiceModel(superModel, zone, monitorManager);
         }
     }
 
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManager.java
index e224d6bfd12..82d2043bd17 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManager.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManager.java
@@ -9,7 +9,10 @@ import com.yahoo.vespa.applicationmodel.ClusterId;
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
+import com.yahoo.vespa.service.monitor.application.ConfigServerApplication;
 import com.yahoo.vespa.service.monitor.application.ZoneApplication;
+import com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager;
+import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl;
 
 /**
  * @author hakon
@@ -32,6 +35,12 @@ public class UnionMonitorManager implements MonitorManager {
                                    ClusterId clusterId,
                                    ServiceType serviceType,
                                    ConfigId configId) {
+
+        if (applicationId.equals(ConfigServerApplication.CONFIG_SERVER_APPLICATION.getApplicationId())) {
+            // todo: use health
+            return ServiceStatus.NOT_CHECKED;
+        }
+
         MonitorManager monitorManager = useHealth(applicationId, clusterId, serviceType) ?
                 healthMonitorManager :
                 slobrokMonitorManager;
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/HealthMonitorManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/health/HealthMonitorManager.java
index 072886098d7..5a4b7251ae2 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/HealthMonitorManager.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/health/HealthMonitorManager.java
@@ -1,5 +1,5 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.service.monitor.internal;
+package com.yahoo.vespa.service.monitor.internal.health;
 
 import com.google.inject.Inject;
 import com.yahoo.config.model.api.ApplicationInfo;
@@ -10,6 +10,7 @@ import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
 import com.yahoo.vespa.service.monitor.application.ZoneApplication;
+import com.yahoo.vespa.service.monitor.internal.MonitorManager;
 
 /**
  * @author hakon
@@ -27,7 +28,10 @@ public class HealthMonitorManager implements MonitorManager {
     }
 
     @Override
-    public ServiceStatus getStatus(ApplicationId applicationId, ClusterId clusterId, ServiceType serviceType, ConfigId configId) {
+    public ServiceStatus getStatus(ApplicationId applicationId,
+                                   ClusterId clusterId,
+                                   ServiceType serviceType,
+                                   ConfigId configId) {
         // TODO: Do proper health check
         if (ZoneApplication.isNodeAdminService(applicationId, clusterId, serviceType)) {
             return ServiceStatus.UP;
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitor.java
index e0195e11759..a857be84cc7 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitor.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitor.java
@@ -1,5 +1,5 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.service.monitor.internal;
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.internal.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.HostInfo;
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorManagerImpl.java
index 81173f9d835..aaaab22e742 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorManagerImpl.java
@@ -1,5 +1,5 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.service.monitor.internal;
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.internal.slobrok;
 
 import com.google.inject.Inject;
 import com.yahoo.config.model.api.ApplicationInfo;
@@ -13,6 +13,7 @@ import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
 import com.yahoo.vespa.service.monitor.SlobrokApi;
+import com.yahoo.vespa.service.monitor.internal.MonitorManager;
 
 import java.util.HashMap;
 import java.util.List;
@@ -75,7 +76,8 @@ public class SlobrokMonitorManagerImpl implements SuperModelListener, SlobrokApi
 
     @Override
     public ServiceStatus getStatus(ApplicationId applicationId,
-                                   ClusterId clusterId, ServiceType serviceType,
+                                   ClusterId clusterId,
+                                   ServiceType serviceType,
                                    ConfigId configId) {
         Optional<String> slobrokServiceName = findSlobrokServiceName(serviceType, configId);
         if (slobrokServiceName.isPresent()) {
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplicationTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/application/ConfigServerAppGeneratorTest.java
index 7fa6f82e183..58f99786017 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplicationTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/application/ConfigServerAppGeneratorTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.service.monitor.application;
 
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
 import org.junit.Test;
 
 import java.util.List;
@@ -11,8 +12,11 @@ import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-public class ConfigServerApplicationTest {
+public class ConfigServerAppGeneratorTest {
     private static final String configServer1 = "cfg1.yahoo.com";
     private static final String configServer2 = "cfg2.yahoo.com";
     private static final String configServer3 = "cfg3.yahoo.com";
@@ -21,11 +25,13 @@ public class ConfigServerApplicationTest {
             configServer2,
             configServer3).collect(Collectors.toList());
 
+    private final ServiceStatusProvider statusProvider = mock(ServiceStatusProvider.class);
+
     @Test
     public void toApplicationInstance() throws Exception {
-        ConfigServerApplication application = ConfigServerApplication.CONFIG_SERVER_APPLICATION;
-        ApplicationInstance applicationInstance =
-                application.toApplicationInstance(configServerList);
+        when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(ServiceStatus.NOT_CHECKED);
+        ApplicationInstance applicationInstance = new ConfigServerAppGenerator(configServerList)
+                .makeApplicationInstance(statusProvider);
 
         assertEquals(
                 ConfigServerApplication.APPLICATION_INSTANCE_ID,
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java
index fca1512e3ea..186b22cf4ec 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java
@@ -10,6 +10,7 @@ import com.yahoo.config.model.api.SuperModel;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,13 +52,13 @@ public class ExampleModel {
         return new SuperModel(applicationInfos);
     }
 
-    static ApplicationBuilder createApplication(String tenant,
-                                                String applicationName) {
+    public static ApplicationBuilder createApplication(String tenant,
+                                                       String applicationName) {
         return new ApplicationBuilder(tenant, applicationName);
     }
 
 
-    static class ApplicationBuilder {
+    public static class ApplicationBuilder {
         private final String tenant;
         private final String applicationName;
         private final List<ClusterBuilder> clusters = new ArrayList<>();
@@ -80,7 +81,7 @@ public class ExampleModel {
                     hosts);
         }
 
-        ApplicationInfo build() {
+        public ApplicationInfo build() {
             List<String> allHosts = clusters.stream()
                     .flatMap(clusterBuilder -> clusterBuilder.hosts.stream())
                     .distinct()
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java
index 6e9fc25382a..a21691ee4d0 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java
@@ -12,6 +12,7 @@ import com.yahoo.vespa.applicationmodel.ServiceInstance;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.service.monitor.ServiceModel;
 import com.yahoo.vespa.service.monitor.application.ConfigServerApplication;
+import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -37,12 +38,12 @@ public class ModelGeneratorTest {
     public void toApplicationModelWithConfigServerApplication() throws Exception {
         SuperModel superModel =
                 ExampleModel.createExampleSuperModelWithOneRpcPort(HOSTNAME, PORT);
-        ModelGenerator modelGenerator = new ModelGenerator();
-
-        Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION));
 
         List<String> configServerHosts = Stream.of("cfg1", "cfg2", "cfg3")
                 .collect(Collectors.toList());
+        ModelGenerator modelGenerator = new ModelGenerator(configServerHosts);
+
+        Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION));
 
         SlobrokMonitorManagerImpl slobrokMonitorManager = mock(SlobrokMonitorManagerImpl.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any(), any()))
@@ -52,7 +53,6 @@ public class ModelGeneratorTest {
                 modelGenerator.toServiceModel(
                         superModel,
                         zone,
-                        configServerHosts,
                         slobrokMonitorManager);
 
         Map<ApplicationInstanceReference,
@@ -82,12 +82,10 @@ public class ModelGeneratorTest {
     public void toApplicationModel() throws Exception {
         SuperModel superModel =
                 ExampleModel.createExampleSuperModelWithOneRpcPort(HOSTNAME, PORT);
-        ModelGenerator modelGenerator = new ModelGenerator();
+        ModelGenerator modelGenerator = new ModelGenerator(Collections.emptyList());
 
         Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION));
 
-        List<String> configServerHosts = Collections.emptyList();
-
         SlobrokMonitorManagerImpl slobrokMonitorManager = mock(SlobrokMonitorManagerImpl.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any(), any()))
                 .thenReturn(ServiceStatus.UP);
@@ -96,7 +94,6 @@ public class ModelGeneratorTest {
                 modelGenerator.toServiceModel(
                         superModel,
                         zone,
-                        configServerHosts,
                         slobrokMonitorManager);
 
         Map<ApplicationInstanceReference,
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImplTest.java
index 6233f39b9cf..83bad0ddb2a 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImplTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImplTest.java
@@ -6,9 +6,9 @@ import com.yahoo.config.model.api.SuperModel;
 import com.yahoo.config.model.api.SuperModelProvider;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.service.monitor.ServiceModel;
+import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -24,13 +24,11 @@ public class SuperModelListenerImplTest {
         ServiceMonitorMetrics metrics = mock(ServiceMonitorMetrics.class);
         ModelGenerator modelGenerator = mock(ModelGenerator.class);
         Zone zone = mock(Zone.class);
-        List<String> configServers = new ArrayList<>();
         SuperModelListenerImpl listener = new SuperModelListenerImpl(
                 slobrokMonitorManager,
                 metrics,
                 modelGenerator,
-                zone,
-                configServers);
+                zone);
 
         SuperModelProvider superModelProvider = mock(SuperModelProvider.class);
         SuperModel superModel = mock(SuperModel.class);
@@ -47,6 +45,6 @@ public class SuperModelListenerImplTest {
         verify(slobrokMonitorManager).applicationActivated(superModel, application2);
 
         ServiceModel serviceModel = listener.get();
-        verify(modelGenerator).toServiceModel(superModel, zone, configServers, slobrokMonitorManager);
+        verify(modelGenerator).toServiceModel(superModel, zone, slobrokMonitorManager);
     }
 }
\ No newline at end of file
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManagerTest.java
index e557f0451f4..b7c3ed8e1e1 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/UnionMonitorManagerTest.java
@@ -6,6 +6,8 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.applicationmodel.ClusterId;
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceType;
+import com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager;
+import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl;
 import org.junit.Test;
 
 import static com.yahoo.vespa.applicationmodel.ClusterId.NODE_ADMIN;
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorManagerImplTest.java
index ab50b3192e3..8e4443df83b 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImplTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorManagerImplTest.java
@@ -1,5 +1,5 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.service.monitor.internal;
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.internal.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.SuperModel;
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorTest.java
index 075647e9c16..5b230e81cf7 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/slobrok/SlobrokMonitorTest.java
@@ -1,9 +1,10 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.service.monitor.internal;
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.service.monitor.internal.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.api.SlobrokList;
+import com.yahoo.vespa.service.monitor.internal.ExampleModel;
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;