diff --git a/Puppetfile b/Puppetfile index 88e214070..32f8625be 100644 --- a/Puppetfile +++ b/Puppetfile @@ -83,7 +83,7 @@ mod 'memcached', :git => 'https://github.com/saz/puppet-memcached.git' mod 'module-collectd', - :commit => '1830403421c03c10a00552075e164214e97c86da', + :commit => '91e1dafad3182e64979dfeba1633f0b32bcc0649', :git => 'https://github.com/pdxcat/puppet-module-collectd.git' mod 'module-data', diff --git a/module-collectd/.travis.yml b/module-collectd/.travis.yml index 675c467d9..ba1771143 100644 --- a/module-collectd/.travis.yml +++ b/module-collectd/.travis.yml @@ -6,10 +6,6 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake matrix: fast_finish: true include: - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 diff --git a/module-collectd/manifests/plugin/python.pp b/module-collectd/manifests/plugin/python.pp index 5e0cbe801..2c2c3919f 100644 --- a/module-collectd/manifests/plugin/python.pp +++ b/module-collectd/manifests/plugin/python.pp @@ -11,12 +11,6 @@ validate_hash($config) - if $::osfamily == 'Redhat' { - package { 'collectd-python': - ensure => $ensure, - } - } - $conf_dir = $collectd::params::plugin_conf_dir # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese diff --git a/module-collectd/templates/plugin/write_graphite.conf.erb b/module-collectd/templates/plugin/write_graphite.conf.erb index 6b92f9654..4ab3906ae 100644 --- a/module-collectd/templates/plugin/write_graphite.conf.erb +++ b/module-collectd/templates/plugin/write_graphite.conf.erb @@ -10,8 +10,8 @@ StoreRates <%= @storerates %> AlwaysAppendDS <%= @alwaysappendds %> SeparateInstances <%= @separateinstances %> - LogSendErrors <%= @logsenderrors %> <% if @collectd_version and (scope.function_versioncmp([@collectd_version, '5.4']) >= 0) -%> + LogSendErrors <%= @logsenderrors %> Protocol "<%= @protocol %>" <% end -%>