Swich to skottler/chef-collectd_plugins and add ethstat and load plugins

rubygems · Jun 21, 2014 · 5eeea17 · 5eeea17
1 parent a3c9592
commit 5eeea17
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Berksfile b/Berksfile
@@ -29,6 +29,7 @@ cookbook 'rubygems-utility', path: 'cookbooks/rubygems-utility'
 # Add cookbooks which diverge from the versions available on the community
 # site.
 cookbook 'aptly', git: 'git@github.com:skottler/aptly.git', ref: 'fix_seed'
+cookbook 'collectd_plugins', git: 'git@github.com:skottler/chef-collectd_plugins.git'
 cookbook 'collectd', git: 'git@github.com:librato/collectd-cookbook.git'
 cookbook 'collectd-librato', git: 'git@github.com:librato/collectd-librato-cookbook.git'
 cookbook 'dwradcliffe-dnsimple', git: 'git@github.com:dwradcliffe/chef-dnsimple.git', branch: 'rubygems'

diff --git a/Berksfile.lock b/Berksfile.lock
@@ -9,6 +9,9 @@ DEPENDENCIES
   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
   duo-security
     git: git@github.com:skottler/chef-duo-security
     revision: 1ddec64f0798d91cf0ab1a8dd8831fb0f6694556
@@ -83,7 +86,7 @@ GRAPH
   collectd-librato (0.0.5)
     collectd (>= 0.0.0)
     git (>= 0.0.0)
-  collectd_plugins (1.0.0)
+  collectd_plugins (1.1.0)
     collectd (>= 0.0.0)
   cron (1.4.0)
   database (2.2.0)
@@ -198,7 +201,7 @@ GRAPH
     dwradcliffe-dnsimple (>= 0.0.0)
     hostname (>= 0.0.0)
   rubygems-hosts (0.0.6)
-  rubygems-metrics (0.0.3)
+  rubygems-metrics (0.0.4)
     chef-vault (>= 0.0.0)
     collectd (>= 0.0.0)
     collectd-librato (>= 0.0.0)

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.0.3'
+version '0.0.4'
 
 depends 'chef-vault'
 depends 'collectd'

diff --git a/cookbooks/rubygems-metrics/recipes/default.rb b/cookbooks/rubygems-metrics/recipes/default.rb
@@ -16,7 +16,9 @@
 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'