aboutsummaryrefslogtreecommitdiff
path: root/modules/profile
diff options
context:
space:
mode:
Diffstat (limited to 'modules/profile')
-rw-r--r--modules/profile/manifests/monitoring/commands.pp2
-rw-r--r--modules/profile/manifests/monitoring/params.pp10
-rw-r--r--modules/profile/manifests/monitoring/services.pp9
3 files changed, 13 insertions, 8 deletions
diff --git a/modules/profile/manifests/monitoring/commands.pp b/modules/profile/manifests/monitoring/commands.pp
index 7c5d8ed..fddff66 100644
--- a/modules/profile/manifests/monitoring/commands.pp
+++ b/modules/profile/manifests/monitoring/commands.pp
@@ -46,7 +46,7 @@ class profile::monitoring::commands inherits profile::monitoring {
46 "check_local_swap": 46 "check_local_swap":
47 command_line => '$USER1$/check_swap -n ok -w $ARG1$ -c $ARG2$'; 47 command_line => '$USER1$/check_swap -n ok -w $ARG1$ -c $ARG2$';
48 "check_ntp": 48 "check_ntp":
49 command_line => '$USER1$/check_ntp_time -H 0.arch.pool.ntp.org'; 49 command_line => '$USER1$/check_ntp_time -t 30 -q -H 0.arch.pool.ntp.org';
50 "check_md_raid": 50 "check_md_raid":
51 command_line => '$USER2$/check_md_raid', 51 command_line => '$USER2$/check_md_raid',
52 require => File["$plugins/check_md_raid"]; 52 require => File["$plugins/check_md_raid"];
diff --git a/modules/profile/manifests/monitoring/params.pp b/modules/profile/manifests/monitoring/params.pp
index 285393c..fa8dc5e 100644
--- a/modules/profile/manifests/monitoring/params.pp
+++ b/modules/profile/manifests/monitoring/params.pp
@@ -40,10 +40,10 @@ class profile::monitoring::params {
40 }) 40 })
41 41
42 $service_local_for_master = { 42 $service_local_for_master = {
43 host_name => $service_local["host_name"], 43 host_name => $service_local["host_name"],
44 check_interval => $service_local["check_interval"], 44 check_interval => $service_local["check_interval"],
45 retry_interval => $service_local["retry_interval"], 45 retry_interval => $service_local["retry_interval"],
46 check_freshness => Integer(Integer($service_local["check_interval"]) * 1.5), 46 freshness_threshold => Integer(60 * Integer($service_local["check_interval"]) * 1.5),
47 use => $service_types["passive"], 47 use => $service_types["passive"],
48 } 48 }
49} 49}
diff --git a/modules/profile/manifests/monitoring/services.pp b/modules/profile/manifests/monitoring/services.pp
index 0ecc135..5ff3c6d 100644
--- a/modules/profile/manifests/monitoring/services.pp
+++ b/modules/profile/manifests/monitoring/services.pp
@@ -35,8 +35,13 @@ class profile::monitoring::services {
35 check_command => "check_command_output!fail2ban-client ping!pong!-r root", 35 check_command => "check_command_output!fail2ban-client ping!pong!-r root",
36 }; 36 };
37 "NTP is activated and working": 37 "NTP is activated and working":
38 local => { 38 master => {
39 check_command => "check_ntp", 39 check_interval => "60",
40 freshness_threshold => Integer(60*60*1.5),
41 },
42 local => {
43 check_command => "check_ntp",
44 check_interval => "60"
40 }; 45 };
41 "No mdadm array is degraded": 46 "No mdadm array is degraded":
42 common => { 47 common => {