Merge pull request redhat-openstack#229 from michakrause/rrdcached-st…

…atistics added CollectStatistics option to rrdcached plugin
xbezdick · Jan 24, 2015 · ac4cd27 · ac4cd27
2 parents 3b3245d + 88fb530
commit ac4cd27
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/manifests/plugin/rrdcached.pp b/manifests/plugin/rrdcached.pp
@@ -1,16 +1,17 @@
 # https://collectd.org/wiki/index.php/Rrdcached
 class collectd::plugin::rrdcached (
-  $ensure           = present,
-  $daemonaddress    = 'unix:/tmp/rrdcached.sock',
-  $datadir          = '/var/lib/rrdcached/db/collectd',
-  $createfiles      = true,
-  $createfilesasync = false,
-  $stepsize         = undef,
-  $heartbeat        = undef,
-  $interval         = undef,
-  $rrarows          = undef,
-  $rratimespan      = [],
-  $xff              = undef,
+  $ensure            = present,
+  $daemonaddress     = 'unix:/tmp/rrdcached.sock',
+  $datadir           = '/var/lib/rrdcached/db/collectd',
+  $createfiles       = true,
+  $createfilesasync  = false,
+  $stepsize          = undef,
+  $heartbeat         = undef,
+  $interval          = undef,
+  $rrarows           = undef,
+  $rratimespan       = [],
+  $xff               = undef,
+  $collectstatistics = undef,
 ) {
   validate_array($rratimespan)
   validate_bool($createfiles, $createfilesasync)

diff --git a/templates/plugin/rrdcached.conf.erb b/templates/plugin/rrdcached.conf.erb
@@ -22,4 +22,7 @@
 <% if @xff -%>
   XFF "<%= @xff %>"
 <% end -%>
+<% unless @collectstatistics.nil? -%>
+  CollectStatistics "<%= @collectstatistics %>"
+<% end -%>
 </Plugin>