diff options
| author | gjoranv <gv@oath.com> | 2018-11-22 14:03:52 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-11-22 14:03:52 +0100 |
| commit | d3ad5b0b71de09b007d5539e2add84e279bc4118 (patch) | |
| tree | faf22f6e2c37422ae3e72c9de9994cdb029e7c46 /node-admin/src | |
| parent | 820f36a6882f45aa3e85dc4ed507a8cf0293da15 (diff) | |
Replace old configserver/controller yamas checks.
- ymonsb2 is out, curl is in.
Diffstat (limited to 'node-admin/src')
2 files changed, 6 insertions, 11 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 9d9ec9bc9b3..6e3419813a7 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 @@ -113,15 +113,10 @@ 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(nodeTypeToRole(context.nodeType()), 60, configServerCheckPath, - "-zero", "configserver") - .withTags(tags)); - // configserver-new + // configserver/controller Path configServerNewCheckPath = Paths.get("/usr/bin/curl"); - configs.add(new SecretAgentCheckConfig(nodeTypeToRole(context.nodeType())+"-new", 60, configServerNewCheckPath, + configs.add(new SecretAgentCheckConfig(nodeTypeToRole(context.nodeType()), 60, configServerNewCheckPath, "-s", "localhost:19071/yamas-metrics") .withTags(tags)); 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 cf5d29d70f1..c8d5292889b 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", "configserver-new", - "host-life", "ntp", "system-coredumps-processing", "zkbackupage"); + assertChecks(path, "athenz-certificate-expiry", "configserver", "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", "controller-new", "host-life", - "ntp", "system-coredumps-processing", "vespa", "vespa-health", "zkbackupage"); + assertChecks(path, "athenz-certificate-expiry", "controller", "host-life", "ntp", + "system-coredumps-processing", "vespa", "vespa-health", "zkbackupage"); // Do not set namespace for vespa metrics. WHY? |