From f5f3bca062ea6af44f9b8eb654d3b532a3f758cc Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Tue, 12 May 2015 10:24:46 -0700 Subject: fix some else statements, adjust whitespace and indenting to be more sane, minor linting --- manifests/agent/config.pp | 38 ++++++++++++++++++++------------------ manifests/agent/generate_sshkey.pp | 5 +---- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp index 256af8f..13fba61 100644 --- a/manifests/agent/config.pp +++ b/manifests/agent/config.pp @@ -10,35 +10,37 @@ class check_mk::agent::config ( ) { if $use_cache { $server = "${server_dir}/check_mk_caching_agent" - } - else { + } else { $server = "${server_dir}/check_mk_agent" } + case $method { 'xinetd': { - if $ip_whitelist { - $only_from = join($ip_whitelist, ' ') - } - else { - $only_from = undef - } - file { '/etc/xinetd.d/check_mk': - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - content => template('check_mk/agent/check_mk.erb'), - require => Package['check_mk-agent','check_mk-agent-logwatch'], - notify => Class['check_mk::agent::service'], - } + if $ip_whitelist { + $only_from = join($ip_whitelist, ' ') + } else { + $only_from = undef + } + + file { '/etc/xinetd.d/check_mk': + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + content => template('check_mk/agent/check_mk.erb'), + require => Package['check_mk-agent','check_mk-agent-logwatch'], + notify => Class['check_mk::agent::service'], + } } - 'ssh' : { + + 'ssh': { if $generate_sshkey { check_mk::agent::generate_sshkey { 'check_mk_key': homedir => $homedir } } } + default : {} } } diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp index 3187037..4742238 100644 --- a/manifests/agent/generate_sshkey.pp +++ b/manifests/agent/generate_sshkey.pp @@ -1,8 +1,8 @@ define check_mk::agent::generate_sshkey( + $homedir, $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys', $user = 'monitoring', $group = 'monitoring', - $homedir, $check_mk_tag = 'check_mk_sshkey' ){ @@ -29,7 +29,6 @@ define check_mk::agent::generate_sshkey( tag => $check_mk_tag; } - @@file { "${homedir}/.ssh/${ssh_key_name}.pub": content => $public_key, owner => $user, @@ -37,6 +36,4 @@ define check_mk::agent::generate_sshkey( mode => '0666', tag => $check_mk_tag; } - - } -- cgit v1.2.3 From 5ca95eaf0c382c9e48bfda5c9385ea8c5c713301 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Tue, 12 May 2015 10:51:09 -0700 Subject: fix missing } --- manifests/agent/generate_sshkey.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp index d2d1d39..807e826 100644 --- a/manifests/agent/generate_sshkey.pp +++ b/manifests/agent/generate_sshkey.pp @@ -46,6 +46,7 @@ define check_mk::agent::generate_sshkey ( target => "${authdir}/${authfile}", override_builtin => true, options => "command=\"${command}\""; + } } else { # otherwise use the defaults sshd::ssh_authorized_key { $ssh_key_name: -- cgit v1.2.3 From 6fe1e0f3fb251aebdc3e26490e1df327012424f2 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Tue, 12 May 2015 11:29:35 -0700 Subject: fix join to use an array --- manifests/host.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/host.pp b/manifests/host.pp index 4e8d146..49f038b 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -4,7 +4,7 @@ define check_mk::host ( ) { $host = $title if size($host_tags) > 0 { - $taglist = join($host_tags,'|') + $taglist = join(any2array($host_tags),'|') $entry = "${host}|${taglist}" } else { -- cgit v1.2.3 From 436b4f3044c13498760cb28f8eb9159bdced48e2 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 26 Jun 2015 16:10:32 -0400 Subject: add agent::install_local to facilitate installation of local checks, for example: check-mk::agent::install_local { 'check-kvm' : ensure => present, source => 'puppet:///modules/ganeti/check-kvm', } --- manifests/agent/install_local.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 manifests/agent/install_local.pp diff --git a/manifests/agent/install_local.pp b/manifests/agent/install_local.pp new file mode 100644 index 0000000..77268db --- /dev/null +++ b/manifests/agent/install_local.pp @@ -0,0 +1,12 @@ +define check-mk::agent::install_local($source=undef, $content=undef, $ensure='present') { + @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'], + } +} -- cgit v1.2.3 From 27da77d96a3a64dec829c0b2c203810c99104dba Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Tue, 30 Jun 2015 13:48:09 -0700 Subject: allow version override For the distro package case, allow overriding the version for agent and server --- manifests/agent/install.pp | 10 ++++++++-- manifests/install.pp | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/manifests/agent/install.pp b/manifests/agent/install.pp index 7225b20..5c0b56e 100644 --- a/manifests/agent/install.pp +++ b/manifests/agent/install.pp @@ -50,13 +50,19 @@ class check_mk::agent::install ( } } else { + if $version { + $agent_package_version = $version + } else { + $agent_package_version = latest + } + package { 'check_mk-agent': - ensure => latest, + ensure => $agent_package_version, name => $agent_package_name, require => $require_method, } package { 'check_mk-agent-logwatch': - ensure => latest, + ensure => $agent_package_version, name => $agent_logwatch_package_name, require => Package['check_mk-agent'], } diff --git a/manifests/install.pp b/manifests/install.pp index bb32146..5f8a4a0 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,5 +1,6 @@ class check_mk::install ( $filestore = '', + $version = '', $package, $site, $workspace, @@ -29,8 +30,15 @@ class check_mk::install ( } else { $package_name = $package + + if $version { + $server_package_version = $version + } else { + $server_package_version = latest + } + package { $package_name: - ensure => installed, + ensure => $server_package_version, } } $etc_dir = "/omd/sites/${site}/etc" -- cgit v1.2.3