From 157682c3c41644855e5ea0eae6d6c1dcbc0d4783 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 1 Nov 2018 15:01:19 +0100 Subject: Create new yamas check for configserver .. using curl to new endpoint /yamas-metrics --- .../vespa/hosted/node/admin/maintenance/StorageMaintainer.java | 7 +++++++ .../vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java | 4 ++-- 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" + -- cgit v1.2.3