Update module-collectd to 1830403

1830403 Merge pull request redhat-openstack#233 from pdxcat/release_320 0c4930e Release 3.2.0 c3d912b Merge pull request redhat-openstack#226 from 3dna/jmx-plugin d36948e Merge pull request redhat-openstack#232 from vchepkov/fix-pe-support 5f9b23a metadata update fcd63aa adding README.md docs for java and genericjmx 868d65a Merge pull request redhat-openstack#230 from michakrause/target_v5upgrade ac4cd27 Merge pull request redhat-openstack#229 from michakrause/rrdcached-statistics 3b3245d Merge pull request redhat-openstack#224 from 3dna/snmp-define-data-host ad60c64 Merge pull request redhat-openstack#216 from michakrause/master 05a9f02 Added v5_upgrade Plugin: https://collectd.org/wiki/index.php/Target:v5_upgrade 88fb530 added CollectStatistics option to rrdcached plugin 7822ba6 Perl Plugin: changed exec in provider 'false' case: 6064813 remove the ensure parameter 880baad Merge pull request redhat-openstack#228 from x-way/mymaster bb978ee add id and path facts to test context c605da8 set java path to undef on unsupported platforms acb5074 plugin/ntpd: IncludeUnitID option only available in collectd > 5.2 e785050 collectd doesn't auto-include its java dir in class path :( f68c147 genericjmx connection stanza 6737a8d use appropriate regex modifier 43ee029 MBean stanzas faf3c6c genericjmx plugin base d0379e7 consistency! 55054bd test the interface not the result 9276be2 collectd doesn't like having an empty <Plugin java> stanza 8031829 java plugin 64c4020 these values need to be quoted ba762bd default these to empty hashes since they can now be empty 22a1662 split out the snmp data and hosts into defines 1990227 Merge pull request redhat-openstack#223 from sijis/add_packages 06ad3cd arrayify the values and collects 15f9ec5 plugin/varnish: package should also adhere to the ensure param passed a101e47 plugin/postgresql: add package for redhat systems 1c463e3 plugin/write_riemann: add package for redhat systems a334b6e plugin/write_http: add package for redhat systems ec761d3 plugin/snmp: add package for redhat systems e9f8110 plugin/sensors: add package for redhat systems 7ffa8db plugin/python: add package for redhat systems 78e4908 plugin/ping: add package for redhat systems 4e926bc plugin/perl: add package for redhat systems a5340e5 plugin/nginx: add package for redhat systems e17fd8a plugin/mysql: add package for redhat systems 094fe12 plugin/iptables: add package for redhat systems 97e126d plugin/curl_json: add package for redhat systems ca26ce8 plugin/curl: add package for redhat systems b8fb2bc plugin/amqp: add package for redhat systems a68885e plugin/bind: add package for redhat systems a3202b0 Merge pull request redhat-openstack#222 from 3dna/snmp-template-array e900a09 arrayify the values and collects f270d16 Add puppet forge badge to the README 6dac254 Merge pull request redhat-openstack#221 from sijis/plugin_lvm fe726cb README: added lvm plugin example 7a8009b plugin/lvm: should also adhere to the ensure param passed 97cc610 added lvm plugin 71c281f Merge pull request redhat-openstack#219 from pdxcat/3.1.0 4a3179d Merge pull request redhat-openstack#220 from pdxcat/enable_docker_travisci 00ec0ed Disable sudo in .travis.yml to enable container builds 0e8a019 Release 3.1.0 9944bf1 Merge pull request redhat-openstack#202 from arioch/master cc315de Merge pull request redhat-openstack#217 from bogus-py/filecount 68ca262 Merge pull request redhat-openstack#218 from cloudevelops/update-exec-plugin 1ac0d48 exec plugin refresh 5c3779e filecount: support all options d13b812 Lintian fixes 1dff045 Merge pull request redhat-openstack#213 from petems/update_readme_with_conntrack af4eab2 Merge pull request redhat-openstack#214 from bogus-py/python e606526 plugin::python introduce ensure parameter 84fcbce Merge pull request redhat-openstack#207 from petems/add_beaker_tests 08f8528 Merge pull request redhat-openstack#211 from txaj/pass-interval-parameter 385e9e7 Merge pull request redhat-openstack#210 from txaj/fix-booleans-pulled-from-hiera 6b88f84 Add conntrack to README.md b677d5d Basic acceptance test with beaker c3a8aaa Merge branch 'master' of https://github.com/pdxcat/puppet-module-collectd 2190a9e Make plugins passing the $interval parameter 8ef18e6 Ensure variable using 'false' will be interpreted. 3fae4b2 Merge pull request redhat-openstack#200 from txaj/loadplugin-options2 3f33f0d Add rspec test to ensure the bracket syntax is using when available 2e515ea Merge pull request redhat-openstack#209 from txaj/add-conntrack 3bbfe77 Add conntrack module 5ef3917 Cleaning the now redundant LoadPlugin declaration b671d00 Uses the LoadPlugin syntax with bracket when supported 1b75c78 Merge pull request redhat-openstack#201 from bogus-py/curl c16a8d6 Merge pull request redhat-openstack#206 from muling-tt/master 3e13ce6 Merge pull request redhat-openstack#208 from pdxcat/fix_travis2 bd830de Fix travis by using plabs gemfile 1c481f7 Basic acceptance test with beaker 5802325 Add cpufreq plugin ca2f400 Add cpufreq plugin doc 3abf175 Merge pull request redhat-openstack#205 from petems/patch-1 02ca5d8 Fix Puppet deprecation warning 4d01659 curl: fix handling of some parameters 8889605 Merge pull request redhat-openstack#198 from ByteInternet/zfs_arc 0899e82 Merge pull request redhat-openstack#199 from ByteInternet/write_graphite_logsenderrors 86962bb Support LogSendErrors on the write_graphite plugin 8d457c9 Add collectd::plugin::zfs_arc 4fa9f16 Merge pull request redhat-openstack#197 from guerremdq/patch-1 520c382 Add "" to Hostname 724e215 Merge pull request redhat-openstack#196 from jpds/entropy-example-fix e9e16b7 README.md: Fixed example entropy snippet. 3b694bc Merge pull request redhat-openstack#195 from quiffman/master e58fb05 Double quote the csv plugin DataDir. bff587b Merge pull request redhat-openstack#193 from radford/curl-json-sock e606d73 Merge pull request redhat-openstack#191 from bdossantos/fix/curl_MeasureResponseTime ff1831d Merge pull request redhat-openstack#178 from joshgarnett/master 822ac69 Merge pull request redhat-openstack#192 from radford/write-http-storerates-bool 44766fb curl_json: Support reading from a unix socket b1d0f1c write_http: StoreRates is a bool, not a string 9a092b4 Use '@plugininstance' to avoid warning message about deprecation 68b7b13 Merge pull request redhat-openstack#190 from dedded/apache-fix 7489cc8 curl : 'MeasureResponseTime' needs exactly one boolean argument 2181dc4 Add collectd-apache package needed on RedHat f08d58c Merge pull request redhat-openstack#188 from cloudevelops/consolidate-python-plugin-2 a5aa0ae Merge pull request redhat-openstack#189 from cloudevelops/consolidate-curl-json-plugin 7cf838f New style naming and permissions for curl_json plugin 27ad95b Ensured deprecated file removed 462b312 Merge pull request redhat-openstack#186 from czhujer/master ebf9ae7 Merge pull request redhat-openstack#187 from rjw1/patch-1 c6abe0a add a missing p dd7f921 add missing package 6d92f5d Merge pull request redhat-openstack#185 from smoeding/fix-network-plugin 29a9837 Variables in templates should use @-notation 3b691fd Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4
xbezdick · Mar 3, 2015 · 3ae9d06 · 3ae9d06
1 parent e7ea790
commit 3ae9d06
Show file tree

Hide file tree

Showing 123 changed files with 1,917 additions and 222 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -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',

diff --git a/module-collectd/.travis.yml b/module-collectd/.travis.yml
@@ -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

diff --git a/module-collectd/CHANGELOG.md b/module-collectd/CHANGELOG.md
@@ -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:

diff --git a/module-collectd/Gemfile b/module-collectd/Gemfile
@@ -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']

diff --git a/module-collectd/README.md b/module-collectd/README.md
@@ -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