diff options
Diffstat (limited to 'manifests/agent')
| -rw-r--r-- | manifests/agent/install_local.pp | 3 | ||||
| -rw-r--r-- | manifests/agent/ps.pp | 7 | ||||
| -rw-r--r-- | manifests/agent/register.pp | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/manifests/agent/install_local.pp b/manifests/agent/install_local.pp index 7238440..6450abd 100644 --- a/manifests/agent/install_local.pp +++ b/manifests/agent/install_local.pp @@ -1,12 +1,11 @@ define check_mk::agent::install_local($source=undef, $content=undef, $ensure='present') { - @file { "/usr/lib/check_mk_agent/local/${name}" : + file { "/usr/lib/check_mk_agent/local/${name}" : ensure => $ensure, owner => 'root', group => 'root', mode => '0755', content => $content, source => $source, - tag => 'check_mk::local', require => Package['check-mk-agent'], } } diff --git a/manifests/agent/ps.pp b/manifests/agent/ps.pp index 67a999f..737cb91 100644 --- a/manifests/agent/ps.pp +++ b/manifests/agent/ps.pp @@ -1,12 +1,15 @@ define check_mk::agent::ps ( # procname and levels have defaults in check_mk::ps $procname = undef, - $levels = undef, + $levels = undef, # user is optional - $user = undef + $user = undef ) { + include check_mk::params + @@check_mk::ps { "${::fqdn}_${name}": + target => "${check_mk::params::etc_dir}/check_mk/conf.d/ps.mk", desc => $name, host => $::fqdn, procname => $procname, diff --git a/manifests/agent/register.pp b/manifests/agent/register.pp index 46cdeae..51c803d 100644 --- a/manifests/agent/register.pp +++ b/manifests/agent/register.pp @@ -1,8 +1,10 @@ class check_mk::agent::register ( $host_tags = '', - $hostname = $::fqdn -) { + $hostname = $::fqdn, + $etc_dir = $check_mk::params::etc_dir +) inherits check_mk::params { @@check_mk::host { $hostname: host_tags => $host_tags, + target => "${etc_dir}/check_mk/main.mk", } } |