Merge branch 'master' into deprication_warning

sensu · May 16, 2013 · 69985fa · 69985fa
2 parents 13b90cc + 70ca089
commit 69985fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/manifests/check.pp b/manifests/check.pp
@@ -19,6 +19,7 @@
   $high_flap_threshold  = undef,
   $refresh              = undef,
   $aggregate            = undef,
+  $occurrences          = undef,
   $config               = undef,
   $purge_config         = 'false',
 ) {
@@ -41,6 +42,7 @@
     high_flap_threshold => $high_flap_threshold,
     refresh             => $refresh,
     aggregate           => $aggregate,
+    occurrences         => $occurrences,
     config              => $config,
     require             => File['/etc/sensu/conf.d/checks'],
   }

diff --git a/spec/defines/sensu_check_spec.rb b/spec/defines/sensu_check_spec.rb
@@ -29,6 +29,7 @@
       :high_flap_threshold  => 15,
       :refresh              => 1800,
       :aggregate            => true,
+      :occurrences          => 5,
     } }
 
     it { should contain_sensu_check('mycheck').with(
@@ -43,7 +44,8 @@
       'low_flap_threshold'  => '10',
       'high_flap_threshold' => '15',
       'refresh'             => '1800',
-      'aggregate'           => true
+      'aggregate'           => true,
+      'occurrences'         => '5'
     ) }
   end