First working version of check_mk agent

6 files changed, 41 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f6dc3f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/
+metadata.json
+*.swp
diff --git a/Modulefile b/Modulefile
new file mode 100644
index 0000000..4ba5cca
--- /dev/null
+++ b/Modulefile
@@ -0,0 +1,8 @@
+name    'erwbgy-check_mk'
+version '0.0.1'
+source 'https://github.com/erwbgy/puppet-check_mk.git'
+author 'erwbgy'
+license 'Apache License, Version 2.0'
+summary 'install and configure check_mk'
+description 'Install and configure check_mk agent and Nagios plugin'
+project_page 'https://github.com/erwbgy/puppet-check_mk'
diff --git a/README.md b/README.md
index 4d8aa03..1fb58dc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
-puppet-check_mk
-===============
+# puppet-check_mk
+
+Install and configure check_mk agent and Nagios plugin
+
+Example:
+
+    class { 'check_mk::agent':
+      version => '1.2.0p3-1',
+      ip_whitelist => [ '10.7.96.21', '10.7.96.22' ],
+    }
 
-Install and configure check_mk agent and Nagios plugin
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..14f1c24
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/manifests/agent.pp b/manifests/agent.pp
index 4a83e34..f5262bf 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -1,6 +1,6 @@
 class check_mk::agent (
   $version,
-  $filestore    = 'puppet://files/check_mk',
+  $filestore    = 'puppet:///files/check_mk',
   $ip_whitelist = undef,
   $port         = '6556',
   $server_dir   = '/usr/bin',
@@ -13,25 +13,32 @@ class check_mk::agent (
       ensure => present,
     }
   }
+  if ! defined(File[$workspace]) {
+    file { $workspace:
+      ensure => directory,
+    }
+  }
   file { "${workspace}/check_mk-agent-${version}.noarch.rpm":
     ensure  => present,
-    content => "${filestore}/check_mk-agent-${version}.noarch.rpm",
+    source  => "${filestore}/check_mk-agent-${version}.noarch.rpm",
     require => Package['xinetd'],
   }
   file { "${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm":
     ensure  => present,
-    content => "${filestore}/check_mk-agent-logwatch-${version}.noarch.rpm",
+    source  => "${filestore}/check_mk-agent-logwatch-${version}.noarch.rpm",
     require => Package['xinetd'],
   }
   package { 'check_mk-agent':
-    ensure => present,
-    source => "${workspace}/check_mk-agent-${version}.noarch.rpm",
-    require => File["${workspace}/check_mk-agent-${version}.noarch.rpm"],
+    ensure   => present,
+    provider => 'rpm',
+    source   => "${workspace}/check_mk-agent-${version}.noarch.rpm",
+    require  => File["${workspace}/check_mk-agent-${version}.noarch.rpm"],
   }
   package { 'check_mk-agent-logwatch':
-    ensure  => present,
-    content => "${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm",
-    require => File["${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm"],
+    ensure   => present,
+    provider => 'rpm',
+    source   => "${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm",
+    require  => File["${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm"],
   }
   if $use_cache {
     $server = "${server_dir}/check_mk_caching_agent"
@@ -50,7 +57,7 @@ class check_mk::agent (
     owner   => 'root',
     group   => 'root',
     mode    => '0444',
-    source  => template('check_mk/agent/check_mk.erb'),
+    content => template('check_mk/agent/check_mk.erb'),
     require => Package['check_mk-agent','check_mk-agent-logwatch'],
     notify  => Service['xinetd'],
   }
diff --git a/templates/agent/check_mk.erb b/templates/agent/check_mk.erb
index 7643292..ef008f7 100644
--- a/templates/agent/check_mk.erb
+++ b/templates/agent/check_mk.erb
@@ -30,22 +30,10 @@ service check_mk
 	protocol       = tcp
 	wait           = no
 	user           = <%= @user %>
-<% if @use_cache -%>
-	# If you use fully redundant monitoring and poll the client
-	# from more then one monitoring servers in parallel you might
-	# want to use the agent cache wrapper:
-<% end -%>
 	server         = <%= @server %>
-
-<% if @only_from %>
-	# configure the IP address(es) of your Nagios server here:
+<% if @only_from -%>
 	only_from      = <%= @only_from %>
 <% end -%>
-
-	# Don't be too verbose. Don't log every check. This might be
-	# commented out for debugging. If this option is commented out
-	# the default options will be used for this service.
 	log_on_success =
-
 	disable        = no
 }