reorganize rubygems-sensu recipes

rubygems · Sep 27, 2014 · 1015b27 · 1015b27
1 parent 1f76b2f
commit 1015b27
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 47 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -280,7 +280,7 @@ GRAPH
     nginx (>= 0.0.0)
     rubygems (>= 0.0.0)
   rubygems-ruby (0.0.3)
-  rubygems-sensu (0.0.98)
+  rubygems-sensu (0.0.99)
     build-essential (>= 0.0.0)
     chef-vault (>= 0.0.0)
     cpan (>= 0.0.0)

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.98'
+version '0.0.99'
 
 depends 'build-essential'
 depends 'chef-vault'

diff --git a/cookbooks/rubygems-sensu/recipes/base.rb b/cookbooks/rubygems-sensu/recipes/base.rb
@@ -3,23 +3,6 @@
 # Recipe:: base
 #
 
-gem_package 'sensu-plugin' do
-  gem_binary '/opt/sensu/embedded/bin/gem'
-end
-
-package 'nagios-plugins'
-
-%w( check-procs.rb check_postgres.pl check_memcached.pl ).each do |plugin|
-  cookbook_file "/etc/sensu/plugins/#{plugin}" do
-    source plugin
-    path "/etc/sensu/plugins/#{plugin}"
-    owner 'sensu'
-    group 'sensu'
-    mode '0755'
-    action :create
-  end
-end
-
 sensu_check 'check_procs' do
   command '/opt/sensu/embedded/bin/ruby /etc/sensu/plugins/check-procs.rb'
   handlers ['slack', 'pagerduty']

diff --git a/cookbooks/rubygems-sensu/recipes/cache.rb b/cookbooks/rubygems-sensu/recipes/cache.rb
@@ -3,25 +3,6 @@
 # Recipe:: cache
 #
 
-include_recipe 'build-essential'
-include_recipe 'cpan'
-
-cpan_client 'Cache::Memcached' do
-  user 'root'
-  group 'root'
-  force true
-  install_type 'cpan_module'
-  action 'install'
-end
-
-cpan_client 'String::CRC32' do
-  user 'root'
-  group 'root'
-  force true
-  install_type 'cpan_module'
-  action 'install'
-end
-
 sensu_check 'check_memcached_proc' do
   command "/opt/sensu/embedded/bin/ruby /etc/sensu/plugins/check-procs.rb -p 'memcached -v'"
   handlers ['slack', 'pagerduty']

diff --git a/cookbooks/rubygems-sensu/recipes/default.rb b/cookbooks/rubygems-sensu/recipes/default.rb
@@ -28,10 +28,40 @@
   additional(environment: node.chef_environment)
 end
 
-include_recipe 'rubygems-sensu::app'
-include_recipe 'rubygems-sensu::balancer'
-include_recipe 'rubygems-sensu::base'
-include_recipe 'rubygems-sensu::cache'
-include_recipe 'rubygems-sensu::database'
-include_recipe 'rubygems-sensu::nginx'
+gem_package 'sensu-plugin' do
+  gem_binary '/opt/sensu/embedded/bin/gem'
+end
+
+package 'nagios-plugins'
+
+%w( check-procs.rb check_postgres.pl check_memcached.pl ).each do |plugin|
+  cookbook_file "/etc/sensu/plugins/#{plugin}" do
+    source plugin
+    path "/etc/sensu/plugins/#{plugin}"
+    owner 'sensu'
+    group 'sensu'
+    mode '0755'
+    action :create
+  end
+end
+
+include_recipe 'build-essential'
+include_recipe 'cpan'
+
+cpan_client 'Cache::Memcached' do
+  user 'root'
+  group 'root'
+  force true
+  install_type 'cpan_module'
+  action 'install'
+end
+
+cpan_client 'String::CRC32' do
+  user 'root'
+  group 'root'
+  force true
+  install_type 'cpan_module'
+  action 'install'
+end
+
 include_recipe 'sensu::client_service'
diff --git a/cookbooks/rubygems-sensu/recipes/server.rb b/cookbooks/rubygems-sensu/recipes/server.rb
@@ -33,3 +33,10 @@
 include_recipe 'sensu::server_service'
 include_recipe 'sensu::api_service'
 include_recipe 'sensu::dashboard_service'
+
+include_recipe 'rubygems-sensu::app'
+include_recipe 'rubygems-sensu::balancer'
+include_recipe 'rubygems-sensu::base'
+include_recipe 'rubygems-sensu::cache'
+include_recipe 'rubygems-sensu::database'
+include_recipe 'rubygems-sensu::nginx'
diff --git a/environments/common.json b/environments/common.json
@@ -25,7 +25,7 @@
         "rubygems-people": "= 0.0.29",
         "rubygems-redis": "= 0.0.5",
         "rubygems-repo": "= 0.0.26",
-        "rubygems-sensu": "= 0.0.98",
+        "rubygems-sensu": "= 0.0.99",
         "rubygems-ssh": "= 0.0.5",
         "rubygems-utility": "= 0.0.7"
     },

diff --git a/environments/production.json b/environments/production.json
@@ -25,7 +25,7 @@
         "rubygems-people": "= 0.0.29",
         "rubygems-redis": "= 0.0.5",
         "rubygems-repo": "= 0.0.26",
-        "rubygems-sensu": "= 0.0.98",
+        "rubygems-sensu": "= 0.0.99",
         "rubygems-ssh": "= 0.0.5",
         "rubygems-utility": "= 0.0.7"
     },

diff --git a/environments/staging.json b/environments/staging.json
@@ -25,7 +25,7 @@
         "rubygems-people": "= 0.0.29",
         "rubygems-redis": "= 0.0.5",
         "rubygems-repo": "= 0.0.26",
-        "rubygems-sensu": "= 0.0.98",
+        "rubygems-sensu": "= 0.0.99",
         "rubygems-ssh": "= 0.0.5",
         "rubygems-utility": "= 0.0.7"
     },