summaryrefslogtreecommitdiffstats
path: root/service-monitor
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-12-04 11:51:58 -0800
committergjoranv <gv@oath.com>2019-01-21 15:09:29 +0100
commit0f63b23a4ea60b78ad97f1c19245023fb29545c0 (patch)
treef5652cf65362d9debf5d2ebfdc514d9886ce40e7 /service-monitor
parenta18658fca16b994786f1b60d50f9d2f5f2ceb679 (diff)
Nonfunctional changes only
Diffstat (limited to 'service-monitor')
-rw-r--r--service-monitor/README3
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/duper/ZoneApplication.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java3
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java1
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceStatusProvider.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokApi.java2
6 files changed, 11 insertions, 2 deletions
diff --git a/service-monitor/README b/service-monitor/README
index 4d69c8ef3be..26f94fb8026 100644
--- a/service-monitor/README
+++ b/service-monitor/README
@@ -1 +1,2 @@
-a service that gives a list of node/service and their status(up/down) for all instances in a zone
+A service which provides the up/down status of all service instances ("nodes in a cluster")
+in all applications in a system.
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ZoneApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ZoneApplication.java
index 70354c0f16d..bcf5f096e7f 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ZoneApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ZoneApplication.java
@@ -21,6 +21,7 @@ import java.util.Objects;
* 2) ZoneApplication has multiple clusters
*/
public class ZoneApplication {
+
private ZoneApplication() {}
private static final ApplicationId ZONE_APPLICATION_ID = InfraApplication
@@ -103,4 +104,5 @@ public class ZoneApplication {
ApplicationInstanceGenerator.getClusterId(serviceInfo),
ApplicationInstanceGenerator.toServiceType(serviceInfo));
}
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java
index a9071e3ab94..b62552188e1 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java
@@ -17,8 +17,8 @@ import java.util.stream.Collectors;
* also gives ServiceStatus on each service, and there may be
* artificial applications like the config server "application".
*/
-// @Immutable
public class ServiceModel {
+
private final Map<ApplicationInstanceReference, ApplicationInstance> applications;
public ServiceModel(Map<ApplicationInstanceReference, ApplicationInstance> applications) {
@@ -39,4 +39,5 @@ public class ServiceModel {
.flatMap(cluster -> cluster.serviceInstances().stream())
.collect(Collectors.groupingBy(ServiceInstance::hostName, Collectors.toList()));
}
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
index ab32af39580..5ed34673da5 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
@@ -21,4 +21,5 @@ public interface ServiceMonitor {
Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances();
ServiceModel getServiceModelSnapshot();
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceStatusProvider.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceStatusProvider.java
index 88c72a7d47a..30a20cf9980 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceStatusProvider.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceStatusProvider.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.applicationmodel.ServiceType;
* @author hakonhall
*/
public interface ServiceStatusProvider {
+
/**
* Get the {@link ServiceStatus} of a particular service.
*
@@ -22,4 +23,5 @@ public interface ServiceStatusProvider {
ClusterId clusterId,
ServiceType serviceType,
ConfigId configId);
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokApi.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokApi.java
index dff605b888d..b0f0d734fe4 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokApi.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokApi.java
@@ -7,9 +7,11 @@ import com.yahoo.jrt.slobrok.api.Mirror;
import java.util.List;
public interface SlobrokApi extends ServiceStatusProvider {
+
/**
* Get all Slobrok entries that has a name matching pattern as described in
* Mirror::lookup.
*/
List<Mirror.Entry> lookup(ApplicationId application, String pattern);
+
}