add environment to sensu alerts

rubygems · Aug 16, 2014 · a9c5cb4 · a9c5cb4
1 parent f553f01
commit a9c5cb4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -276,7 +276,7 @@ GRAPH
     nginx (>= 0.0.0)
     rubygems (>= 0.0.0)
   rubygems-ruby (0.0.1)
-  rubygems-sensu (0.0.76)
+  rubygems-sensu (0.0.77)
     chef-vault (>= 0.0.0)
     sensu (= 1.0.0)
   rubygems-ssh (0.0.4)

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.76'
+version '0.0.77'
 
 depends 'chef-vault'
 depends 'sensu', '1.0.0'

diff --git a/cookbooks/rubygems-sensu/recipes/app.rb b/cookbooks/rubygems-sensu/recipes/app.rb
@@ -8,21 +8,21 @@
   handlers ['slack', 'pagerduty']
   subscribers ['app']
   interval 30
-  additional(notification: 'nginx is not returning 200 OK on port 9000', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] nginx is not returning 200 OK on port 9000", occurences: 3)
 end
 
 sensu_check 'check_unicorn_http' do
   command '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 3000 -t 5 -w 1 -c 2'
   handlers ['slack', 'pagerduty']
   subscribers ['app']
   interval 30
-  additional(notification: 'unicorn is not returning 200 OK on port 3000', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] unicorn is not returning 200 OK on port 3000", occurences: 3)
 end
 
 sensu_check 'check_unicorn_proc' do
   command "/opt/sensu/embedded/bin/ruby /etc/sensu/plugins/check-procs.rb -p 'unicorn master'"
   handlers ['slack', 'pagerduty']
   subscribers ['app']
   interval 30
-  additional(notification: 'unicorn is not running', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] unicorn is not running", occurences: 3)
 end
diff --git a/cookbooks/rubygems-sensu/recipes/balancer.rb b/cookbooks/rubygems-sensu/recipes/balancer.rb
@@ -8,15 +8,15 @@
   handlers ['slack', 'pagerduty']
   subscribers ['balancer']
   interval 30
-  additional(notification: 'nginx is not returning 200 OK on port 80', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] nginx is not returning 200 OK on port 80", occurences: 3)
 end
 
 sensu_check 'check_nginx_https' do
   command '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 --ssl -t 5 -w 1 -c 2'
   handlers ['slack', 'pagerduty']
   subscribers ['balancer']
   interval 30
-  additional(notification: 'nginx is not returning 200 OK on port 443', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] nginx is not returning 200 OK on port 443", occurences: 3)
 end
 
 sensu_check 'check_nginx_cert_expiration' do

diff --git a/cookbooks/rubygems-sensu/recipes/database.rb b/cookbooks/rubygems-sensu/recipes/database.rb
@@ -8,7 +8,7 @@
   handlers ['slack', 'pagerduty']
   subscribers ['database']
   interval 30
-  additional(notification: 'postgres is not running', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] postgres is not running", occurences: 3)
 end
 
 sensu_check 'check_postgres_connection' do

diff --git a/cookbooks/rubygems-sensu/recipes/nginx.rb b/cookbooks/rubygems-sensu/recipes/nginx.rb
@@ -8,5 +8,5 @@
   handlers ['slack', 'pagerduty']
   subscribers ['balancer', 'app']
   interval 30
-  additional(notification: 'nginx is not running', occurences: 3)
+  additional(notification: "[#{node.chef_environment}] nginx is not running", occurences: 3)
 end