Switching from declaring the class to including the class fixes an is…

manifests/check.pp

@@ -56,7 +56,7 @@
   }
 
   # Export the precious resource with all modified parameters
-  @@nagios_service { "check_${title}_${host_name}":
+  nagios::service { "check_${title}_${host_name}":
     ensure              => $ensure,
     host_name           => $host_name,
     check_command       => "check_${title}",
@@ -67,8 +67,6 @@
     max_check_attempts  => $final_max_check_attempts,
     notification_period => $final_notification_period,
     use                 => $final_use,
-    # Support an arrays of tags for multiple nagios servers
-    tag                 => regsubst($server,'^(.+)$','nagios-\1'),
   }
 
   # Default line for nrpe invoke (used in the nagios_command)
@@ -80,10 +78,9 @@
 #    default => "-a $parameters",
 #  }
 
-  @@nagios_command { "check_${title}":
+  nagios::command { "check_${title}":
 #   command_line => "${nrpe} -c check_${title} $command_parameters",
     command_line => "${nrpe} -c check_${title}",
-    tag          => regsubst($server,'^(.+)$','nagios-\1'),
   }
 
 }

manifests/check/cpu.pp

@@ -9,6 +9,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) inherits ::nagios::client {
 
   nagios::client::nrpe_plugin { 'check_cpu':
@@ -36,6 +37,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/check/cpu_temp.pp

@@ -3,7 +3,7 @@
 class nagios::check::cpu_temp (
   $ensure                   = undef,
   $args                     = '',
-  $package                  = 'lm_sensors',
+  $package                  = $::osfamily ? {'Debian' => 'lm-sensors',default => 'lm_sensors'},
   $check_title              = $::nagios::client::host_name,
   $servicegroups            = undef,
   $check_period             = $::nagios::client::service_check_period,

manifests/check/disk.pp

@@ -18,6 +18,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) inherits ::nagios::client {
 
   if $ensure != 'absent' {
@@ -45,6 +46,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/check/mysql_health.pp

@@ -27,6 +27,7 @@
   $args_slave_io_running         = '',
   $args_slave_sql_running        = '',
   $args_open_files               = '',
+  $notes_url                     = undef,
 ) {
 
   # Generic overrides

manifests/check/mysql_health/mode.pp

@@ -13,6 +13,7 @@
   $args           = $::nagios::check::mysql_health::args
   $modes_enabled  = $::nagios::check::mysql_health::modes_enabled
   $modes_disabled = $::nagios::check::mysql_health::modes_disabled
+  $notes_url      = $::nagios::check::mysql_health::notes_url
   $ensure         = $::nagios::check::mysql_health::ensure
 
   # Get the args passed to the main class for our mode
@@ -32,6 +33,7 @@
       check_command       => "check_nrpe_mysql_health_${mode_u}",
       service_description => "mysql_health_${mode_u}",
       servicegroups       => 'mysql_health',
+      notes_url           => $notes_url,
     }
   } else {
     nagios::client::nrpe_file { "check_mysql_health_${mode_u}":

manifests/check/ntp_time.pp

@@ -9,6 +9,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) inherits ::nagios::client {
 
   if $ensure != 'absent' {
@@ -37,6 +38,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/check/ping.pp

@@ -9,6 +9,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) inherits ::nagios::client {
 
   # Include defaults if no overrides in $args
@@ -28,6 +29,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/check/postgres/custom_query.pp

@@ -64,9 +64,8 @@
       service_description => "postgres_cq_${query_name}",
       servicegroups       => 'postgres',
     }
-    @@nagios_command { "check_nrpe_postgres_cq_${query_name}":
+    nagios::command { "check_nrpe_postgres_cq_${query_name}":
       command_line => "${nrpe} -c check_postgres_cq_${query_name}",
-      tag          => regsubst($server,'^(.+)$','nagios-\1'),
     }
   } elsif ($query_ensure == 'absent') {
     nagios::client::nrpe_file { "check_postgres_cq_${query_name}":

manifests/check/redis.pp

@@ -26,6 +26,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) {
 
   nagios::client::nrpe_plugin { 'check_redis':

manifests/check/service.pp

@@ -8,6 +8,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $sudo                     = false,
 ) {
 
   ensure_resource('nagios::client::nrpe_plugin', 'check_service', {'ensure' => $ensure})
@@ -16,15 +17,16 @@
   $nrpe_options   = $::nagios::params::nrpe_options
   $nrpe           = "${nrpe_command} ${nrpe_options}"
 
-  @@nagios_command { "check_nrpe_service_${title}_${::fqdn}":
+  nagios::command { "check_nrpe_service_${title}_${::fqdn}":
+    ensure       => $ensure,
     command_line => "${nrpe} -c check_service_${title}",
-    tag          => 'service',
   }
 
   nagios::client::nrpe_file { "check_service_${title}":
     ensure => $ensure,
     args   => "-s ${title}",
     plugin => 'check_service',
+    sudo   => $sudo,
   }
 
   nagios::service { "check_service_${title}_${::nagios::client::host_name}":

manifests/check/ssh.pp

@@ -9,6 +9,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) {
 
   nagios::service { "check_sshd_${check_title}":
@@ -22,6 +23,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/check/swap.pp

@@ -9,6 +9,7 @@
   $max_check_attempts       = $::nagios::client::service_max_check_attempts,
   $notification_period      = $::nagios::client::service_notification_period,
   $use                      = $::nagios::client::service_use,
+  $notes_url                = undef,
 ) inherits ::nagios::client {
 
   if $ensure != 'absent' {
@@ -36,6 +37,7 @@
     notification_period      => $notification_period,
     max_check_attempts       => $max_check_attempts,
     use                      => $use,
+    notes_url                => $notes_url,
   }
 
 }

manifests/command.pp

@@ -0,0 +1,35 @@
+# Define: nagios::command
+#
+# Wrap around the original nagios_command
+# * To be able to export with the correct tag automatically
+# * To be able to use defaults overridden or from facts
+#
+define nagios::command (
+  $command_line,
+  $ensure                   = undef,
+  $server                   = $nagios::client::server,
+  $host_name                = $nagios::client::host_name,
+  $target                   = "/etc/nagios/nagios_command.cfg.d/${host_name}.cfg",
+) {
+
+  # Support an array of tags for multiple nagios servers
+  $service_tag = regsubst($server,'^(.+)$','nagios-\1')
+  @@nagios_command { $title:
+    ensure                   => $ensure,
+    command_line             => $command_line,
+    tag                      => $service_tag,
+    target                   => $target,
+    notify                   => Service['nagios'],
+    require                  => [
+      Package['nagios'],
+      File[dirname($target)],
+    ],
+  }
+  @@nagios::file_perm { $title:
+    target  => $target,
+    tag     => $service_tag,
+    require => Nagios_command[$title],
+  }
+
+}
+

manifests/file_perm.pp

@@ -0,0 +1,16 @@
+define nagios::file_perm (
+  $target,
+) {
+  # Work around a puppet bug where created files are 600 root:root
+  # Also, restart service after resources are purged
+  $file_params = {
+    ensure => 'present',
+    owner  => 'root',
+    group  => 'nagios',
+    mode   => '0640',
+    audit  => 'content',
+    notify => Service['nagios'],
+  }
+  ensure_resource('file', $target, $file_params)
+
+}

manifests/host.pp

@@ -11,6 +11,7 @@
     $server              = $nagios::client::server,
     $address             = $nagios::client::host_address,
     $host_alias          = $nagios::client::host_alias,
+    $target              = "/etc/nagios/nagios_host.cfg.d/${title}.cfg",
     $check_period        = $nagios::client::host_check_period,
     $check_command       = $nagios::client::host_check_command,
     $contact_groups      = $nagios::client::host_contact_groups,
@@ -47,7 +48,10 @@
         default => $use,
     }
 
+    # Support an array of tags for multiple nagios servers
+    $service_tag = regsubst($server,'^(.+)$','nagios-\1')
     @@nagios_host { $title:
+        host_name           => $title,
         address             => $final_address,
         alias               => $host_alias,
         check_period        => $check_period,
@@ -59,7 +63,15 @@
         notification_period => $notification_period,
         use                 => $final_use,
         # Support an arrays of tags for multiple nagios servers
-        tag                 => regsubst($server,'^(.+)$','nagios-\1'),
+        tag                 => $service_tag,
+        target              => $target,
+        notify              => Service['nagios'],
+        require             => Package['nagios'],
+    }
+    @@nagios::file_perm { $title:
+        target  => $target,
+        tag     => $service_tag,
+        require => Nagios_host[$title],
     }
 
 }