strider
diff --git a/‎Puppetfile‎
Lines changed: 1 addition & 1 deletion b/‎Puppetfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎module-collectd/.travis.yml‎
Lines changed: 2 additions & 1 deletion b/‎module-collectd/.travis.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎module-collectd/CHANGELOG.md‎
Lines changed: 99 additions & 0 deletions b/‎module-collectd/CHANGELOG.md‎
Lines changed: 99 additions & 0 deletions
diff --git a/‎module-collectd/Gemfile‎
Lines changed: 13 additions & 10 deletions b/‎module-collectd/Gemfile‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎module-collectd/README.md‎
Lines changed: 114 additions & 3 deletions b/‎module-collectd/README.md‎
Lines changed: 114 additions & 3 deletions
@@ -83,7 +83,7 @@ mod 'memcached',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => 'cf79540be4623eb9da287f6d579ec4a4f4ddc39b',
+  :commit => '1830403421c03c10a00552075e164214e97c86da',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',
 
@@ -1,6 +1,7 @@
 ---
+sudo: false
 language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
 
@@ -1,3 +1,102 @@
+## 2015-01-24 Release 3.2.0
+
+### Backwards-incompatible changes:
+
+There are no known backwards compat changes, please add them to the
+CHANGELOG if you find one.
+
+### Summary:
+
+The release adds support for 4 new plugins and adds redhat package
+support to a large number of plugins.
+
+### New Plugins:
+
+* collectd::plugin::genericjmx
+* collectd::plugin::java
+* collectd::plugin::target_v5upgrade
+* collectd::plugin::lvm
+
+### Features:
+
+* plugin/rrdcached: Add CollectStatistics option
+* plugin/ntpd: Add IncludeUnitID option
+
+### Bugs/Maint:
+
+* Update metadata for more PE versions
+* plugin/perl: changed exec in provider 'false' case
+* plugin/varnish: package resouce ensure param passed
+* plugin/postgresql: add package for redhat systems
+* plugin/write_riemann: add package for redhat systems
+* plugin/write_http: add package for redhat systems
+* plugin/snmp: add package for redhat systems
+* plugin/sensors: add package for redhat systems
+* plugin/python: add package for redhat systems
+* plugin/ping: add package for redhat systems
+* plugin/perl: add package for redhat systems
+* plugin/nginx: add package for redhat systems
+* plugin/mysql: add package for redhat systems
+* plugin/iptables: add package for redhat systems
+* plugin/curl_json: add package for redhat systems
+* plugin/curl: add package for redhat systems
+* plugin/amqp: add package for redhat systems
+* plugin/bind: add package for redhat systems
+
+## 2014-12-26 Release 3.1.0
+
+### Backwards-incompatible changes:
+
+There are no known backwards compat changes, please add them to the
+CHANGELOG if you find one.
+
+### Summary:
+
+This release introduces support for 3 new plugins, new parameters for existing
+plugins, bugfixes, doc improvments and basic acceptance tests with beaker.
+
+### New Plugins:
+
+* Add conntrack module
+* Add cpufreq plugin
+* Add collectd::plugin::zfs_arc
+
+### Features:
+
+* filecount: support all options
+* plugin::python introduce ensure parameter
+* Make plugins passing the $interval parameter
+* Support LogSendErrors on the write_graphite plugin
+* curl: fix handling of some parameters
+* curl_json: Support reading from a unix socket
+* Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4
+
+### Bugs/Maint:
+
+* Lintian fixes
+* Ensure variable using 'false' will be interpreted.
+* Cleaning the now redundant LoadPlugin declaration
+* Uses the LoadPlugin syntax with bracket when supported
+* Fix Puppet deprecation warning
+* Add "" to Hostname
+* Double quote the csv plugin DataDir.
+* write_http: StoreRates is a bool, not a string
+* curl : 'MeasureResponseTime' needs exactly one boolean argument
+* Add collectd-apache package needed on RedHat
+* Variables in templates should use @-notation
+
+### Tests:
+
+* Basic acceptance test with beaker
+* Add rspec test to ensure the bracket syntax is using when available
+* Fix travis by using plabs gemfile
+
+### Docs:
+
+* Add conntrack to README.md
+* Add cpufreq plugin doc
+* README.md: Fixed example entropy snippet.
+
 ## 2014-10-04 Release 3.0.1
 
 ### Backwards-incompatible changes:
 
@@ -1,15 +1,18 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
+group :development, :unit_tests do
+  gem 'rake', :require => false
+  gem 'rspec-puppet', :require => false
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'puppet-lint', :require => false
+  gem 'simplecov', :require => false
+  gem 'puppet_facts', :require => false
+  gem 'json', :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec', :require => false
+  gem 'serverspec', :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
 
@@ -1,7 +1,7 @@
 Collectd module for Puppet
 ==========================
 
-[![Build Status](https://travis-ci.org/pdxcat/puppet-module-collectd.png?branch=master)](https://travis-ci.org/pdxcat/puppet-module-collectd)
+[![Puppet Forge](http://img.shields.io/puppetforge/v/pdxcat/collectd.svg)](https://forge.puppetlabs.com/pdxcat/collectd) [![Build Status](https://travis-ci.org/pdxcat/puppet-module-collectd.png?branch=master)](https://travis-ci.org/pdxcat/puppet-module-collectd)
 
 Description
 -----------
@@ -58,7 +58,9 @@ documentation for each plugin for configurable attributes.
 * `amqp`  (see [collectd::plugin::amqp](#class-collectdpluginamqp) below)
 * `apache`  (see [collectd::plugin::apache](#class-collectdpluginapache) below)
 * `bind`  (see [collectd::plugin::bind](#class-collectdpluginbind) below)
+* `conntrack`  (see [collectd::plugin::conntrack](#class-conntrack) below)
 * `cpu`  (see [collectd::plugin::cpu](#class-collectdplugincpu) below)
+* `cpufreq`  (see [collectd::plugin::cpufreq](#class-collectdplugincpufreq) below)
 * `csv`  (see [collectd::plugin::csv](#class-collectdplugincsv) below)
 * `curl` (see [collectd::plugin::curl](#class-collectdplugincurl) below)
 * `curl_json` (see [collectd::plugin::curl_json](#class-collectdplugincurl_json) below)
@@ -67,12 +69,15 @@ documentation for each plugin for configurable attributes.
 * `entropy`  (see [collectd::plugin::entropy](#class-collectdpluginentropy) below)
 * `exec`  (see [collectd::plugin::exec](#class-collectdpluginexec) below)
 * `filecount` (see [collectd::plugin::filecount](#class-collectdpluginfilecount) below)
+* `genericjmx` (see [collectd::plugin::genericjmx](#class-collectdplugingenericjmx) below)
 * `interface` (see [collectd::plugin::interface](#class-collectdplugininterface) below)
 * `iptables` (see [collectd::plugin::iptables](#class-collectdpluginiptables) below)
 * `irq` (see [collectd::plugin::irq](#class-collectdpluginirq) below)
+* `java` (see [collectd::plugin::java](#class-collectdpluginjava) below)
 * `load` (see [collectd::plugin::load](#class-collectdpluginload) below)
 * `logfile` (see [collectd::plugin::logfile](#class-collectdpluginlogfile) below)
 * `libvirt` (see [collectd::plugin::libvirt](#class-collectdpluginlibvirt) below)
+* `lvm` (see [collectd::plugin::lvm](#class-collectdpluginlvm) below)
 * `memcached`(see [collectd::plugin::memcached](#class-collectdpluginmemcached) below )
 * `memory`(see [collectd::plugin::memory](#class-collectdpluginmemory) below )
 * `mysql` (see [collectd::plugin::mysql](#class-collectdpluginmysql) below)
@@ -95,6 +100,7 @@ documentation for each plugin for configurable attributes.
 * `swap` (see [collectd::plugin::swap](#class-collectdpluginswap) below)
 * `syslog` (see [collectd::plugin::syslog](#class-collectdpluginsyslog) below)
 * `tail` (see [collectd::plugin::tail](#class-collectdplugintail) below)
+* `target_v5upgrade` (see [collectd::plugin::target_v5upgrade](#class-collectdplugintarget_v5upgrade) below)
 * `tcpconns` (see [collectd::plugin::tcpconns](#class-collectdplugintcpconns) below)
 * `unixsock` (see [collectd::plugin::unixsock](#class-collectdpluginunixsock) below)
 * `uptime` (see [collectd::plugin::uptime](#class-collectdpluginuptime) below)
@@ -105,6 +111,7 @@ documentation for each plugin for configurable attributes.
 * `write_http` (see [collectd::plugin::write_http](#class-collectdpluginwrite_http) below)
 * `write_network` (see [collectd::plugin::write_network](#class-collectdpluginwrite_network) below)
 * `write_riemann` (see [collectd::plugin::write_riemann](#class-collectdpluginwrite_riemann) below)
+* `zfs_arc` (see [collectd::plugin::zfs_arc](#class-collectdpluginzfs_arc) below)
 
 ####Class: `collectd::plugin::amqp`
 
@@ -140,11 +147,28 @@ class { 'collectd::plugin::bind':
 }
 ```
 
+####Class: `collectd::plugin::conntrack`
+
+```puppet
+class { 'collectd::plugin::conntrack':
+}
+
+
+```
+
 ####Class: `collectd::plugin::cpu`
 
 ```puppet
 class { 'collectd::plugin::cpu':
 }
+
+
+```
+####Class: `collectd::plugin::cpufreq`
+
+```puppet
+class { 'collectd::plugin::cpufreq':
+}
 ```
 
 ####Class: `collectd::plugin::csv`
@@ -231,7 +255,7 @@ class { 'collectd::plugin::disk':
 ####Class: `collectd::plugin::entropy`
 
 ```puppet
-collectd::plugin::entropy {
+class { 'collectd::plugin::entropy':
 }
 ```
 
@@ -248,6 +272,31 @@ collectd::plugin::exec {
 
 ####Class: `collectd::plugin::filecount`
 
+```puppet
+collectd::plugin::filecount::directory {'foodir':
+  path          => '/path/to/dir',
+  pattern       => '*.conf',
+  mtime         => '-5m',
+  recursive     => true,
+  includehidden => false
+}
+
+```
+You can also configure this plugin with a parameterized class:
+```puppet
+class { 'collectd::plugin::filecount':
+  directories => {
+    'foodir' => {
+      'path'          => '/path/to/dir',
+      'pattern'       => '*.conf',
+      'mtime'         => '-5m',
+      'recursive'     => true,
+      'includehidden' => false
+      },
+  },
+}
+```
+For backwards compatibility:
 ```puppet
 class { 'collectd::plugin::filecount':
   directories => {
@@ -256,6 +305,41 @@ class { 'collectd::plugin::filecount':
   },
 }
 ```
+
+####Class: `collectd::plugin::genericjmx`
+
+```puppet
+include collectd::plugin::genericjmx
+
+collectd::plugin::genericjmx::mbean {
+  'garbage_collector':
+    object_name     => 'java.lang:type=GarbageCollector,*',
+    instance_prefix => 'gc-',
+    instance_from   => 'name',
+    values          => [
+      {
+        type      => 'invocations',
+        table     => false,
+        attribute => 'CollectionCount',
+      },
+      {
+        type            => 'total_time_in_ms',
+        instance_prefix => 'collection_time',
+        table           => false,
+        attribute       => 'CollectionTime',
+      },
+    ];
+}
+
+collectd::plugin::genericjmx::connection {
+  'java_app':
+    host            => $fqdn,
+    service_url     => 'service:jmx:rmi:///jndi/rmi://localhost:3637/jmxrmi',
+    collect         => [ 'memory-heap', 'memory-nonheap','garbage_collector' ],
+}
+
+```
+
 ####Class: `collectd::plugin::interface`
 
 ```puppet
@@ -285,6 +369,12 @@ class { 'collectd::plugin::iptables':
 }
 ```
 
+####Class: `collectd::plugin::java`
+
+```puppet
+class { 'collectd::plugin::java': }
+```
+
 ####Class: `collectd::plugin::load`
 
 ```puppet
@@ -313,6 +403,12 @@ class { 'collectd::plugin::libvirt':
 }
 ```
 
+####Class: `collectd::plugin::lvm`
+
+```puppet
+class { 'collectd::plugin::lvm': }
+```
+
 ####Class: `collectd::plugin::memcached`
 
 ```puppet
@@ -668,6 +764,13 @@ class { 'collectd::plugin::syslog':
 }
 ```
 
+####Class: `collectd::plugin::target_v5upgrade`
+
+```puppet
+class { 'collectd::plugin::target_v5upgrade':
+}
+```
+
 ####Class: `collectd::plugin::tcpconns`
 
 ```puppet
@@ -756,7 +859,7 @@ class { 'collectd::plugin::vmem':
 
 ```puppet
 class { 'collectd::plugin::write_graphite':
-  graphitehost => 'graphite.examle.org',
+  graphitehost => 'graphite.example.org',
 }
 ```
 
@@ -793,6 +896,14 @@ class { 'collectd::plugin::write_riemann':
 }
 ```
 
+
+####Class: `collectd::plugin::zfs_arc`
+
+```puppet
+class { 'collectd::plugin::zfs_arc':
+}
+```
+
 ##Limitations
 
 See metadata.json for supported platforms