Merge pull request #7537 from vespa-engine/gjoranv/add-optional-metrics-handler

Create new yamas check for configserver

2 files changed, 14 insertions, 6 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index a849cef31ff..8b8294d530a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.node.admin.maintenance.coredump.CoredumpHandler;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneOffset;
@@ -36,6 +37,7 @@ import java.util.regex.Pattern;
 import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameMatches;
 import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.olderThan;
 import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck;
+import static com.yahoo.vespa.hosted.node.admin.util.SecretAgentCheckConfig.nodeTypeToRole;
 
 /**
  * @author freva
@@ -110,10 +112,16 @@ public class StorageMaintainer {
         if (context.nodeType() == NodeType.config || context.nodeType() == NodeType.controller) {
             // configserver
             Path configServerCheckPath = context.pathInNodeUnderVespaHome("libexec/yms/yms_check_ymonsb2");
-            configs.add(new SecretAgentCheckConfig(SecretAgentCheckConfig.nodeTypeToRole(context.nodeType()), 60, configServerCheckPath,
+            configs.add(new SecretAgentCheckConfig(nodeTypeToRole(context.nodeType()), 60, configServerCheckPath,
                     "-zero", "configserver")
                     .withTags(tags));
 
+            // configserver-new
+            Path configServerNewCheckPath = Paths.get("curl");
+            configs.add(new SecretAgentCheckConfig(nodeTypeToRole(context.nodeType())+"-new", 60, configServerNewCheckPath,
+                                                   "-s", "localhost:19071/yamas-metrics")
+                                .withTags(tags));
+
             //zkbackupage
             Path zkbackupCheckPath = context.pathInNodeUnderVespaHome("libexec/yamas2/yms_check_file_age.py");
             configs.add(new SecretAgentCheckConfig("zkbackupage", 300, zkbackupCheckPath,
@@ -151,7 +159,7 @@ public class StorageMaintainer {
     private Map<String, Object> generateTags(NodeAgentContext context, NodeSpec node) {
         Map<String, String> tags = new LinkedHashMap<>();
         tags.put("namespace", "Vespa");
-        tags.put("role", SecretAgentCheckConfig.nodeTypeToRole(node.getNodeType()));
+        tags.put("role", nodeTypeToRole(node.getNodeType()));
         tags.put("zone", String.format("%s.%s", context.zoneId().environment().value(), context.zoneId().regionName().value()));
         node.getVespaVersion().ifPresent(version -> tags.put("vespaVersion", version));
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
index d276bad9521..cf5d29d70f1 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
@@ -117,8 +117,8 @@ public class StorageMaintainerTest {
         public void configserver() {
             Path path = executeAs(NodeType.config);
 
-            assertChecks(path, "athenz-certificate-expiry", "configserver", "host-life", "ntp",
-                    "system-coredumps-processing", "zkbackupage");
+            assertChecks(path, "athenz-certificate-expiry", "configserver", "configserver-new",
+                         "host-life", "ntp", "system-coredumps-processing", "zkbackupage");
 
             assertCheckEnds(path.resolve("configserver.yaml"),
                     "  tags:\n" +
@@ -132,8 +132,8 @@ public class StorageMaintainerTest {
         public void controller() {
             Path path = executeAs(NodeType.controller);
 
-            assertChecks(path, "athenz-certificate-expiry", "controller", "host-life", "ntp",
-                    "system-coredumps-processing", "vespa", "vespa-health", "zkbackupage");
+            assertChecks(path, "athenz-certificate-expiry", "controller", "controller-new", "host-life",
+                         "ntp", "system-coredumps-processing", "vespa", "vespa-health", "zkbackupage");
 
 
             // Do not set namespace for vespa metrics. WHY?