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 3ef601f3c83114a3e1aac62c3191f31b28931b76 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Tue, 19 May 2015 16:44:08 -0400 Subject: Fix missing closing brace --- 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 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 From 02e692bba63390cc5614899f3a7e98981b56a618 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 23 Sep 2015 18:38:43 -0400 Subject: fix define name to match class --- manifests/agent/install_local.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/agent/install_local.pp b/manifests/agent/install_local.pp index 77268db..a398fb0 100644 --- a/manifests/agent/install_local.pp +++ b/manifests/agent/install_local.pp @@ -1,4 +1,4 @@ -define check-mk::agent::install_local($source=undef, $content=undef, $ensure='present') { +define check_mk::agent::install_local($source=undef, $content=undef, $ensure='present') { @file { "/usr/lib/check_mk_agent/local/${name}" : ensure => $ensure, owner => 'root', -- cgit v1.2.3 From fa44288428df9c94ffd19878dd0e2a2ae8a99c53 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 9 Nov 2015 16:24:09 -0800 Subject: fix tag name to use underscore too --- manifests/agent/install_local.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/agent/install_local.pp b/manifests/agent/install_local.pp index a398fb0..7238440 100644 --- a/manifests/agent/install_local.pp +++ b/manifests/agent/install_local.pp @@ -6,7 +6,7 @@ define check_mk::agent::install_local($source=undef, $content=undef, $ensure='pr mode => '0755', content => $content, source => $source, - tag => 'check-mk::local', + tag => 'check_mk::local', require => Package['check-mk-agent'], } } -- cgit v1.2.3 From aeba1914eb0a5d3b75b7cd6aee48153fce41dbdb Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Thu, 19 Nov 2015 12:50:16 -0800 Subject: ensure that use_ssh.mk permissions are 644, otherwise it ends up unreadable by the nagios user --- manifests/server/configure_ssh.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/server/configure_ssh.pp b/manifests/server/configure_ssh.pp index 5d4de74..987cc7a 100644 --- a/manifests/server/configure_ssh.pp +++ b/manifests/server/configure_ssh.pp @@ -10,6 +10,7 @@ class check_mk::server::configure_ssh ( 'puppet:///modules/check_mk/use_ssh.mk' ], owner => $::check_mk::shelluser, group => $::check_mk::shellgroup, + mode => '0644', notify => Exec['check_mk-refresh'] } } -- cgit v1.2.3 From 14f0d6dbd09f36f523fc1aa1b0c68a9af4ebb227 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Fri, 20 Nov 2015 16:42:10 -0800 Subject: allow setting the desired agent hostname, but default to fqdn --- manifests/agent.pp | 2 ++ manifests/agent/register.pp | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index c455bd5..d3d48b2 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -17,6 +17,7 @@ class check_mk::agent ( $generate_sshkey = false, $sshuser = undef, $use_ssh_tag = 'ssh', + $hostname = $::fqdn, $register_agent = true ) { @@ -62,6 +63,7 @@ class check_mk::agent ( if ( $register_agent ) { class { 'check_mk::agent::register': host_tags => $tags, + hostname => $hostname, } } } diff --git a/manifests/agent/register.pp b/manifests/agent/register.pp index 9d12fc7..46cdeae 100644 --- a/manifests/agent/register.pp +++ b/manifests/agent/register.pp @@ -1,7 +1,8 @@ -class check_mk::agent::register ($host_tags = '') { - @@check_mk::host { $::fqdn: +class check_mk::agent::register ( + $host_tags = '', + $hostname = $::fqdn +) { + @@check_mk::host { $hostname: host_tags => $host_tags, } - - } -- cgit v1.2.3 From 6a88fe50293154da8c8c49ed402326eda6c6ad2e Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Thu, 3 Dec 2015 14:58:02 -0800 Subject: also have the hostname override the name that the key gets on the agent --- manifests/agent.pp | 1 + manifests/agent/config.pp | 8 +++++--- manifests/agent/generate_sshkey.pp | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index d3d48b2..64109ae 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -57,6 +57,7 @@ class check_mk::agent ( method => $method, generate_sshkey => $generate_sshkey, sshuser => $sshuser, + hostname => $hostname, require => Class['check_mk::agent::install'], } diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp index 5907d43..8ee5f18 100644 --- a/manifests/agent/config.pp +++ b/manifests/agent/config.pp @@ -9,7 +9,8 @@ class check_mk::agent::config ( $user, $method = 'xinetd', $generate_sshkey = false, - $sshuser = undef + $sshuser = undef, + $hostname = $::fqdn ) { if $use_cache { $server = "${server_dir}/check_mk_caching_agent" @@ -38,11 +39,12 @@ class check_mk::agent::config ( 'ssh': { if $generate_sshkey { - check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}": + check_mk::agent::generate_sshkey { "check_mk_key_${hostname}": keydir => $keydir, authdir => $authdir, authfile => $authfile, - sshuser => $sshuser + sshuser => $sshuser, + hostname => $hostname } } diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp index 807e826..b00271f 100644 --- a/manifests/agent/generate_sshkey.pp +++ b/manifests/agent/generate_sshkey.pp @@ -15,11 +15,12 @@ define check_mk::agent::generate_sshkey ( $ssh_key_basepath = '/etc/puppet/modules/check_mk/keys', # user on the client the check_mk server will ssh to, to run the agent $sshuser = 'root', + $hostname = $::fqdn, $check_mk_tag = 'check_mk_sshkey' ){ # generate check-mk ssh keypair, stored on puppetmaster - $ssh_key_name = "${::fqdn}_id_rsa" + $ssh_key_name = "${hostname}_id_rsa" $ssh_keys = ssh_keygen("${ssh_key_basepath}/${ssh_key_name}") $public = split($ssh_keys[1],' ') $public_type = $public[0] -- cgit v1.2.3