diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-05-29 13:44:11 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-05-29 13:44:11 +0200 |
commit | 0acfd8802ff99ab79d93ced7b59be61c47e25a86 (patch) | |
tree | c4ec1e359c35454652b9e9175df342a05fd032af /service-monitor | |
parent | c61bcf9b6c51a6445398babacd3ccc2a07931edb (diff) |
Add logserver container to slobrok monitor manager
Diffstat (limited to 'service-monitor')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java | 15 |
1 files changed, 6 insertions, 9 deletions
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 b3d66e4c957..e3ea48ca9fe 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 @@ -43,7 +43,7 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { @Override public void applicationActivated(ApplicationInfo application) { - if (!wouldMonitor(application.getApplicationId())) { + if (wouldNotMonitor(application.getApplicationId())) { return; } @@ -57,7 +57,7 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { @Override public void applicationRemoved(ApplicationId id) { - if (!wouldMonitor(id)) { + if (wouldNotMonitor(id)) { return; } @@ -89,7 +89,7 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { ClusterId clusterId, ServiceType serviceType, ConfigId configId) { - if (!wouldMonitor(applicationId)) { + if (wouldNotMonitor(applicationId)) { return new ServiceStatusInfo(ServiceStatus.NOT_CHECKED); } @@ -108,12 +108,8 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { } } - private boolean wouldMonitor(ApplicationId applicationId) { - if (duperModel.isSupportedInfraApplication(applicationId)) { - return false; - } - - return true; + private boolean wouldNotMonitor(ApplicationId applicationId) { + return duperModel.isSupportedInfraApplication(applicationId); } /** @@ -139,6 +135,7 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { case "qrserver": case "container": case "container-clustercontroller": + case "logserver-container": case "metricsproxy-container": return Optional.of("vespa/service/" + configId.s()); |