From 5efeaa18e929693c671fd32fbba37e110d519bf9 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sun, 13 Feb 2022 10:11:45 -0600
Subject: [PATCH] Polish up checks

---
 playbooks/prod_web.yml | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml
index 48e482d..3b44aaa 100755
--- a/playbooks/prod_web.yml
+++ b/playbooks/prod_web.yml
@@ -199,8 +199,6 @@
           - name: SSH
             command: check_ssh
           # check_by_ssh checks
-          - name: CPU Load
-            command: check_by_ssh!/usr/lib/nagios/plugins/check_load -r -w 5,4,3 -c 7,6,5
           - name: CPU Utilization
             command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_cpu_stats -w 75 -c 90
           - name: DNS Resolution
@@ -233,19 +231,6 @@
             hostgroup: "ansible,!role-hypervisor"
           - name: Users
             command: check_by_ssh!/usr/lib/nagios/plugins/check_users -w 3 -c 5
-          # Checks for Docker hosts
-          - name: Unit docker.service
-            command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit docker.service
-            hostgroup: "ansible,!tag-no-docker"
-          - name: Docker Status
-            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --status running
-            hostgroup: tag-nagios-checkdocker
-          - name: Docker CPU Usage
-            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --cpu 85:90
-            hostgroup: tag-nagios-checkdocker
-          - name: Docker Memory Usage
-            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --memory 90:95:%
-            hostgroup: tag-nagios-checkdocker
           # Privileged checks
           # Required because check_disk may attempt to get the free space of
           # restricted mountpoints
@@ -298,8 +283,18 @@
             command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit ansible-pull.timer
             hostgroup: tag-ansible-pull
           # docker
-          # Strictly speaking not a tag, but it's best to keep it separated
-          # TODO: Figure out how I'm going to implement Docker checks
+          - name: Unit docker.service
+            command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit docker.service
+            hostgroup: "ansible,!tag-no-docker"
+          - name: Docker Status
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --status running
+            hostgroup: tag-nagios-checkdocker
+          - name: Docker CPU Usage
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --cpu 85:90
+            hostgroup: tag-nagios-checkdocker
+          - name: Docker Memory Usage
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --memory 90:95:%
+            hostgroup: tag-nagios-checkdocker
           # nagios-checkpgsql
           - name: PSQL
             command: "check_by_ssh!/usr/lib/nagios/plugins/check_pgsql -H localhost -l nagios -p {{ secret_postgresql_monitoring_password }} -w 2 -c 5"