Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
merge rubygems-monitoring into rubygems-sensu
Browse files Browse the repository at this point in the history
dwradcliffe committed Mar 15, 2015
1 parent 9fb3937 commit c1f5163
Showing 13 changed files with 30 additions and 184 deletions.
1 change: 0 additions & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ cookbook 'rubygems-hostname', path: 'cookbooks/rubygems-hostname'
cookbook 'rubygems-hosts', path: 'cookbooks/rubygems-hosts'
cookbook 'rubygems-hubot', path: 'cookbooks/rubygems-hubot'
cookbook 'rubygems-logging', path: 'cookbooks/rubygems-logging'
cookbook 'rubygems-monitoring', path: 'cookbooks/rubygems-monitoring'
cookbook 'rubygems-motd', path: 'cookbooks/rubygems-motd'
cookbook 'rubygems-ntp', path: 'cookbooks/rubygems-ntp'
cookbook 'rubygems-people', path: 'cookbooks/rubygems-people'
17 changes: 4 additions & 13 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -38,8 +38,6 @@ DEPENDENCIES
path: cookbooks/rubygems-hubot
rubygems-logging
path: cookbooks/rubygems-logging
rubygems-monitoring
path: cookbooks/rubygems-monitoring
rubygems-motd
path: cookbooks/rubygems-motd
rubygems-ntp
@@ -77,7 +75,6 @@ GRAPH
chef-sugar (2.5.0)
chef-vault (1.1.2)
chef_handler (1.1.6)
cpan (0.0.32)
cron (1.4.0)
database (2.3.0)
aws (>= 0.0.0)
@@ -253,15 +250,6 @@ GRAPH
rubygems-logging (0.0.6)
chef-vault (>= 0.0.0)
rsyslog (>= 0.0.0)
rubygems-monitoring (0.0.20)
chef-vault (>= 0.0.0)
cpan (>= 0.0.0)
dnsimple (>= 0.0.0)
nginx (>= 0.0.0)
nodejs (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-sensu (>= 0.0.0)
runit (>= 0.0.0)
rubygems-motd (0.0.9)
motd (>= 0.0.0)
rubygems-ntp (0.0.3)
@@ -282,9 +270,12 @@ GRAPH
rubygems (>= 0.0.0)
rubygems-ruby (0.0.5)
apt (>= 0.0.0)
rubygems-sensu (0.1.29)
rubygems-sensu (0.1.30)
build-essential (>= 0.0.0)
chef-vault (>= 0.0.0)
dnsimple (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
sensu (= 2.1.0)
uchiwa (= 1.0.0)
rubygems-ssh (0.0.5)
15 changes: 0 additions & 15 deletions cookbooks/rubygems-monitoring/metadata.rb

This file was deleted.

24 changes: 0 additions & 24 deletions cookbooks/rubygems-monitoring/recipes/default.rb

This file was deleted.

69 changes: 0 additions & 69 deletions cookbooks/rubygems-monitoring/recipes/doorman.rb

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions cookbooks/rubygems-monitoring/templates/default/sv-doorman-run.erb

This file was deleted.

5 changes: 4 additions & 1 deletion cookbooks/rubygems-sensu/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name 'rubygems-sensu'
maintainer 'RubyGems.org ops team'

version '0.1.29'
version '0.1.30'

depends 'build-essential'
depends 'chef-vault'
depends 'dnsimple'
depends 'nginx'
depends 'rubygems'
depends 'sensu', '2.1.0'
depends 'uchiwa', '1.0.0'

4 changes: 2 additions & 2 deletions cookbooks/rubygems-sensu/recipes/server.rb
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@
include_recipe 'sensu::server_service'
include_recipe 'sensu::api_service'

include_recipe 'rubygems-sensu::uchiwa'

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'

include_recipe 'rubygems-sensu::uchiwa'
17 changes: 17 additions & 0 deletions cookbooks/rubygems-sensu/recipes/uchiwa.rb
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
# Recipe:: uchiwa
#

include_recipe 'rubygems'

include_recipe 'chef-vault'

sensu_creds = chef_vault_item('sensu', 'credentials')
@@ -17,3 +19,18 @@
end

include_recipe 'uchiwa'

include_recipe 'rubygems-sensu::uchiwa_nginx'

dnsimple_credentials = chef_vault_item('dnsimple', 'credentials')

include_recipe 'dnsimple'

dnsimple_record "create CNAME point monitoring.rubygems.org to #{node.name}" do
name 'monitoring.rubygems.org'
content node['fqdn']
type 'CNAME'
domain 'rubygems.org'
domain_api_token dnsimple_credentials['api_token']
action :create
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Cookbook Name:: rubygems-monitoring
# Recipe:: nginx
# Cookbook Name:: rubygems-sensu
# Recipe:: uchiwa_nginx
#

node.default['nginx']['server_tokens'] = 'off'
2 changes: 1 addition & 1 deletion roles/monitoring.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'monitoring'
description 'Monitoring servers'
run_list(
'recipe[rubygems-monitoring]'
'recipe[rubygems-sensu::server]'
)

0 comments on commit c1f5163

Please sign in to comment.