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

Commit

Permalink
remove librato entirely
Browse files Browse the repository at this point in the history
Sam Kottler committed Mar 11, 2015
1 parent 5115101 commit 1a05d92
Showing 11 changed files with 28 additions and 140 deletions.
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ AllCops:
Exclude:
- vendor/**/*
- /**/files/**/*
- cookbooks/rubygems-chef/templates/default/librato.rb
- cookbooks/rubygems-chef/templates/default/slack.rb

Encoding:
3 changes: 0 additions & 3 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -38,9 +38,6 @@ cookbook 'rubygems-utility', path: 'cookbooks/rubygems-utility'
# Add cookbooks which diverge from the versions available on the community
# site.
cookbook 'bprobe', github: 'boundary/bprobe_cookbook'
cookbook 'collectd_plugins', github: 'skottler/chef-collectd_plugins'
cookbook 'collectd', github: 'librato/collectd-cookbook'
cookbook 'collectd-librato', github: 'librato/collectd-librato-cookbook'
cookbook 'dns', path: 'cookbooks/dns'
cookbook 'dnsimple', path: 'cookbooks/dnsimple'
cookbook 'duo-security', github: 'skottler/chef-duo-security'
27 changes: 4 additions & 23 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -2,15 +2,6 @@ DEPENDENCIES
bprobe
git: git://github.com/boundary/bprobe_cookbook.git
revision: 61fec6bc9873b09129f1e86b1e7ecf4c6b97ebd9
collectd
git: git://github.com/librato/collectd-cookbook.git
revision: bb26f55d7747f0f6e7de93c198161b0613fe62eb
collectd-librato
git: git://github.com/librato/collectd-librato-cookbook.git
revision: af04f6d0eded1aad02eada59e38d4a6294c66d3c
collectd_plugins
git: git://github.com/skottler/chef-collectd_plugins.git
revision: 4cbc90f319096f9c845e5f07f60c78483eeeecac
dns
path: cookbooks/dns
dnsimple
@@ -99,13 +90,6 @@ GRAPH
chef-sugar (2.5.0)
chef-vault (1.1.2)
chef_handler (1.1.6)
collectd (1.0.5)
apache2 (>= 0.0.0)
collectd-librato (0.0.5)
collectd (>= 0.0.0)
git (>= 0.0.0)
collectd_plugins (1.1.0)
collectd (>= 0.0.0)
cpan (0.0.32)
cron (1.4.0)
database (2.3.0)
@@ -199,8 +183,8 @@ GRAPH
build-essential (>= 0.0.0)
openssl (~> 4.0.0)
python (1.4.4)
apt (>= 0.0.0)
build-essential (>= 0.0.0)
yum (>= 0.0.0)
rabbitmq (3.3.0)
erlang (>= 0.9)
redisio (1.7.1)
@@ -223,7 +207,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.43)
rubygems-app (0.0.44)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
git (>= 0.0.0)
@@ -296,11 +280,8 @@ GRAPH
rubygems-logging (0.0.6)
chef-vault (>= 0.0.0)
rsyslog (>= 0.0.0)
rubygems-metrics (0.1.6)
rubygems-metrics (0.1.9)
chef-vault (>= 0.0.0)
collectd (>= 0.0.0)
collectd-librato (>= 0.0.0)
collectd_plugins (>= 0.0.0)
datadog (>= 0.0.0)
rubygems-monitoring (0.0.18)
chef-vault (>= 0.0.0)
@@ -331,7 +312,7 @@ GRAPH
rubygems (>= 0.0.0)
rubygems-ruby (0.0.5)
apt (>= 0.0.0)
rubygems-sensu (0.1.20)
rubygems-sensu (0.1.25)
build-essential (>= 0.0.0)
chef-vault (>= 0.0.0)
cpan (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-app/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-app'

version '0.0.43'
version '0.0.44'

depends 'apt'
depends 'chef-vault'
4 changes: 0 additions & 4 deletions cookbooks/rubygems-app/recipes/unicorn.rb
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
redis_ip = search('node', "name:#{redis_host}.#{node.chef_environment}.rubygems.org")[0]['ipaddress']

include_recipe 'chef-vault'
librato_creds = chef_vault_item('librato', 'credentials')

runit_service 'unicorn' do
owner 'deploy'
@@ -24,9 +23,6 @@
'RAILS_ENV' => node.chef_environment,
'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0",
'STATSD_IMPLEMENTATION' => 'datadog',
'LIBRATO_USER' => librato_creds['email'],
'LIBRATO_TOKEN' => librato_creds['token'],
'LIBRATO_PREFIX' => "app.#{node.chef_environment}"
)
options(
owner: 'deploy',
5 changes: 1 addition & 4 deletions cookbooks/rubygems-metrics/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name 'rubygems-metrics'
maintainer 'RubyGems.org ops team'

version '0.1.6'
version '0.1.9'

depends 'chef-vault'
depends 'collectd'
depends 'collectd-librato'
depends 'collectd_plugins'
depends 'datadog'
36 changes: 15 additions & 21 deletions cookbooks/rubygems-metrics/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -5,27 +5,21 @@

include_recipe 'chef-vault'

# Librato

librato_creds = chef_vault_item('librato', 'credentials')

node.default['collectd_librato']['email'] = librato_creds['email']
node.default['collectd_librato']['api_token'] = librato_creds['token']

include_recipe 'collectd'
include_recipe 'collectd-librato'

include_recipe 'collectd_plugins::cpu'
include_recipe 'collectd_plugins::df'
include_recipe 'collectd_plugins::disk'
include_recipe 'collectd_plugins::ethstat'
include_recipe 'collectd_plugins::interface'
include_recipe 'collectd_plugins::load'
include_recipe 'collectd_plugins::memory'
include_recipe 'collectd_plugins::swap'
include_recipe 'collectd_plugins::syslog'

# Datadog
package 'collectd' do
action :remove
end

%w(
/etc/collectd
/usr/lib/collectd
/opt/src/collectd-librato-0.0.10
/var/lib/collectd
).each do |dir|
directory dir do
action :delete
recursive true
end
end

datadog_creds = chef_vault_item('datadog', 'credentials')

40 changes: 0 additions & 40 deletions cookbooks/rubygems-sensu/files/default/librato-metrics.rb

This file was deleted.

2 changes: 1 addition & 1 deletion cookbooks/rubygems-sensu/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-sensu'
maintainer 'RubyGems.org ops team'

version '0.1.20'
version '0.1.25'

depends 'build-essential'
depends 'chef-vault'
23 changes: 6 additions & 17 deletions cookbooks/rubygems-sensu/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -34,7 +34,12 @@

package 'postgresql-client'

%w( check-procs.rb check_postgres.pl check_memcached.pl check_apt.sh ).each do |plugin|
%w(
check-procs.rb
check_postgres.pl
check_memcached.pl
check_apt.sh
).each do |plugin|
cookbook_file "/etc/sensu/plugins/#{plugin}" do
source plugin
path "/etc/sensu/plugins/#{plugin}"
@@ -48,20 +53,4 @@
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'
25 changes: 0 additions & 25 deletions cookbooks/rubygems-sensu/recipes/librato.rb

This file was deleted.

0 comments on commit 1a05d92

Please sign in to comment.