remove collectd hack since it's been applied everywhere

rubygems · Mar 14, 2015 · 5d8ffa6 · 5d8ffa6
1 parent 4287ac6
commit 5d8ffa6
Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -184,7 +184,7 @@ GRAPH
   route53 (0.3.8)
     build-essential (>= 0.0.0)
   rsyslog (1.12.2)
-  rubygems (0.0.39)
+  rubygems (0.0.40)
     chef-vault (>= 0.0.0)
     datadog (>= 0.0.0)
     ohai (>= 0.0.0)

diff --git a/cookbooks/rubygems/metadata.rb b/cookbooks/rubygems/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'RubyGems base recipes'
-version          '0.0.39'
+version          '0.0.40'
 
 depends 'chef-vault'
 depends 'datadog'

diff --git a/cookbooks/rubygems/recipes/datadog.rb b/cookbooks/rubygems/recipes/datadog.rb
@@ -3,15 +3,6 @@
 # Recipe:: datadog
 #
 
-execute 'pkill-collectd' do
-  command '/usr/bin/pkill -9 collectd'
-  only_if { ::File.exist?('/usr/sbin/collectd') }
-end
-
-package 'collectd-core' do
-  action :remove
-end
-
 include_recipe 'chef-vault'
 
 datadog_creds = chef_vault_item('datadog', 'credentials')