diff options
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2.java | 6 | ||||
-rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ExampleModel.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2.java index 39a59826cf0..b463a50089a 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2.java @@ -17,10 +17,12 @@ import com.yahoo.vespa.applicationmodel.ServiceType; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.logging.Logger; public class SlobrokMonitor2 implements AutoCloseable { + public static final String SLOBROK_SERVICE_TYPE = "slobrok"; public static final String SLOBROK_RPC_PORT_TAG = "rpc"; private static final Logger log = Logger.getLogger(SlobrokMonitor2.class.getName()); @@ -53,6 +55,10 @@ public class SlobrokMonitor2 implements AutoCloseable { for (ApplicationInfo application : superModel.getAllApplicationInfos()) { for (HostInfo host : application.getModel().getHosts()) { for (ServiceInfo service : host.getServices()) { + if (!Objects.equals(service.getServiceType(), SLOBROK_SERVICE_TYPE)) { + continue; + } + for (PortInfo port : service.getPorts()) { if (port.getTags().contains(SLOBROK_RPC_PORT_TAG)) { Spec spec = new Spec(host.getHostname(), port.getPort()); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ExampleModel.java index d9766d65d3f..771f139402e 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ExampleModel.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ExampleModel.java @@ -26,7 +26,7 @@ public class ExampleModel { static final String CLUSTER_ID = "cluster-id"; static final String SERVICE_NAME = "service-name"; - static final String SERVICE_TYPE = "service-type"; + static final String SERVICE_TYPE = SlobrokMonitor2.SLOBROK_SERVICE_TYPE; static final String CONFIG_ID = "config-id"; static final String TENANT = "tenant"; static final String APPLICATION_NAME = "application"; |