From 556817cbc10b8b4d5fe868d30daa0a11485fe3e6 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Thu, 30 Nov 2017 14:15:33 +0100
Subject: Remove unused ymonService property

---
 .../main/java/com/yahoo/vespa/model/AbstractService.java | 16 ----------------
 .../java/com/yahoo/vespa/model/admin/Configserver.java   |  1 -
 .../main/java/com/yahoo/vespa/model/admin/Logserver.java |  1 -
 .../main/java/com/yahoo/vespa/model/admin/Slobrok.java   |  1 -
 .../yahoo/vespa/model/clients/VespaSpoolerService.java   |  1 -
 .../java/com/yahoo/vespa/model/container/Container.java  |  1 -
 .../java/com/yahoo/vespa/model/content/ContentNode.java  |  2 --
 .../model/filedistribution/FileDistributorService.java   |  3 +--
 .../main/java/com/yahoo/vespa/model/search/Dispatch.java |  1 -
 .../java/com/yahoo/vespa/model/search/SearchNode.java    |  1 -
 10 files changed, 1 insertion(+), 27 deletions(-)

(limited to 'config-model/src')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index b4b89278c51..659d5b65a4c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -509,22 +509,6 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
         }
     }
 
-    /**
-     * Sets up this service to be included when generating monitoring config.
-     * The ymon service name used will be {@link #getServiceType()}
-     */
-    public void monitorService() {
-        monitorService(getServiceType());
-    }
-
-    /**
-     * Sets up this service to be included when generating ymon config.
-     * @param ymonServiceName the ymon service name to be used
-     */
-    public void monitorService(String ymonServiceName) {
-        setProp("ymonService", ymonServiceName);
-    }
-
     /**
      *
      * The service HTTP port for health status
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
index 942d563d850..e8f1f59310b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
@@ -35,7 +35,6 @@ public class Configserver extends AbstractService {
         portsMeta.on(1).tag("http").tag("config").tag("state");
         setProp("clustertype", "admin");
         setProp("clustername", "admin");
-        monitorService();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
index 28cf18802cf..8b98dc9d06a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
@@ -23,7 +23,6 @@ public class Logserver extends AbstractService {
         portsMeta.on(3).tag("logtp").tag("telnet").tag("replicator");
         setProp("clustertype", "admin");
         setProp("clustername", "admin");
-        monitorService();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index cefc08981a4..093694f41b3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -23,7 +23,6 @@ public class Slobrok extends AbstractService {
         setProp("index", index);
         setProp("clustertype", "slobrok");
         setProp("clustername", "admin");
-        monitorService();
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolerService.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolerService.java
index 4969132ccfb..f4287cf982e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolerService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolerService.java
@@ -19,7 +19,6 @@ public class VespaSpoolerService extends AbstractService implements SpoolerConfi
     public VespaSpoolerService(AbstractConfigProducer parent, int index, VespaSpooler spooler) {
         super(parent, "spooler." + index);
         this.spooler = spooler;
-        monitorService("spooler");
     }
 
     public int getPortCount() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 8991bfa6215..8ccc0b3e011 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -165,7 +165,6 @@ public class Container extends AbstractService implements
         }
 
         tagServers();
-        monitorService();
     }
 
     private void tagServers() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
index 7ef54360f00..4257e47218e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
@@ -50,8 +50,6 @@ public abstract class ContentNode extends AbstractService
         portsMeta.on(0).tag("messaging");
         portsMeta.on(1).tag("rpc").tag("status");
         portsMeta.on(2).tag("http").tag("status").tag("state");
-
-        monitorService();
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
index 7616b721be9..9129e951657 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.model.admin.FileDistributionOptions;
 import java.util.Collection;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class FileDistributorService extends AbstractService implements
         FiledistributorConfig.Producer,
@@ -49,7 +49,6 @@ public class FileDistributorService extends AbstractService implements
         this.fileDistributor = fileDistributor;
         this.fileDistributionOptions = fileDistributionOptions;
         this.sendAllFiles = sendAllFiles;
-        monitorService();
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
index c0867d252a3..789c5562d9c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
@@ -46,7 +46,6 @@ public class Dispatch extends AbstractService implements SearchInterface,
         setProp("clustertype", "search")
                 .setProp("clustername", dispatchGroup.getClusterName())
                 .setProp("index", nodeSpec.groupIndex());
-        monitorService();
     }
 
     public static Dispatch createTld(DispatchGroup dispatchGroup, AbstractConfigProducer parent, int rowId) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index c5f7272ee80..941d1fe1ff3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -112,7 +112,6 @@ public class SearchNode extends AbstractService implements
         portsMeta.on(UNUSED_3).tag("unused");
         portsMeta.on(HEALTH_PORT).tag("http").tag("json").tag("health").tag("state");
         // Properties are set in DomSearchBuilder
-        monitorService();
         this.tuning = tuning;
     }
 
-- 
cgit v1.2.3