mysql/icinga fixesHEADmaster

2 files changed, 37 insertions, 0 deletions

diff --git a/files/usr/local/etc/icinga2/conf.d/groups.conf.icinga_server b/files/usr/local/etc/icinga2/conf.d/groups.conf.icinga_server
index f6f13b8..6665a78 100644
--- a/files/usr/local/etc/icinga2/conf.d/groups.conf.icinga_server
+++ b/files/usr/local/etc/icinga2/conf.d/groups.conf.icinga_server
@@ -43,6 +43,11 @@ object HostGroup "postgresql-servers" {
   assign where regex("^postgres[0-9]+", host.name)
 }
 
+object HostGroup "mysql-servers" {
+  display_name = "MySQL Servers"
+  assign where regex("^mysql[0-9]+", host.name)
+}
+
 object HostGroup "dav-servers" {
   display_name = "DAV Servers"
   assign where regex("^dav[0-9]+", host.name)
diff --git a/files/usr/local/etc/icinga2/conf.d/services.conf.icinga_server b/files/usr/local/etc/icinga2/conf.d/services.conf.icinga_server
index ce08657..dbff174 100644
--- a/files/usr/local/etc/icinga2/conf.d/services.conf.icinga_server
+++ b/files/usr/local/etc/icinga2/conf.d/services.conf.icinga_server
@@ -165,6 +165,16 @@ apply Service "postgres" {
   assign where "postgresql-servers" in host.groups
 }
 
+apply Service "mysql" {
+  check_command = "mysql"
+  vars.mysql_warning = ${icinga_response_time_warn}
+  vars.mysql_critical = ${icinga_response_time_crit}
+  vars.mysql_username = "${icinga_username}"
+  vars.mysql_password = IcingaPassword
+  vars.mysql_ssl = true
+  assign where "mysql-servers" in host.groups
+}
+
 apply Service "eap-cert" {
   check_command = "eapol"
   vars.eapol_secret = IcingaRadiusSecret
@@ -233,6 +243,28 @@ apply Service for (vhost in host.vars.xmpp_vhosts) {
   vars.tcp_expect = "<?xml version='1.0'"
 }
 
+apply Service "mollysocket" {
+  check_command = "http"
+  display_name = "mollysocket status"
+  vars.http_vhost = "\$address\$"
+  vars.http_port = 8443
+  vars.http_expect = "HTTP/1.1 200 OK"
+  vars.http_ssl = true
+  vars.http_warn_time = ${icinga_response_time_warn}
+  vars.http_critical_time = ${icinga_response_time_crit}
+  assign where ("xmpp-servers" in host.groups)
+}
+
+apply Service "mollysocket-cert" {
+  check_command = "http"
+  display_name = "mollysocket certificate"
+  vars.http_port = 8443
+  vars.http_vhost = "\$address\$"
+  vars.http_ssl = true
+  vars.http_certificate = ${icinga_cert_days_warn} + "," + ${icinga_cert_days_crit}
+  assign where ("xmpp-servers" in host.groups)
+}
+
 // Expect HTTP 200
 apply Service "http" {
   check_command = "http"