diff options
Diffstat (limited to 'service-monitor')
7 files changed, 13 insertions, 4 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/pom.xml b/service-monitor/pom.xml index 168af826b40..c6504ff9315 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>service-monitor</artifactId> <packaging>container-plugin</packaging> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <name>${project.artifactId}</name> <description>Service monitor component for hosted vespa.</description> 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); + } |