Add some more checks on salt minions

Among other things, this fixes sysconfig/salt#16.

diff --git a/local.d/adehnert-host.cfg b/local.d/adehnert-host.cfg
index 8d27bc44d34132d4ad19ce7378ae4e0b43ee0219..b69cb44e70c0131dc8ca7fd34d0d3211e96473a1 100644 (file)
--- a/local.d/adehnert-host.cfg
+++ b/local.d/adehnert-host.cfg
@@ -43,9 +43,24 @@ define service {
        check_command           check_ssh
 }
 
+define service {
+    use adehnert-service
+    hostgroup_name      adehnert-minions
+    service_description SERVICES-ALL
+    check_command       check_byssh_generic!check_services_all
+}
+
 define service {
     use adehnert-service
     hostgroup_name      adehnert-minions
     service_description SALT
     check_command       check_byssh_service!salt-minion
 }
+
+define service {
+    use adehnert-service
+    hostgroup_name      adehnert-minions
+    #host_name           bots
+    service_description SIGN-SSH
+    check_command       check_byssh_service_failed!sign-ssh-keys
+}

diff --git a/local.d/ssh-commands.cfg b/local.d/ssh-commands.cfg
index f2f01e2254b08a9dd49ed6e137b20aceadd2a6d7..e34a7bdc31de8cd246b9f1c7f1891d74b4858199 100644 (file)
--- a/local.d/ssh-commands.cfg
+++ b/local.d/ssh-commands.cfg
@@ -2,3 +2,13 @@ define command{
     command_name       check_byssh_service
     command_line       /usr/lib/nagios/plugins/check_by_ssh -l nagios-ssh -H '$HOSTADDRESS$' -C 'check_service $ARG1$'
 }
+
+define command{
+    command_name       check_byssh_service_failed
+    command_line       /usr/lib/nagios/plugins/check_by_ssh -l nagios-ssh -H '$HOSTADDRESS$' -C 'check_service_failed $ARG1$'
+}
+
+define command{
+    command_name       check_byssh_generic
+    command_line       /usr/lib/nagios/plugins/check_by_ssh -l nagios-ssh -H '$HOSTADDRESS$' -C '$ARG1$'
+}