Don't expect docprocservice as service type

4 files changed, 2 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index 11abe13712a..e059a673f41 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -141,7 +141,7 @@ public class IndexedTest extends ContentBaseTest {
         HostResource h = model.getHostSystem().getHosts().get(0);
         String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
                                       "logd", "configproxy","config-sentinel",
-                                      "qrserver", "fleetcontroller", "topleveldispatch", "docprocservice",
+                                      "qrserver", "fleetcontroller", "topleveldispatch",
                                       "storagenode", "searchnode", "distributor", "transactionlogserver"};
         // TODO DomContentBuilderTest.assertServices(h, expectedServices);
         Routing routing = model.getRouting();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
index 00f4d4be299..771a279e0ab 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
@@ -46,7 +46,6 @@ public class ConfigConvergenceChecker extends AbstractComponent {
     private final static Set<String> serviceTypesToCheck = new HashSet<>(Arrays.asList(
             "container",
             "qrserver",
-            "docprocservice",
             "searchnode",
             "storagenode",
             "distributor"
diff --git a/configutil/src/tests/model_inspect/model.cfg b/configutil/src/tests/model_inspect/model.cfg
index 4346ad78104..388bae2256d 100644
--- a/configutil/src/tests/model_inspect/model.cfg
+++ b/configutil/src/tests/model_inspect/model.cfg
@@ -128,7 +128,7 @@ hosts[0].services[12].ports[1].tags "fs4"
 hosts[0].services[12].ports[2].number 19110
 hosts[0].services[12].ports[2].tags "health json http"
 hosts[0].services[13].name "docprocservice"
-hosts[0].services[13].type "docprocservice"
+hosts[0].services[13].type "container"
 hosts[0].services[13].configid "docproc/cluster.music.indexing/0"
 hosts[0].services[13].clustertype ""
 hosts[0].services[13].clustername "music.indexing"
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
index 0f3a3cfbe68..4e47bf010d7 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
@@ -138,7 +138,6 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager {
 
             case "qrserver":
             case "container":
-            case "docprocservice":
             case "container-clustercontroller":
                 return Optional.of("vespa/service/" + configId.s());