From: Alex Dehnert <alex@dehnerts.com>
Date: Mon, 4 Oct 2021 15:19:42 +0000 (-0400)
Subject: salt: Update Vault check to run elsewhere
X-Git-Url: https://dehnerts.com/gitweb/?a=commitdiff_plain;h=124ab06483a369acc113441acb6cc05f3b33775c;p=sysconfig%2Fnagios3.git

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 e34a7bd..3d68e32 100644
--- 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 0f53805..49c431b 100644
--- 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
 }