Showing with 12 additions and 4 deletions.
  1. +5 −1 CHANGELOG.md
  2. +1 −0 README.md
  3. +3 −0 lib/facter/filebeat_version.rb
  4. +2 −2 manifests/init.pp
  5. +1 −1 metadata.json
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ Changelog
=========

## Unreleased
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.0...HEAD)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.1...HEAD)

## [v4.1.1](https://github.com/pcfens/puppet-filebeat/tree/v4.1.1)
- Support old versions of filebeat for a version fact only [#\227](https://github.com/pcfens/puppet-filebeat/pull/227)
- Fix the processor input data type [#\228](https://github.com/pcfens/puppet-filebeat/issues/228)

## [v4.1.0](https://github.com/pcfens/puppet-filebeat/tree/v4.1.0)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.0.5...v4.1.0)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ to fully understand what these parameters do.
- `exclude_lines`: [Array] A list of regular expressions to match the files that you want to exclude.
Ignored if empty (default: [])
- `max_bytes`: [Integer] The maximum number of bytes that a single log message can have (default: 10485760)
- `tags`: [Array] A list of tags to send along with the log data.
- `json`: [Hash] Options that control how filebeat handles decoding of log messages in JSON format
[See above](#json-logs). (default: {})
- `multiline`: [Hash] Options that control how Filebeat handles log messages that span multiple lines.
Expand Down
3 changes: 3 additions & 0 deletions lib/facter/filebeat_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
confine 'kernel' => ['FreeBSD', 'OpenBSD', 'Linux', 'Windows']
if File.executable?('/usr/bin/filebeat')
filebeat_version = Facter::Util::Resolution.exec('/usr/bin/filebeat version')
if filebeat_version.empty?
filebeat_version = Facter::Util::Resolution.exec('/usr/bin/filebeat --version')
end
elsif File.executable?('/usr/local/bin/filebeat')
filebeat_version = Facter::Util::Resolution.exec('/usr/local/bin/filebeat --version')
elsif File.executable?('/usr/share/filebeat/bin/filebeat')
Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# @param max_procs [Integer] The maximum number of CPUs that can be simultaneously used
# @param fields [Hash] Optional fields that should be added to each event output
# @param fields_under_root [Boolean] If set to true, custom fields are stored in the top level instead of under fields
# @param processors [Array] Processors that will be added. Commonly used to create processors using hiera.
# @param processors [Hash] Processors that will be added. Commonly used to create processors using hiera.
# @param inputs [Hash] Inputs that will be created. Commonly used to create inputs using hiera
# @param setup [Hash] setup that will be created. Commonly used to create setup using hiera
# @param inputs_merge [Boolean] Whether $inputs should merge all hiera sources, or use simple automatic parameter lookup
Expand Down Expand Up @@ -86,7 +86,7 @@
Hash $fields = $filebeat::params::fields,
Boolean $fields_under_root = $filebeat::params::fields_under_root,
Boolean $disable_config_test = $filebeat::params::disable_config_test,
Array $processors = [],
Hash $processors = {},
Hash $inputs = {},
Hash $setup = {},
Array $modules = [],
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pcfens-filebeat",
"version": "4.1.0",
"version": "4.1.1",
"author": "pcfens",
"summary": "A module to install and manage the filebeat log shipper",
"license": "Apache-2.0",
Expand Down