Update module-collectd to a6c102b

a6c102b Merge pull request redhat-openstack#252 from simonpasquier/issue-251 07326b3 Drop support for Ubuntu 10.04 83095e1 Bump version in metadata.json to 3.4.0 76d4ebe Merge pull request redhat-openstack#277 from pdxcat/release_340 3f06a17 Release 3.4.0 a622ba8 Merge pull request redhat-openstack#276 from pdxcat/ruby220 e4f3a17 Add ruby 2.2.0 4b569da Merge pull request redhat-openstack#275 from pdxcat/test_puppet4 ea331d6 Drop tests for puppet 3.0 b7abefb Update all the gems 63bf721 Add puppet4 to .travis and update ruby to 2.1.6 b9b1cc1 Merge pull request redhat-openstack#270 from piotr1212/cpu_options df5d2bb Merge pull request redhat-openstack#272 from piotr1212/rake_validate_type 016458c Merge pull request redhat-openstack#273 from piotr1212/validate_re_on_int 7acc2bd Merge branch 'issue-251' of github.com:simonpasquier/puppet-module-collectd into issue-251 cff8b95 Fix collectd::plugin::write_http for RedHat a442bac plugin_cpu: add version info to readme ade651e add tests for cpu plugin f00ef92 snpm/host.pp validate_re validate on string 192eab7 quote reserved word type in tail.pp so rake validate succeeds 2c5e030 add new cpu plugin options introduced in collectd 5.5 ce656ce Fix collectd::plugin::write_http for RedHat Change-Id: I3574692a6e64c9f8a0c57c2936aee5c0ae589116
xbezdick · Jun 19, 2015 · 1fdf8af · 1fdf8af
1 parent 088d9cf
commit 1fdf8af
Show file tree

Hide file tree

Showing 12 changed files with 222 additions and 85 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -95,7 +95,7 @@ mod 'memcached',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => '27c81f69d00722ce7a6ac1e9c13b8e76fc7a5204',
+  :commit => 'a6c102b528946a22449ffdfb615db92eab3b3f96',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',

diff --git a/module-collectd/.travis.yml b/module-collectd/.travis.yml
@@ -2,21 +2,21 @@
 sudo: false
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script:
+  - 'puppet --version'
+  - 'bundle exec rake validate'
+  - 'bundle exec rake lint'
+  - "bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.2.0
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false
diff --git a/module-collectd/CHANGELOG.md b/module-collectd/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 2015-06-16 Release 3.4.0
+
+### Backwards-incompatible changes:
+
+* Implement support for mupltiple Python modules
+
+### Bug fixes
+
+* snmp/host.pp validate_re validate on string
+* quote reserved word type in tail.pp
+
+### New features
+
+* add new cpu plugin options introduced in collectd 5.5
+* Added absent timers for statsd module.
+
+### Testing enhancements
+
+* Add ruby 2.2.0 to TravisCI
+* Add puppet4 to .travis and update ruby to 2.1.6
+* Add metadata-json-lint gem
+
 ## 2015-04-22 Release 3.3.0
 
 ### Backwards-incompatible changes:

diff --git a/module-collectd/Gemfile.lock b/module-collectd/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
-    activesupport (4.2.1)
+    CFPropertyList (2.2.8)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -18,13 +18,13 @@ GEM
     aws-sdk-v1 (1.64.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.10.0)
+    beaker (2.14.1)
       aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)
       fog (~> 1.25)
       google-api-client (~> 0.8)
-      hocon (~> 0.0.4)
+      hocon (~> 0.1)
       inifile (~> 2.0)
       json (~> 1.8)
       minitest (~> 5.4)
@@ -33,30 +33,32 @@ GEM
       rbvmomi (~> 1.8)
       rsync (~> 1.0.9)
       unf (~> 0.1)
-    beaker-rspec (5.0.2)
+    beaker-rspec (5.1.0)
       beaker (~> 2.0)
       rspec
       serverspec (~> 2)
       specinfra (~> 2)
     builder (3.2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.21.1)
+    docker-api (1.21.4)
       excon (>= 0.38.0)
       json
     excon (0.45.3)
     extlib (0.9.16)
-    facter (1.7.6)
+    facter (2.4.4)
+      CFPropertyList (~> 2.2.6)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.29.0)
+    fog (1.31.0)
       fog-atmos
       fog-aws (~> 0.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.27, >= 1.27.4)
+      fog-core (~> 1.30)
       fog-ecloud
+      fog-google (>= 0.0.2)
       fog-json
       fog-local
       fog-powerdns (>= 0.1.1)
@@ -76,7 +78,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.1.2)
+    fog-aws (0.4.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -92,19 +94,23 @@ GEM
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.1)
+    fog-ecloud (0.1.3)
       fog-core
       fog-xml
-    fog-json (1.0.1)
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
       fog-core (~> 1.0)
-      multi_json (~> 1.0)
+      multi_json (~> 1.10)
     fog-local (0.2.1)
       fog-core (~> 1.27)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.2)
+    fog-profitbricks (0.0.3)
       fog-core
       fog-xml
       nokogiri
@@ -122,7 +128,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.5)
+    fog-softlayer (0.4.6)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -152,37 +158,37 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.0)
+    googleauth (0.4.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
-      logging (~> 1.8)
-      memoist (~> 0.11)
+      logging (~> 2.0)
+      memoist (~> 0.12)
       multi_json (= 1.11)
       signet (~> 0.6)
-    hiera (1.3.4)
+    hiera (2.0.0)
       json_pure
-    hocon (0.0.7)
+    hocon (0.9.0)
     i18n (0.7.0)
     inflecto (0.0.2)
     inifile (2.0.2)
     ipaddress (0.8.0)
-    json (1.8.2)
+    json (1.8.3)
     json_pure (1.8.2)
-    jwt (1.4.1)
+    jwt (1.5.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.3)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     memoist (0.12.0)
     metaclass (0.0.4)
     metadata-json-lint (0.0.6)
       json
       spdx-licenses (~> 1.0)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.0)
+    minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.0)
@@ -192,15 +198,15 @@ GEM
     net-ssh (2.9.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    puppet (3.7.5)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
+    puppet (4.1.0)
+      facter (> 2.0, < 4)
+      hiera (>= 2.0, < 3)
       json_pure
     puppet-lint (1.1.0)
     puppet-syntax (2.0.0)
       rake
     puppet_facts (0.2.1)
-    puppetlabs_spec_helper (0.10.2)
+    puppetlabs_spec_helper (0.10.3)
       mocha
       puppet-lint
       puppet-syntax
@@ -212,35 +218,35 @@ GEM
       nokogiri (>= 1.4.1)
       trollop
     retriable (1.4.1)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.3.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.2.1)
+    rspec-mocks (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-puppet (2.1.0)
+      rspec-support (~> 3.3.0)
+    rspec-puppet (2.2.0)
       rspec
-    rspec-support (3.2.2)
+    rspec-support (3.3.0)
     rsync (1.0.9)
-    serverspec (2.14.1)
+    serverspec (2.18.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.25)
-    signet (0.6.0)
+      specinfra (~> 2.35)
+    signet (0.6.1)
       addressable (~> 2.3)
       extlib (~> 0.9)
       faraday (~> 0.9)
-      jwt (~> 1.0)
+      jwt (~> 1.5)
       multi_json (~> 1.10)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -249,7 +255,7 @@ GEM
     simplecov-html (0.10.0)
     spdx-licenses (1.0.0)
       json
-    specinfra (2.30.0)
+    specinfra (2.36.0)
       net-scp
       net-ssh
     thread_safe (0.3.5)
@@ -276,3 +282,6 @@ DEPENDENCIES
   rspec-puppet
   serverspec
   simplecov
+
+BUNDLED WITH
+   1.10.3
diff --git a/module-collectd/README.md b/module-collectd/README.md
@@ -158,8 +158,17 @@ class { 'collectd::plugin::conntrack':
 
 ####Class: `collectd::plugin::cpu`
 
+ * `reportbystate` available from collectd version >= 5.5
+ * `reportbycpu` available from collectd version >= 5.5
+ * `valuespercentage` available from collectd version >= 5.5
+
+ See [collectd plugin_cpu documentation](https://collectd.org/documentation/manpages/collectd.conf.5.shtml#plugin_cpu) for more details.
+
 ```puppet
 class { 'collectd::plugin::cpu':
+  reportbystate => true,
+  reportbycpu => true,
+  valuespercentage => true,
 }
 
 
@@ -977,4 +986,4 @@ This module shall not use unsupported configuration directives. Look at [templat
 
 Please make use of the search by branch/tags on the collectd github to see when a function has been first released.
 
-Reading the [collectd.conf.pod](https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod) file is good, validating the presence of the code in the .c files is even better.
+Reading the [collectd.conf.pod](https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod) file is good, validating the presence of the code in the .c files is even better.
diff --git a/module-collectd/manifests/plugin/cpu.pp b/module-collectd/manifests/plugin/cpu.pp
@@ -1,10 +1,21 @@
 # https://collectd.org/wiki/index.php/Plugin:CPU
 class collectd::plugin::cpu (
-  $ensure   = present,
-  $interval = undef,
+  $ensure           = present,
+  $reportbystate    = true,
+  $reportbycpu      = true,
+  $valuespercentage = false,
+  $interval         = undef,
 ) {
+
+  validate_bool(
+    $reportbystate,
+    $reportbycpu,
+    $valuespercentage,
+  )
+
   collectd::plugin {'cpu':
     ensure   => $ensure,
+    content  => template('collectd/plugin/cpu.conf.erb'),
     interval => $interval,
   }
 }
diff --git a/module-collectd/manifests/plugin/snmp/host.pp b/module-collectd/manifests/plugin/snmp/host.pp
@@ -3,7 +3,7 @@
   $collect,
   $ensure = present,
   $address = $name,
-  $version = 1,
+  $version = '1',
   $community = 'public',
   $interval = undef,
 ) {

diff --git a/module-collectd/manifests/plugin/write_http.pp b/module-collectd/manifests/plugin/write_http.pp
@@ -7,12 +7,6 @@
 
   validate_hash($urls)
 
-  if $::osfamily == 'Redhat' {
-    package { 'collectd-write_http':
-      ensure => $ensure,
-    }
-  }
-
   collectd::plugin {'write_http':
     ensure   => $ensure,
     content  => template('collectd/plugin/write_http.conf.erb'),