Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/irc_bot.pp
	manifests/irc_bot/base.pp
	templates/irc_bot/nsa.cfg.erb

3 files changed, 43 insertions, 3 deletions

diff --git a/manifests/service/dns.pp b/manifests/service/dns.pp
new file mode 100644
index 0000000..5ef6e3e
--- /dev/null
+++ b/manifests/service/dns.pp
@@ -0,0 +1,19 @@
+define nagios::service::dns(
+  $host_name      = $::fqdn,
+  $comment        = $name,
+  $check_domain   = $name,
+  $ip
+){
+  if $name != $comment {
+    $check_name = "${comment}_${name}_${::hostname}"
+  } else {
+    $check_name = "${name}_${::hostname}"
+  }
+
+  nagios::service{
+    $check_name:
+      check_command       => "check_dns2!${check_domain}!${ip}",
+      host_name           => $host_name,
+      service_description => "check if ${::host_name} is resolving ${check_domain}";
+  }
+}
diff --git a/manifests/service/dns_host.pp b/manifests/service/dns_host.pp
new file mode 100644
index 0000000..d88f373
--- /dev/null
+++ b/manifests/service/dns_host.pp
@@ -0,0 +1,22 @@
+# add a special host and monitor
+# it's dns service
+define nagios::service::dns_host(
+  $check_domain,
+  $host_alias,
+  $parent,
+  $ip
+){
+  @@nagios_host{$name:
+    address => $ip,
+    alias   => $host_alias,
+    use     => 'generic-host',
+    parents => $parent,
+  }
+
+  nagios::service::dns{$name:
+    host_name    => $name,
+    comment      => 'public_ns',
+    check_domain => $check_domain,
+    ip           => $ip,
+  }
+}
diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index 94881d8..9559b17 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -1,11 +1,10 @@
 # Checks a mysql instance via tcp or socket
-
 define nagios::service::mysql(
   $ensure = present,
   $check_host = 'absent',
   $check_port = '3306',
   $check_username = 'nagios',
-  $check_password = trocla("mysql_nagios_${::fqdn}",'plain','length: 32'),
+  $check_password,
   $check_database = 'information_schema',
   $check_warning = undef,
   $check_critical = undef,
@@ -54,6 +53,6 @@ define nagios::service::mysql(
 
   nagios::service { "mysql_health_${name}":
     ensure        => $ensure,
-    check_command => "check_mysql_health!${real_check_host}!${check_port}!${check_username}!${check_password}!${check_health_mode}!${check_database}${real_check_name}${real_check_warning}${real_check_critical}",
+    check_command => "check_mysql_health!${real_check_host}!${check_port}!${check_username}!'${check_password}'!${check_health_mode}!${check_database}${real_check_name}${real_check_warning}${real_check_critical}",
   }
 }