Create new yamas check for configserver

.. using curl to new endpoint /yamas-metrics

2 files changed, 9 insertions, 2 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 2c627e3f6e9..df7055d2dc6 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
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 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;
@@ -119,6 +120,12 @@ public class StorageMaintainer {
                     "-zero", "configserver")
                     .withTags(tags));
 
+            // configserver-new
+            Path configServerNewCheckPath = Paths.get("curl");
+            configs.add(new SecretAgentCheckConfig("configserver-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,
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 81a0c4a5e20..3595d126e23 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" +