Merge pull request #106 from LarsFronius/master

Several fixes

lib/puppet/provider/sensu_check/json.rb

@@ -27,11 +27,11 @@ def flush
   def create
     conf['checks'] = {}
     conf['checks'][resource[:name]] = {}
-    self.handlers = resource[:handlers]
     self.command = resource[:command]
     self.interval = resource[:interval]
-    self.subscribers = resource[:subscribers]
     # Optional arguments
+    self.handlers = resource[:handlers] unless resource[:handlers].nil?
+    self.subscribers = resource[:subscribers] unless resource[:subscribers].nil?
     self.type = resource[:type] unless resource[:type].nil?
     self.standalone = resource[:standalone] unless resource[:standalone].nil?
     self.high_flap_threshold = resource[:high_flap_threshold] unless resource[:high_flap_threshold].nil?
@@ -83,7 +83,7 @@ def interval=(value)
   end
 
   def handlers
-    conf['checks'][resource[:name]]['handlers'] || []
+    conf['checks'][resource[:name]]['handlers']
   end
 
   def handlers=(value)
@@ -99,7 +99,7 @@ def command=(value)
   end
 
   def subscribers
-    conf['checks'][resource[:name]]['subscribers'] || []
+    conf['checks'][resource[:name]]['subscribers']
   end
 
   def subscribers=(value)

manifests/check.pp

@@ -9,24 +9,26 @@
   $command,
   $ensure               = 'present',
   $type                 = undef,
-  $handlers             = [],
+  $handlers             = undef,
   $standalone           = true,
   $interval             = '60',
-  $subscribers          = [],
+  $subscribers          = undef,
   $low_flap_threshold   = undef,
   $high_flap_threshold  = undef,
   $custom               = undef,
 ) {
 
-  file { "/etc/sensu/conf.d/checks/${name}.json":
+  $check_name = regsubst($name, ' ', '_', 'G')
+
+  file { "/etc/sensu/conf.d/checks/${check_name}.json":
     ensure  => $ensure,
     owner   => 'sensu',
     group   => 'sensu',
     mode    => '0440',
-    before  => Sensu_check[$name],
+    before  => Sensu_check[$check_name],
   }
 
-  sensu_check { $name:
+  sensu_check { $check_name:
     ensure              => $ensure,
     type                => $type,
     standalone          => $standalone,

manifests/package.pp

@@ -28,6 +28,7 @@
       purge   => true,
       recurse => true,
       force   => true,
+      require => Package['sensu']
     }
   }
 

spec/defines/sensu_check_spec.rb

@@ -1,50 +1,70 @@
 require 'spec_helper'
 
 describe 'sensu::check', :type => :define do
-  let(:title) { 'mycheck' }
+  context 'without whitespace in name' do
+    let(:title) { 'mycheck' }
 
-  context 'defaults' do
-    let(:params) { { :command => '/etc/sensu/somecommand.rb' } }
+    context 'defaults' do
+      let(:params) { { :command => '/etc/sensu/somecommand.rb' } }
 
-    it { should contain_sensu_check('mycheck').with(
-      'command'     => '/etc/sensu/somecommand.rb',
-      'handlers'    => [],
-      'interval'    => '60',
-      'subscribers' => []
-    ) }
+      it { should contain_sensu_check('mycheck').with(
+        'command'     => '/etc/sensu/somecommand.rb',
+        'handlers'    => [],
+        'interval'    => '60',
+        'subscribers' => []
+      ) }
 
-  end
+    end
+
+    context 'setting params' do
+      let(:params) { {
+        :command              => '/etc/sensu/command2.rb',
+        :handlers             => ['/handler1', '/handler2'],
+        :interval             => '10',
+        :subscribers          => ['all'],
+        :custom               => { 'a' => 'b', 'array' => [ 'c', 'd']},
+        :type                 => 'metric',
+        :standalone           => true,
+        :low_flap_threshold   => 10,
+        :high_flap_threshold  => 15
+      } }
+
+      it { should contain_sensu_check('mycheck').with(
+        'command'             => '/etc/sensu/command2.rb',
+        'handlers'            => ['/handler1', '/handler2'],
+        'interval'            => '10',
+        'subscribers'         => ['all'],
+        'custom'              => { 'a' => 'b', 'array' => [ 'c', 'd']},
+        'type'                => 'metric',
+        'standalone'          => true,
+        'low_flap_threshold'  => '10',
+        'high_flap_threshold' => '15'
+      ) }
+    end
+
+    context 'ensure absent' do
+      let(:params) { { :command => '/etc/sensu/somecommand.rb', :ensure => 'absent' } }
 
-  context 'setting params' do
-    let(:params) { {
-      :command              => '/etc/sensu/command2.rb',
-      :handlers             => ['/handler1', '/handler2'],
-      :interval             => '10',
-      :subscribers          => ['all'],
-      :custom               => { 'a' => 'b', 'array' => [ 'c', 'd']},
-      :type                 => 'metric',
-      :standalone           => true,
-      :low_flap_threshold   => 10,
-      :high_flap_threshold  => 15
-    } }
-
-    it { should contain_sensu_check('mycheck').with(
-      'command'             => '/etc/sensu/command2.rb',
-      'handlers'            => ['/handler1', '/handler2'],
-      'interval'            => '10',
-      'subscribers'         => ['all'],
-      'custom'              => { 'a' => 'b', 'array' => [ 'c', 'd']},
-      'type'                => 'metric',
-      'standalone'          => true,
-      'low_flap_threshold'  => '10',
-      'high_flap_threshold' => '15'
-    ) }
+      it { should contain_sensu_check('mycheck').with_ensure('absent') }
+    end
   end
 
-  context 'ensure absent' do
-    let(:params) { { :command => '/etc/sensu/somecommand.rb', :ensure => 'absent' } }
+  context 'with whitespace in name' do
+    let(:title) { 'mycheck foobar' }
+    context 'defaults' do
+      let(:params) { { :command => '/etc/sensu/somecommand.rb' } }
+
+      it { should contain_sensu_check('mycheck_foobar').with(
+        'command'     => '/etc/sensu/somecommand.rb',
+        'handlers'    => [],
+        'interval'    => '60',
+        'subscribers' => []
+      ) }
+
+      it { should contain_file('/etc/sensu/conf.d/checks/mycheck_foobar.json') }
+
+    end
 
-    it { should contain_sensu_check('mycheck').with_ensure('absent') }
   end
 
 end