diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2019-01-10 14:57:41 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2019-01-10 15:08:10 +0100 |
| commit | 0d47ae31a5a7517da36438dad1814b822819696c (patch) | |
| tree | 58780ce59f8b14a02aec7ddb1a4aaee9fdb2ce1e /node-admin | |
| parent | dae4281d6f6d2c3eece000d052788e147c9f7580 (diff) | |
Remove NTP check
Diffstat (limited to 'node-admin')
2 files changed, 6 insertions, 10 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 0cd50a649b1..1293c558569 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 @@ -72,10 +72,6 @@ public class StorageMaintainer { Path hostLifeCheckPath = context.pathInNodeUnderVespaHome("libexec/yms/yms_check_host_life"); configs.add(new SecretAgentCheckConfig("host-life", 60, hostLifeCheckPath).withTags(tags)); - // ntp - Path ntpCheckPath = context.pathInNodeUnderVespaHome("libexec/yms/yms_check_ntp"); - configs.add(new SecretAgentCheckConfig("ntp", 60, ntpCheckPath).withTags(tags)); - // coredumps (except for the done coredumps which is handled by the host) Path coredumpCheckPath = context.pathInNodeUnderVespaHome("libexec/yms/yms_check_coredumps"); configs.add(new SecretAgentCheckConfig("system-coredumps-processing", 300, coredumpCheckPath, 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 05b9c413594..4c753e5a95d 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 @@ -53,7 +53,7 @@ public class StorageMaintainerTest { public void tenant() { Path path = executeAs(NodeType.tenant); - assertChecks(path, "athenz-certificate-expiry", "host-life", "ntp", + assertChecks(path, "athenz-certificate-expiry", "host-life", "system-coredumps-processing", "vespa", "vespa-health"); // All dimensions for vespa metrics should be set by metricsproxy @@ -62,7 +62,7 @@ public class StorageMaintainerTest { " - all\n"); // For non vespa metrics, we need to set all the dimensions ourselves - assertCheckEnds(path.resolve("ntp.yaml"), + assertCheckEnds(path.resolve("host-life.yaml"), "tags:\n" + " namespace: Vespa\n" + " role: tenants\n" + @@ -85,7 +85,7 @@ public class StorageMaintainerTest { public void proxy() { Path path = executeAs(NodeType.proxy); - assertChecks(path, "athenz-certificate-expiry", "host-life", "ntp", "routing-configage", + assertChecks(path, "athenz-certificate-expiry", "host-life", "routing-configage", "ssl-status", "system-coredumps-processing", "vespa", "vespa-health"); // All dimensions for vespa metrics should be set by the source @@ -94,7 +94,7 @@ public class StorageMaintainerTest { " - all\n"); // For non vespa metrics, we need to set all the dimensions ourselves - assertCheckEnds(path.resolve("ntp.yaml"), + assertCheckEnds(path.resolve("host-life.yaml"), "tags:\n" + " namespace: Vespa\n" + " role: routing\n" + @@ -118,7 +118,7 @@ public class StorageMaintainerTest { Path path = executeAs(NodeType.config); assertChecks(path, "athenz-certificate-expiry", "configserver", "host-life", - "ntp", "system-coredumps-processing", "zkbackupage"); + "system-coredumps-processing", "zkbackupage"); assertCheckEnds(path.resolve("configserver.yaml"), " tags:\n" + @@ -132,7 +132,7 @@ public class StorageMaintainerTest { public void controller() { Path path = executeAs(NodeType.controller); - assertChecks(path, "athenz-certificate-expiry", "controller", "host-life", "ntp", + assertChecks(path, "athenz-certificate-expiry", "controller", "host-life", "system-coredumps-processing", "vespa", "vespa-health", "zkbackupage"); |