summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-04-10 17:01:26 +0200
committervarac <varacanero@zeromail.org>2014-04-10 17:01:26 +0200
commit47c98e75f502c6ca77c4b46bb326959e569f501e (patch)
tree6f6b9d840d3b4eaacd0681245cccf302c263ad5f /puppet/modules
parent615b5a218e843c9fe4e41729507b6ca1f14cf7b7 (diff)
parente3d4c14648ff4e108cec28112c119ee7115a44cb (diff)
Merge branch '5272_check_mk_resource_ordering' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_check_mk/manifests/agent.pp20
-rw-r--r--puppet/modules/site_check_mk/manifests/agent/mx.pp5
-rw-r--r--puppet/modules/site_check_mk/manifests/agent/webapp.pp10
3 files changed, 19 insertions, 16 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index b752182e..589041eb 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -4,7 +4,7 @@ class site_check_mk::agent {
$pubkey = $ssh_hash['authorized_keys']['monitor']['key']
$type = $ssh_hash['authorized_keys']['monitor']['type']
- include site_apt::preferences::check_mk
+ class { 'site_apt::preferences::check_mk': } ->
class { 'check_mk::agent':
agent_package_name => 'check-mk-agent',
@@ -12,17 +12,17 @@ class site_check_mk::agent {
method => 'ssh',
homedir => '/etc/nagios/check_mk',
register_agent => false
- }
+ } ->
- file { [ '/srv/leap/nagios', '/srv/leap/nagios/plugins' ]:
- ensure => directory,
- }
+ class { 'site_check_mk::agent::mrpe': } ->
+ class { 'site_check_mk::agent::logwatch': } ->
- file { '/usr/lib/check_mk_agent/local/run_node_tests.sh':
- source => 'puppet:///modules/site_check_mk/agent/local_checks/all_hosts/run_node_tests.sh',
- mode => '0755'
+ file {
+ [ '/srv/leap/nagios', '/srv/leap/nagios/plugins' ]:
+ ensure => directory;
+ '/usr/lib/check_mk_agent/local/run_node_tests.sh':
+ source => 'puppet:///modules/site_check_mk/agent/local_checks/all_hosts/run_node_tests.sh',
+ mode => '0755';
}
- include site_check_mk::agent::mrpe
- include site_check_mk::agent::logwatch
}
diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp
index 2dd50400..35a4e9a5 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mx.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp
@@ -15,8 +15,9 @@ class site_check_mk::agent::mx {
# check stale files in queue dir
file { '/usr/lib/check_mk_agent/local/check_leap_mx.sh':
- source => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
- mode => '0755'
+ source => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
+ mode => '0755',
+ require => Package['check_mk-agent']
}
}
diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index cb160d83..64f5ea6d 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -5,12 +5,14 @@ class site_check_mk::agent::webapp {
ensure => installed
}
file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
- ensure => link,
- target => '/srv/leap/webapp/test/nagios/webapp_login.py'
+ ensure => link,
+ target => '/srv/leap/webapp/test/nagios/webapp_login.py',
+ require => Package['check_mk-agent']
}
file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
- ensure => link,
- target => '/srv/leap/webapp/test/nagios/soledad_sync.py'
+ ensure => link,
+ target => '/srv/leap/webapp/test/nagios/soledad_sync.py',
+ require => Package['check_mk-agent']
}