.travis.yml

@@ -44,8 +44,5 @@ matrix:
   - rvm: 2.1.9
     bundler_args: --without system_tests development
     env: PUPPET_GEM_VERSION="~> 3.8"
-  - rvm: 1.9.3
-    bundler_args: --without system_tests development
-    env: PUPPET_GEM_VERSION="~> 3.8"
 notifications:
   email: false

CHANGELOG.md

@@ -4,6 +4,18 @@ Changelog
 ## Unreleased
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.1...HEAD)
 
+## [v0.10.3](https://github.com/pcfens/puppet-filebeat/tree/v0.10.3)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.2...v0.10.3)
+
+- Allow non-SSL downloads of windows filebeat zipfile [\#82](https://github.com/pcfens/puppet-filebeat/pull/82)
+- Basic support of processors in puppet <4.x [\#79](https://github.com/pcfens/puppet-filebeat/issues/79) (See note below)
+- Confine the filebeat_version fact in a way that works in Ruby 1.8.7 [\#88](https://github.com/pcfens/puppet-filebeat/pull/88)
+
+Processor support is going to change in the next feature release (v0.11.x) in a way that is not
+backwards compatible with the current method. The upcoming change is documented in
+[\#85](https://github.com/pcfens/puppet-filebeat/pull/85).
+
+
 ## [v0.10.2](https://github.com/pcfens/puppet-filebeat/tree/v0.10.2)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.1...v0.10.2)
 

lib/facter/filebeat_version.rb

@@ -1,6 +1,6 @@
 require 'facter'
 Facter.add('filebeat_version') do
-  confine kernel: %w(Linux Windows)
+  confine :kernel => %w(Linux Windows) # rubocop:disable Style/HashSyntax
   if File.executable?('/usr/bin/filebeat')
     filebeat_version = Facter::Util::Resolution.exec('/usr/bin/filebeat --version')
   elsif File.executable?('/usr/share/filebeat/bin/filebeat')

manifests/install/windows.pp

@@ -1,5 +1,5 @@
 class filebeat::install::windows {
-  $filename = regsubst($filebeat::download_url, '^https.*\/([^\/]+)\.[^.].*', '\1')
+  $filename = regsubst($filebeat::download_url, '^https?.*\/([^\/]+)\.[^.].*', '\1')
   $foldername = 'Filebeat'
 
   file { $filebeat::install_dir:

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "author": "pcfens",
   "license": "Apache-2.0",
   "summary": "A module to install and manage the filebeat log shipper",

templates/filebeat5.yml.erb

@@ -2,8 +2,8 @@
   def yaml_indent(conds)
     return_val = []
     tmp_val = conds.to_yaml.split("\n")
+    tmp_val = tmp_val.collect{|val| val.rstrip || val}
     tmp_val.delete('---')
-
     tmp_val.each do |val|
       return_val << "        " + val
     end
@@ -84,9 +84,11 @@ processors:
       when:
 <%=  yaml_indent(_proc['when']) %>
     <%- end -%>
+    <%- unless _proc['params'].nil? or _proc['params'].empty? -%>
     <%- _proc['params'].each do |key,val|-%>
       <%= key %>: <%= val %>
     <%- end -%>
+    <%- end -%>
   <%- end -%>
 <%- end -%>