From: Alex Dehnert <alex@dehnerts.com>
Date: Tue, 19 Jan 2016 05:48:12 +0000 (-0500)
Subject: Fix nagios checks
X-Git-Url: https://dehnerts.com/gitweb/?a=commitdiff_plain;h=659cecb898ff107e196b02e33b6da00dc931ac17;p=sysconfig%2Fnagios3.git

Fix nagios checks

- HTTPS checks should use check_https_hostname, so that we use the hostname's
  vhost, not the IP address
- explicitly use .my.cnf for olinda's mysql check, rather than just setting the
  home dir (I don't know why that seems to have broken, but it has)
---

diff --git a/local.d/esp.cfg b/local.d/esp.cfg
index 9ee8107..27b5596 100644
--- a/local.d/esp.cfg
+++ b/local.d/esp.cfg
@@ -67,7 +67,7 @@ define service {
 define service {
 	use			generic-esp-service
         service_description	HTTPS
-	check_command		check_https
+	check_command		check_https_hostname!-H esp.mit.edu
 	__CHECK_CERT_EXPIRY_DAYS	30
 }
 
diff --git a/local.d/olinda.cfg b/local.d/olinda.cfg
index 9c18510..91f70e9 100644
--- a/local.d/olinda.cfg
+++ b/local.d/olinda.cfg
@@ -25,7 +25,7 @@ define service {
 	name olinda-https
 	use adehnert-service
 	service_description HTTPS
-	check_command check_https
+	check_command check_https_hostname
 	__check_cert_expiry_days 10
 	host_name olinda
 }
@@ -64,7 +64,7 @@ define service {
 
 define command{
         command_name    check_mysql_home
-	command_line    env HOME=/var/lib/nagios/ /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$'
+	command_line    /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -f /var/lib/nagios/.my.cnf
 }
 
 define service {