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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: afd0f9a473e2
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9360469b5e45
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 14, 2015

  1. jank temporary hack to get collectd-core to cleanly get removed from … 

    …the system
    Sam Kottler committed Mar 14, 2015
    Copy the full SHA
    989a235 View commit details

  2. single quote collectd-core to make david happy

    Sam Kottler committed Mar 14, 2015
    Copy the full SHA
    9360469 View commit details
Showing with 11 additions and 2 deletions.
  1. +1 −1 Berksfile.lock
  2. +1 −1 cookbooks/rubygems/metadata.rb
  3. +9 −0 cookbooks/rubygems/recipes/datadog.rb
2 changes: 1 addition & 1 deletion Berksfile.lock
View file
Original file line number Diff line number Diff line change
@@ -184,7 +184,7 @@ GRAPH
route53 (0.3.8)
build-essential (>= 0.0.0)
rsyslog (1.12.2)
rubygems (0.0.36)
rubygems (0.0.38)
chef-vault (>= 0.0.0)
datadog (>= 0.0.0)
ohai (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems/metadata.rb
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
maintainer 'RubyGems.org Ops Team'
license 'MIT'
description 'RubyGems base recipes'
version '0.0.36'
version '0.0.39'

depends 'chef-vault'
depends 'datadog'
9 changes: 9 additions & 0 deletions cookbooks/rubygems/recipes/datadog.rb
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,15 @@
# 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')