From 3b691fdff1b50becb794d201bea1c47d3f88fd48 Mon Sep 17 00:00:00 2001 From: Joshua Garnett Date: Thu, 11 Sep 2014 22:01:50 -0400 Subject: [PATCH] Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4 --- manifests/init.pp | 26 ++++++++++++++------------ templates/collectd.conf.erb | 6 ++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1e2656522..7f8703fe8 100644 --- 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 index 0d1f36956..3128790ce 100644 --- 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 %>