From 1921322a0b816a3a58a566848384dccb72ffd16f Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Mon, 26 Feb 2018 16:59:57 +0100 Subject: Support reporting UP for node admin outside zone app If the nodeAdminInContainer ConfigserverConfig has been set, with this PR, the service monitor will always report the node admin container service as UP, thereby avoiding issues related to standalone node admin seemingly being down when not running as part of the application. This postpones checking /status/v1/health for later. --- .../src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java | 4 ++++ .../src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java | 3 +++ 2 files changed, 7 insertions(+) (limited to 'application-model') diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java index da5ea7f975d..7648432dc11 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java @@ -9,6 +9,10 @@ import java.util.Objects; * @author bjorncs */ public class ClusterId { + // Common cluster IDs + public static final ClusterId ADMIN = new ClusterId("admin"); + public static final ClusterId NODE_ADMIN = new ClusterId("node-admin"); + public static final ClusterId ROUTING = new ClusterId("routing"); private final String id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java index 784ff9d1e38..0054264d42f 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java @@ -9,6 +9,9 @@ import java.util.Objects; * @author bjorncs */ public class ServiceType { + // Common service types. + public static final ServiceType CONTAINER = new ServiceType("container"); + public static final ServiceType SLOBROK = new ServiceType("slobrok"); private final String id; -- cgit v1.2.3