From 76dca2e808f67adfee51262ef7a4573fa72f90b6 Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Fri, 29 Apr 2011 21:13:23 -0400 Subject: [PATCH 1/7] added missing perl dependencies --- collectd/recipes/collectd_web.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/collectd/recipes/collectd_web.rb b/collectd/recipes/collectd_web.rb index a948d5b..d297f60 100644 --- a/collectd/recipes/collectd_web.rb +++ b/collectd/recipes/collectd_web.rb @@ -20,6 +20,12 @@ include_recipe "collectd" include_recipe "apache2" +%w{libjson-perl libhtml-entities-numbered-perl libhtml-parser-perl librrds-perl}.each do |pkg| + package pkg do + action :install + end +end + directory node[:collectd][:collectd_web][:path] do owner "root" group "root" From e551e78ee8c29a59cd12a4c580a6048e0af39f2d Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Fri, 29 Apr 2011 21:20:33 -0400 Subject: [PATCH 2/7] debian support --- collectd/recipes/default.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/collectd/recipes/default.rb b/collectd/recipes/default.rb index cf5277e..c6ef2c2 100644 --- a/collectd/recipes/default.rb +++ b/collectd/recipes/default.rb @@ -18,7 +18,12 @@ # package "collectd" do - package_name "collectd-core" + case node[:platform] + when "ubuntu" + package_name "collectd-core" + when "debian" + package_name "collectd" + end end service "collectd" do From 43494a20b8caa198bd63023fab1e74294e1e1951 Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Fri, 29 Apr 2011 21:50:35 -0400 Subject: [PATCH 3/7] added debian support in metadata --- collectd/metadata.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/collectd/metadata.rb b/collectd/metadata.rb index 1bcf098..250dae1 100644 --- a/collectd/metadata.rb +++ b/collectd/metadata.rb @@ -4,4 +4,7 @@ description "Install and configure the collectd monitoring daemon" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) version "1.0.0" -supports "ubuntu" + +%w{debian ubuntu}.each do |os| + supports os +end From 3beef4beb2a85018c9e3fef7958b73efc7e8d8a1 Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Mon, 2 May 2011 16:25:47 -0400 Subject: [PATCH 4/7] removed undefined blank? method, replaced with equivalent logic --- collectd/definitions/collectd_plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectd/definitions/collectd_plugin.rb b/collectd/definitions/collectd_plugin.rb index dd826e9..a1658ff 100644 --- a/collectd/definitions/collectd_plugin.rb +++ b/collectd/definitions/collectd_plugin.rb @@ -22,7 +22,7 @@ owner "root" group "root" mode "644" - if params[:template].blank? + if !params[:template].nil? && !params[:template].empty? source "plugin.conf.erb" cookbook params[:cookbook] || "collectd" else From 56b758826359c1231bdab3e1e6eda1ee7b59f4a0 Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Mon, 2 May 2011 16:26:29 -0400 Subject: [PATCH 5/7] fixed node search for chef 0.10.0 --- collectd/recipes/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectd/recipes/client.rb b/collectd/recipes/client.rb index 5c1be7d..322d62d 100644 --- a/collectd/recipes/client.rb +++ b/collectd/recipes/client.rb @@ -20,7 +20,7 @@ include_recipe "collectd" servers = [] -search(:node, 'recipes:"collectd::server"') do |n| +search(:node, 'recipes:"collectd\:\:server"') do |n| servers << n['fqdn'] end From babf9f9b053af7a3acc69c1ac829e5a44e59d97d Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Thu, 5 May 2011 13:38:49 -0400 Subject: [PATCH 6/7] correct .blank? replacement logic --- collectd/definitions/collectd_plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectd/definitions/collectd_plugin.rb b/collectd/definitions/collectd_plugin.rb index a1658ff..aec51ba 100644 --- a/collectd/definitions/collectd_plugin.rb +++ b/collectd/definitions/collectd_plugin.rb @@ -22,7 +22,7 @@ owner "root" group "root" mode "644" - if !params[:template].nil? && !params[:template].empty? + if params[:template].nil? || params[:template].empty? source "plugin.conf.erb" cookbook params[:cookbook] || "collectd" else From 137e259517c0b006ab62ee2d97e23aaad519de67 Mon Sep 17 00:00:00 2001 From: Anthony Goddard Date: Mon, 15 Aug 2011 23:18:47 -0400 Subject: [PATCH 7/7] version bump --- collectd/metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectd/metadata.rb b/collectd/metadata.rb index 250dae1..ca156e4 100644 --- a/collectd/metadata.rb +++ b/collectd/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Install and configure the collectd monitoring daemon" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "1.0.0" +version "1.0.1" %w{debian ubuntu}.each do |os| supports os