.travis.yml

@@ -16,7 +16,7 @@ matrix:
   - rvm: 2.3.1
     bundler_args: --without development
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true STRICT_VARIABLES=yes
     script: bundle exec rake beaker
     services: docker
     sudo: required
@@ -40,7 +40,7 @@ matrix:
     script: bundle exec rake rubocop
   - rvm: 2.1.9
     bundler_args: --without system_tests development
-    env: PUPPET_GEM_VERSION="~> 4.5" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES=yes
   - rvm: 2.1.9
     bundler_args: --without system_tests development
     env: PUPPET_GEM_VERSION="~> 3.8"

CHANGELOG.md

@@ -2,19 +2,24 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.1...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.4...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)
+## [v0.10.4](https://github.com/pcfens/puppet-filebeat/tree/v0.10.4)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.3...v0.10.4)
 
-- 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)
+- Add output.console support to the config template [\#91](https://github.com/pcfens/puppet-filebeat/issues/91)
+- Support puppet with strict variables enabled [\#92](https://github.com/pcfens/puppet-filebeat/issues/92)
 
 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.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 above)
+- Confine the filebeat_version fact in a way that works in Ruby 1.8.7 [\#88](https://github.com/pcfens/puppet-filebeat/pull/88)
 
 ## [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)

manifests/init.pp

@@ -90,7 +90,7 @@
 
   validate_bool($manage_repo, $prospectors_merge)
 
-  if $major_version == undef and $::filebeat_version == undef {
+  if $major_version == undef and getvar('::filebeat_version') == undef {
     $real_version = '5'
   } elsif $major_version == undef and versioncmp($::filebeat_version, '5.0.0') >= 0 {
     $real_version = '5'

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "author": "pcfens",
   "license": "Apache-2.0",
   "summary": "A module to install and manage the filebeat log shipper",
@@ -84,7 +84,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2016.5.0"
+      "version_requirement": ">= 3.0.0 <= 2016.5.0"
     },
     {
       "name": "puppet",

templates/filebeat5.yml.erb

@@ -521,6 +521,19 @@ output.file:
   number_of_files: <%= @filebeat_config['output']['file']['number_of_files'] %>
   <%- end -%>
 <%- end -%>
+<%- if @filebeat_config['output']['console'] != nil -%>
+#-------------------------- Console output ------------------------------------
+output.console:
+  <%- if @filebeat_config['output']['console']['enabled'] != nil -%>
+  enabled: <%= @filebeat_config['output']['console']['enabled'] %>
+  <%- end -%>
+  <%- if @filebeat_config['output']['console']['pretty'] != nil -%>
+  pretty: <%= @filebeat_config['output']['console']['pretty'] %>
+  <%- end -%>
+  <%- if @filebeat_config['output']['console']['bulk_max_size'] != nil -%>
+  bulk_max_size: <%= @filebeat_config['output']['console']['bulk_max_size'] %>
+  <%- end -%>
+<%- end -%>
 
 #================================= Paths ======================================