Merge pull request redhat-openstack#178 from joshgarnett/master

Adding support for WriteQueueLimitLow & WriteQueueLimitHigh
strider · Nov 13, 2014 · ff1831d · ff1831d
2 parents 822ac69 + 3b691fd
commit ff1831d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,17 +1,19 @@
 #
 class collectd(
-  $fqdnlookup         = true,
-  $collectd_hostname  = $::hostname,
-  $interval           = 10,
-  $include            = [],
-  $purge              = undef,
-  $purge_config       = false,
-  $recurse            = undef,
-  $threads            = 5,
-  $timeout            = 2,
-  $typesdb            = [],
-  $package_name       = $collectd::params::package,
-  $version            = installed,
+  $fqdnlookup             = true,
+  $collectd_hostname      = $::hostname,
+  $interval               = 10,
+  $include                = [],
+  $purge                  = undef,
+  $purge_config           = false,
+  $recurse                = undef,
+  $threads                = 5,
+  $timeout                = 2,
+  $typesdb                = [],
+  $write_queue_limit_high = undef,
+  $write_queue_limit_low  = undef,
+  $package_name           = $collectd::params::package,
+  $version                = installed,
 ) inherits collectd::params {
 
   $plugin_conf_dir = $collectd::params::plugin_conf_dir

diff --git a/templates/collectd.conf.erb b/templates/collectd.conf.erb
@@ -13,6 +13,12 @@ TypesDB<% @typesdb.each do |path| -%> "<%= path %>"<% end %>
 <% else -%>
 #TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
 <% end -%>
+<% if @write_queue_limit_high -%>
+WriteQueueLimitHigh <%= @write_queue_limit_high %>
+<% end -%>
+<% if @write_queue_limit_low -%>
+WriteQueueLimitLow <%= @write_queue_limit_low %>
+<% end -%>
 Interval <%= @interval %>
 Timeout <%= @timeout %>
 ReadThreads <%= @threads %>