Remove additional role assignment for now

rubygems · Jun 19, 2014 · 7c5e145 · 7c5e145
1 parent 99e7bdd
commit 7c5e145
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -216,7 +216,7 @@ GRAPH
   rubygems-repo (0.0.6)
     aptly (>= 0.0.0)
     rubygems (>= 0.0.0)
-  rubygems-sensu (0.0.41)
+  rubygems-sensu (0.0.44)
     chef-vault (>= 0.0.0)
     sensu (>= 0.0.0)
   rubygems-ssh (0.0.3)

diff --git a/cookbooks/rubygems-sensu/metadata.rb b/cookbooks/rubygems-sensu/metadata.rb
@@ -1,7 +1,7 @@
 name 'rubygems-sensu'
 maintainer 'RubyGems.org ops team'
 
-version '0.0.41'
+version '0.0.44'
 
 depends 'chef-vault'
 depends 'sensu'

diff --git a/cookbooks/rubygems-sensu/recipes/base.rb b/cookbooks/rubygems-sensu/recipes/base.rb
@@ -49,9 +49,9 @@
 
 sensu_check 'check_load' do
   command "/usr/lib/nagios/plugins/check_load -w #{node['cpu']['total'] * 8}:#{node['cpu']['total'] * 5}:#{node['cpu']['total'] * 2} -c #{node['cpu']['total'] * 10}:#{node['cpu']['total'] * 8}:#{node['cpu']['total'] * 3}"
-  handlers ['default'], 'slack']
+  handlers ['default', 'slack']
   subscribers ['all']
   interval 30
-  aditional(:notification => 'Load is high', :occurences => 3)
+  additional(:notification => 'Load is high', :occurences => 3)
 end
 
diff --git a/cookbooks/rubygems-sensu/recipes/default.rb b/cookbooks/rubygems-sensu/recipes/default.rb
@@ -23,7 +23,7 @@
 
 sensu_client node.name do
   address node.ipaddress
-  subscriptions ['all'] + node['rubygems']['role_from_base_recipe']
+  subscriptions ['all']
   additional(environment: node.chef_environment)
 end