Add support for Chef Solo/RightScale, fill out metadata, more directive support in template

attributes/default.rb

@@ -22,6 +22,9 @@
 default[:collectd][:types_db] = ["/usr/share/collectd/types.db"]
 default[:collectd][:interval] = 10
 default[:collectd][:read_threads] = 5
+default[:collectd][:fqdn_lookup] = "true"
+default[:collectd][:hostname] = node[:fqdn]
+default[:collectd][:servers] = []
 
 default[:collectd][:collectd_web][:path] = "/srv/collectd_web"
-default[:collectd][:collectd_web][:hostname] = "collectd"
+default[:collectd][:collectd_web][:hostname] = "collectd"

metadata.rb

@@ -5,3 +5,86 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          "1.0.0"
 supports         "ubuntu"
+
+depends "apache2"
+
+%w{ debian ubuntu centos redhat fedora }.each do |os|
+  supports os
+end
+
+recipe "collectd", "Install a standalone daemon."
+recipe "collectd::client", "Install collectd and configure it to send data to a server."
+recipe "collectd::server", "Install collectd and configure it to recieve data from clients."
+recipe "collectd::collectd_web", "Installs and configures collectd_web."
+
+attribute "collectd/base_dir",
+  :display_name => "collectd Base Directory",
+  :description => "The base directory for collectd.",
+  :required => "optional",
+  :default => "/var/lib/collectd",
+  :recipes => [ "collectd::default" ]
+
+attribute "collectd/plugin_dir",
+  :display_name => "collectd Plugin Directory",
+  :description => "The plugin directory for collectd.",
+  :required => "optional",
+  :default => "/usr/lib/collectd" ,
+  :recipes => [ "collectd::default" ]
+
+attribute "collectd/types_db",
+  :display_name => "collectd Types Database",
+  :description => "The location of the collectd types.db file.",
+  :required => "optional",
+  :type => "array",
+  :default => [ "/usr/share/collectd/types.db" ],
+  :recipes => [ "collectd::default" ]
+
+attribute "collectd/interval",
+  :display_name => "collectd Polling Interval",
+  :description => "The collectd interval setting value.",
+  :required => "optional",
+  :default => "20",
+  :recipes => [ "collectd::default" ]
+
+attribute "collectd/read_threads",
+  :display_name => "collectd Read Threads",
+  :description => "The collectd read threads setting value.",
+  :required => "optional",
+  :default => "5",
+  :recipes => [ "collectd::default" ]
+
+#attribute "collectd/servers",
+#  :display_name => "collectd Servers",
+#  :description => "The collectd servers to send to as a client.",
+#  :required => "optional",
+#  :default => nil,
+#  :type => "array",
+#  :recipes => [ "collectd::client" ]
+
+attribute "collectd/hostname",
+  :display_name => "collectd Hostname",
+  :description => "The collectd Hostname setting value.",
+  :required => "optional",
+  :recipes => [ "collectd::default" ]
+
+attribute "collectd/fqdn_lookup",
+  :display_name => "collectd FQDNLookup",
+  :description => "The collectd FQDNLookup setting value.",
+  :required => "optional",
+  :recipes => [ "collectd::default" ],
+  :choice => [ "true", "false" ],
+  :default => "true"
+
+attribute "collectd/collectd_web/path",
+  :display_name => "collectd_web path",
+  :description => "The collectd_web install path.",
+  :required => "optional",
+  :default => "/srv/collectd_web",
+  :recipes => [ "collectd::collectd_web" ]
+
+attribute "collectd/collectd_web/hostname",
+  :display_name => "collectd_web hostname",
+  :description => "The collectd_web hostname.",
+  :required => "optional",
+  :default => "collectd",
+  :recipes => [ "collectd::collectd_web" ]

recipes/client.rb

@@ -19,9 +19,13 @@
 
 include_recipe "collectd"
 
-servers = []
-search(:node, 'recipes:"collectd::server"') do |n|
-  servers << n['fqdn']
+if node['collectd']['servers'] or Chef::Config[:solo]
+  servers = node['collectd']['servers']
+else
+  servers = []
+  search(:node, 'recipes:"collectd::server"') do |n|
+    servers << n['fqdn']
+  end
 end
 
 if servers.empty?
@@ -30,4 +34,4 @@
 
 collectd_plugin "network" do
   options :server=>servers
-end
+end

templates/default/collectd.conf.erb

@@ -6,8 +6,8 @@
 # You should also read /usr/share/doc/collectd/README.Debian.plugins before
 # enabling any more plugins.
 
-Hostname "<%= @node[:fqdn] %>"
-FQDNLookup true
+Hostname "<%= @node[:collectd][:hostname] %>"
+FQDNLookup <%= @node[:collectd][:fqdn_lookup] %>
 BaseDir "<%= @node[:collectd][:base_dir] %>"
 PluginDir "<%= @node[:collectd][:plugin_dir] %>"
 TypesDB "<%= @node[:collectd][:types_db].join('", "') %>"