From 0363f38e186b8c942a6db2de4974befbc373f618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 11 Jul 2018 07:45:22 +0200 Subject: Refactor a bit monitoring profile --- .../profile/manifests/monitoring/local_service.pp | 47 +++++----------------- 1 file changed, 11 insertions(+), 36 deletions(-) (limited to '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 9af7c7a..9544fdf 100644 --- a/modules/profile/manifests/monitoring/local_service.pp +++ b/modules/profile/manifests/monitoring/local_service.pp @@ -4,8 +4,9 @@ define profile::monitoring::local_service ( Optional[Hash] $master = {}, Optional[Hash] $local = {}, ) { + include profile::monitoring::params + $service_description = $title - $real_hostname = lookup("base_installation::real_hostname") Nagios_service { ensure => "present", @@ -16,35 +17,6 @@ define profile::monitoring::local_service ( require => File["/etc/naemon"], } - $service_generic = { - active_checks_enabled => "1", - check_freshness => "0", - check_interval => "10", - check_period => "24x7", - contact_groups => "admins", - event_handler_enabled => "1", - flap_detection_enabled => "1", - is_volatile => "0", - max_check_attempts => "3", - notification_interval => "60", - notification_options => "w,u,c,r", - notification_period => "24x7", - notifications_enabled => "0", - obsess_over_service => "1", - passive_checks_enabled => "1", - process_perf_data => "1", - retain_nonstatus_information => "1", - retain_status_information => "1", - retry_interval => "2", - } - - $service_local = merge($service_generic, { - host_name => $real_hostname, - check_interval => "5", - max_check_attempts => "4", - retry_interval => "1", - }) - $sudos.each |$sudo_name, $content| { ensure_resource("sudo::conf", $sudo_name, { content => $content, @@ -56,17 +28,20 @@ define profile::monitoring::local_service ( if $services_for_master { $default_local = { mode => "0644", - target => "/etc/naemon/services_for_master.cfg", - check_interval => $service_local["check_interval"], - retry_interval => $service_local["retry_interval"], - host_name => $service_local["host_name"], - use => "external-service", + 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 => "external-passive-service", notify => [], } $t = "master - " $services_key = $master } else { - $default_local = merge($service_local, { target => "/etc/naemon/objects.cfg" }) + $default_local = merge( + $::profile::monitoring::params::service_local, + { target => $::profile::monitoring::params::objects } + ) $t = "" $services_key = $local } -- cgit v1.2.3