diff options
Diffstat (limited to 'modules/profile/manifests/monitoring/commands.pp')
-rw-r--r-- | modules/profile/manifests/monitoring/commands.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/profile/manifests/monitoring/commands.pp b/modules/profile/manifests/monitoring/commands.pp index 4ccc816..1c8d0b4 100644 --- a/modules/profile/manifests/monitoring/commands.pp +++ b/modules/profile/manifests/monitoring/commands.pp | |||
@@ -1,7 +1,7 @@ | |||
1 | class profile::monitoring::commands inherits profile::monitoring { | 1 | class profile::monitoring::commands inherits profile::monitoring { |
2 | ensure_packages(["monitoring-plugins"]) | 2 | ensure_packages(["monitoring-plugins"]) |
3 | 3 | ||
4 | file { "/etc/naemon/monitoring-plugins": | 4 | file { $plugins: |
5 | ensure => "directory", | 5 | ensure => "directory", |
6 | owner => "root", | 6 | owner => "root", |
7 | group => "naemon", | 7 | group => "naemon", |
@@ -14,7 +14,7 @@ class profile::monitoring::commands inherits profile::monitoring { | |||
14 | "check_postgres_replication", | 14 | "check_postgres_replication", |
15 | "check_last_file_date", | 15 | "check_last_file_date", |
16 | ].each |$file| { | 16 | ].each |$file| { |
17 | file { "/etc/naemon/monitoring-plugins/$file": | 17 | file { "$plugins/$file": |
18 | ensure => "present", | 18 | ensure => "present", |
19 | owner => "root", | 19 | owner => "root", |
20 | group => "naemon", | 20 | group => "naemon", |
@@ -27,7 +27,7 @@ class profile::monitoring::commands inherits profile::monitoring { | |||
27 | ensure => "present", | 27 | ensure => "present", |
28 | owner => "naemon", | 28 | owner => "naemon", |
29 | group => "naemon", | 29 | group => "naemon", |
30 | target => "/etc/naemon/objects.cfg", | 30 | target => $objects, |
31 | notify => Service["naemon"], | 31 | notify => Service["naemon"], |
32 | before => Service["naemon"], | 32 | before => Service["naemon"], |
33 | require => File["/etc/naemon"], | 33 | require => File["/etc/naemon"], |
@@ -48,16 +48,16 @@ class profile::monitoring::commands inherits profile::monitoring { | |||
48 | command_line => '$USER1$/check_ntp_time -H 0.arch.pool.ntp.org'; | 48 | command_line => '$USER1$/check_ntp_time -H 0.arch.pool.ntp.org'; |
49 | "check_md_raid": | 49 | "check_md_raid": |
50 | command_line => '$USER2$/check_md_raid', | 50 | command_line => '$USER2$/check_md_raid', |
51 | require => File["/etc/naemon/monitoring-plugins/check_md_raid"]; | 51 | require => File["$plugins/check_md_raid"]; |
52 | "check_command_output": | 52 | "check_command_output": |
53 | command_line => '$USER2$/check_command -c "$ARG1$" -o "$ARG2$" $ARG3$', | 53 | command_line => '$USER2$/check_command -c "$ARG1$" -o "$ARG2$" $ARG3$', |
54 | require => File["/etc/naemon/monitoring-plugins/check_command"]; | 54 | require => File["$plugins/check_command"]; |
55 | "check_postgresql_replication": | 55 | "check_postgresql_replication": |
56 | command_line => '/usr/bin/sudo -u postgres $USER2$/check_postgres_replication "$ARG1$" "$ARG2$" "$ARG3$"', | 56 | command_line => '/usr/bin/sudo -u postgres $USER2$/check_postgres_replication "$ARG1$" "$ARG2$" "$ARG3$"', |
57 | require => File["/etc/naemon/monitoring-plugins/check_postgres_replication"]; | 57 | require => File["$plugins/check_postgres_replication"]; |
58 | "check_last_file_date": | 58 | "check_last_file_date": |
59 | command_line => '$USER2$/check_last_file_date "$ARG1$" "$ARG2$" "$ARG3$"', | 59 | command_line => '$USER2$/check_last_file_date "$ARG1$" "$ARG2$" "$ARG3$"', |
60 | require => File["/etc/naemon/monitoring-plugins/check_last_file_date"], | 60 | require => File["$plugins/check_last_file_date"], |
61 | } | 61 | } |
62 | 62 | ||
63 | unless empty($naemon_url) { | 63 | unless empty($naemon_url) { |