diff --git a/README.md b/README.md index d21fc828..13da8c09 100644 --- a/README.md +++ b/README.md @@ -2000,15 +2000,16 @@ backend should have unique title: ```puppet collectd::plugin::write_graphite::carbon {'secondary_graphite': - graphitehost => 'graphite.example.org', - graphiteport => 2004, - graphiteprefix => '', - protocol => 'udp', - escapecharacter => '_', - alwaysappendds => true, - storerates => true, - separateinstances => false, - logsenderrors => true + graphitehost => 'graphite.example.org', + graphiteport => 2004, + graphiteprefix => '', + protocol => 'udp', + dropduplicatefields => false, + escapecharacter => '_', + alwaysappendds => true, + storerates => true, + separateinstances => false, + logsenderrors => true } ``` diff --git a/manifests/plugin/write_graphite/carbon.pp b/manifests/plugin/write_graphite/carbon.pp index c6979cf3..b5cf0703 100644 --- a/manifests/plugin/write_graphite/carbon.pp +++ b/manifests/plugin/write_graphite/carbon.pp @@ -1,19 +1,20 @@ # a single graphite backend define collectd::plugin::write_graphite::carbon ( - $ensure = 'present', - Stdlib::Host $graphitehost = 'localhost', - Stdlib::Port $graphiteport = 2003, - Boolean $storerates = true, - $graphiteprefix = 'collectd.', - $graphitepostfix = undef, - $interval = undef, - $escapecharacter = '_', - Boolean $alwaysappendds = false, - $protocol = 'tcp', - Boolean $separateinstances = false, - Boolean $logsenderrors = true, - Integer $reconnectinterval = 0, - Boolean $reversehost = false, + $ensure = 'present', + Stdlib::Host $graphitehost = 'localhost', + Stdlib::Port $graphiteport = 2003, + Boolean $storerates = true, + $graphiteprefix = 'collectd.', + $graphitepostfix = undef, + $interval = undef, + Boolean $dropduplicatefields = false, + $escapecharacter = '_', + Boolean $alwaysappendds = false, + $protocol = 'tcp', + Boolean $separateinstances = false, + Boolean $logsenderrors = true, + Integer $reconnectinterval = 0, + Boolean $reversehost = false, ) { include collectd include collectd::plugin::write_graphite diff --git a/templates/plugin/write_graphite/carbon.conf.erb b/templates/plugin/write_graphite/carbon.conf.erb index 87fbfa56..45c79d98 100644 --- a/templates/plugin/write_graphite/carbon.conf.erb +++ b/templates/plugin/write_graphite/carbon.conf.erb @@ -9,6 +9,7 @@ <%- if @graphitepostfix -%> Postfix "<%= @graphitepostfix %>" <%- end -%> + DropDuplicateFields "<%= @dropduplicatefields %>" EscapeCharacter "<%= @escapecharacter %>" StoreRates <%= @storerates %> AlwaysAppendDS <%= @alwaysappendds %>