remove collectd postgres plugin

rubygems · Mar 12, 2015 · fa1ff8c · fa1ff8c
1 parent 567905c
commit fa1ff8c
Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -280,7 +280,7 @@ GRAPH
   rubygems-logging (0.0.6)
     chef-vault (>= 0.0.0)
     rsyslog (>= 0.0.0)
-  rubygems-metrics (0.1.9)
+  rubygems-metrics (0.1.10)
     chef-vault (>= 0.0.0)
     datadog (>= 0.0.0)
   rubygems-monitoring (0.0.19)

diff --git a/cookbooks/rubygems-metrics/metadata.rb b/cookbooks/rubygems-metrics/metadata.rb
@@ -1,7 +1,7 @@
 name 'rubygems-metrics'
 maintainer 'RubyGems.org ops team'
 
-version '0.1.9'
+version '0.1.10'
 
 depends 'chef-vault'
 depends 'datadog'
diff --git a/cookbooks/rubygems-metrics/recipes/postgresql.rb b/cookbooks/rubygems-metrics/recipes/postgresql.rb
@@ -9,15 +9,8 @@
 db_host = search(:node, "name:#{dbhostname}.#{node.chef_environment}.rubygems.org")[0]
 credentials = chef_vault_item('postgresql', 'datadog')
 
-template '/etc/collectd/plugins/postgresql.conf' do
-  owner 'root'
-  group 'root'
-  mode '644'
-  source 'postgresql.conf.erb'
-  variables(
-    password: db_host['postgresql']['password']['postgres']
-  )
-  notifies :restart, 'service[collectd]'
+file '/etc/collectd/plugins/postgresql.conf' do
+  action :delete
 end
 
 node.default['datadog']['postgres']['instances'] = [