CHANGELOG.md

@@ -2,7 +2,17 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.2...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.4...HEAD)
+
+## [v0.7.4](https://github.com/pcfens/puppet-filebeat/tree/v0.7.4)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.2...v0.7.4)
+
+Version 0.7.3 was never released even though it is tagged.
+
+- Fixed some testing issues that were caused by changes to external resources
+
+**Fixed Bugs**
+- Some redis configuration options were not generated as integers [\#38](https://github.com/pcfens/puppet-filebeat/issues/38)
 
 ## [v0.7.2](https://github.com/pcfens/puppet-filebeat/tree/v0.7.2)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.1...v0.7.2)

Gemfile

@@ -29,6 +29,10 @@ group :system_tests do
   gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else

metadata.json

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

spec/classes/filebeat_spec.rb

@@ -9,6 +9,7 @@
       :lsbdistid => 'Ubuntu',
       :lsbdistrelease => '16.04',
       :rubyversion => '1.9.3',
+      :puppetversion   => Puppet.version
     }
   end
 
@@ -45,6 +46,7 @@
         :kernel => 'Linux',
         :osfamily => 'RedHat',
         :rubyversion => '1.8.7',
+        :puppetversion   => Puppet.version
       }
     end
 
@@ -66,6 +68,7 @@
       {
         :kernel => 'Windows',
         :rubyversion => '1.9.3',
+        :puppetversion   => Puppet.version
       }
     end
 

templates/filebeat.yml.erb

@@ -24,6 +24,18 @@
 <%- if @filebeat_config['output']['redis']['port'] -%>
 <%- @filebeat_config['output']['redis']['port'] = Integer(@filebeat_config['output']['redis']['port']) -%>
 <%- end -%>
+<%- if @filebeat_config['output']['redis']['db'] -%>
+<%- @filebeat_config['output']['redis']['db'] = Integer(@filebeat_config['output']['redis']['db']) -%>
+<%- end -%>
+<%- if @filebeat_config['output']['redis']['db_topology'] -%>
+<%- @filebeat_config['output']['redis']['db_topology'] = Integer(@filebeat_config['output']['redis']['db_topology']) -%>
+<%- end -%>
+<%- if @filebeat_config['output']['redis']['timeout'] -%>
+<%- @filebeat_config['output']['redis']['timeout'] = Integer(@filebeat_config['output']['redis']['timeout']) -%>
+<%- end -%>
+<%- if @filebeat_config['output']['redis']['reconnect_interval'] -%>
+<%- @filebeat_config['output']['redis']['reconnect_interval'] = Integer(@filebeat_config['output']['redis']['reconnect_interval']) -%>
+<%- end -%>
 <%- end -%>
 <%- if @filebeat_config['shipper'] -%>
 <%- if @filebeat_config['shipper']['refresh_topology_freq'] -%>