Fix freshness for monitoring

[perso/Immae/Projets/Puppet.git] / modules / profile / manifests / monitoring / local_service.pp

diff --git a/modules/profile/manifests/monitoring/local_service.pp b/modules/profile/manifests/monitoring/local_service.pp
index 1f975f03c26d91038ad4c3341e976a15ff0f1d73..cf8ef782b5480644a60fc433bc452ccb7a33b354 100644 (file)
--- a/modules/profile/manifests/monitoring/local_service.pp
+++ b/modules/profile/manifests/monitoring/local_service.pp
@@ -24,17 +24,21 @@ define profile::monitoring::local_service (
     })
   }
 
+  $service_group = "${::profile::monitoring::params::service_local[host_name]}-servicegroup"
+  ensure_resource("nagios_servicegroup", $service_group, {
+    target => $::profile::monitoring::params::services_for_master,
+  })
+
   [true, false].each |$services_for_master| {
     if $services_for_master {
-      $default_local = {
-        mode           => "0644",
-        target         => $::profile::monitoring::params::services_for_master,
-        check_interval => $::profile::monitoring::params::service_local["check_interval"],
-        retry_interval => $::profile::monitoring::params::service_local["retry_interval"],
-        host_name      => $::profile::monitoring::params::service_local["host_name"],
-        use            => $::profile::monitoring::params::service_types["passive"],
-        notify         => [],
-      }
+      $default_local = merge(
+        $::profile::monitoring::params::service_local_for_master,
+        {
+          mode           => "0644",
+          target         => $::profile::monitoring::params::services_for_master,
+          servicegroups  => $service_group,
+          notify         => [],
+        })
       $t = "master - "
       $services_key = $master
     } else {