From 2a7d343ef145d4e3b281aa2170790b8f4da82ca5 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Tue, 7 Sep 2021 13:29:19 -0500
Subject: [PATCH] Move SSH check into YAML declaration of services

---
 playbooks/tasks/web/nagios-ansible.cfg.j2 | 6 ------
 playbooks/tasks/web/nagios.yml            | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/playbooks/tasks/web/nagios-ansible.cfg.j2 b/playbooks/tasks/web/nagios-ansible.cfg.j2
index 490f2ad..1b76062 100644
--- a/playbooks/tasks/web/nagios-ansible.cfg.j2
+++ b/playbooks/tasks/web/nagios-ansible.cfg.j2
@@ -42,12 +42,6 @@ define hostgroup {
 	hostgroup_name		ansible
 	alias			Ansible-managed Hosts
 }
-define service {
-	use			ansible-generic-service
-	service_description	SSH
-	check_command		check_ssh
-	hostgroup_name		ansible
-}
 
 # Commands
 define command {
diff --git a/playbooks/tasks/web/nagios.yml b/playbooks/tasks/web/nagios.yml
index 2070b0c..31d6f15 100644
--- a/playbooks/tasks/web/nagios.yml
+++ b/playbooks/tasks/web/nagios.yml
@@ -13,6 +13,9 @@
       - name: HTTPS
         command: check_http!--ssl
         hostgroup: nagios-checkhttp
+      - name: SSH
+        command: check_ssh
+        hostgroup: ansible
       # Agented checks
       - name: CPU Load
         command: check_nrpe!check_load