salt: Update Vault check to run elsewhere

Also, make it run less frequently (we're looking for expiry more than downtime)
and have a higher timeout (it seems to frequently take more than ten seconds).

diff --git a/local.d/ssh-commands.cfg b/local.d/ssh-commands.cfg
index e34a7bdc31de8cd246b9f1c7f1891d74b4858199..3d68e32f717762fc25e563b362e00c8885aaf493 100644 (file)
--- a/local.d/ssh-commands.cfg
+++ b/local.d/ssh-commands.cfg
@@ -12,3 +12,8 @@ define command{
     command_name       check_byssh_generic
     command_line       /usr/lib/nagios/plugins/check_by_ssh -l nagios-ssh -H '$HOSTADDRESS$' -C '$ARG1$'
 }
+
+define command{
+    command_name       check_byssh_generic_slow
+    command_line       /usr/lib/nagios/plugins/check_by_ssh --timeout=30 -l nagios-ssh -H '$HOSTADDRESS$' -C '$ARG1$'
+}

diff --git a/local.d/wieliczka.cfg b/local.d/wieliczka.cfg
index 0f538052a5cd20807a8aa9ceb6bf215f607fb648..49c431bb15ce1d44bb2e752e543e74d1b713c1e9 100644 (file)
--- a/local.d/wieliczka.cfg
+++ b/local.d/wieliczka.cfg
@@ -11,9 +11,13 @@ define service {
     check_command       check_byssh_service!salt-master.service
 }
 
+# Run against a different machine so I don't need to run monitoring as root
+# on a highly trusted machine.
 define service {
-    use adehnert-service
-    host_name           wieliczka
+    # Check infrequently, because this is really for expiry checking
+    use adehnert-rare-service
+    host_name           bots
     service_description SALT-VAULT
-    check_command       check_byssh_generic!check_salt_vault
+    # Often takes more than 10 seconds to run
+    check_command       check_byssh_generic_slow!check_salt_vault
 }