summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorJo Kristian Bergum <bergum@oath.com>2019-03-11 12:26:25 +0000
committerJo Kristian Bergum <bergum@oath.com>2019-03-11 12:26:25 +0000
commitbba91b36d90752cc70c2d78050c064cd8cb16b2c (patch)
tree60828dbf7f6508e0ca8f9fb20679d51792af9c22 /node-admin
parent48ce50681ad29a1a17446dbb1f0413615ca35725 (diff)
New configserver/controller logd check
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java6
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java4
2 files changed, 8 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 577b4c5eef0..620a0caed8d 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
@@ -122,6 +122,12 @@ public class StorageMaintainer {
"-m", "150",
"-a", "config-zkbackupage")
.withTags(tags));
+
+ String appName = nodeTypeToRole(context.nodeType()) + "-logd";
+ Path logdCheckPath = context.pathInNodeUnderVespaHome("libexec/yms/convert-state-metrics-2-yamas.py");
+ configs.add(new SecretAgentCheckConfig(appName, 60, logdCheckPath,
+ appName, "http://localhost:19089/state/v1/metrics")
+ .withTags(tags));
}
if (context.nodeType() == NodeType.proxy) {
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 85562a92af9..01e41cfe1a3 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
@@ -119,7 +119,7 @@ public class StorageMaintainerTest {
public void configserver() {
Path path = executeAs(NodeType.config);
- assertChecks(path, "athenz-certificate-expiry", "configserver", "host-life",
+ assertChecks(path, "athenz-certificate-expiry", "configserver", "configserver-logd", "host-life",
"system-coredumps-processing", "zkbackupage");
assertCheckEnds(path.resolve("configserver.yaml"),
@@ -134,7 +134,7 @@ public class StorageMaintainerTest {
public void controller() {
Path path = executeAs(NodeType.controller);
- assertChecks(path, "athenz-certificate-expiry", "controller", "host-life",
+ assertChecks(path, "athenz-certificate-expiry", "controller", "controller-logd", "host-life",
"system-coredumps-processing", "vespa", "vespa-health", "zkbackupage");