Showing with 14 additions and 5 deletions.
  1. +6 −1 CHANGELOG.md
  2. +1 −1 manifests/config.pp
  3. +3 −2 manifests/prospector.pp
  4. +1 −1 metadata.json
  5. +3 −0 templates/prospector5.yml.erb
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ Changelog
=========

## Unreleased
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.0...HEAD)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.1...HEAD)

## [v0.10.1](https://github.com/pcfens/puppet-filebeat/tree/v0.10.1)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.10.0...v0.10.1)

- Support harvesting symlinks [\#74](https://github.com/pcfens/puppet-filebeat/pull/74)
- Fix windows config file validation command [\#75](https://github.com/pcfens/puppet-filebeat/issues/75)

## [v0.10.0](https://github.com/pcfens/puppet-filebeat/tree/v0.10.0)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.9.2...v0.10.0)
Expand Down
2 changes: 1 addition & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
ensure => file,
path => $filebeat::config_file,
content => template($filebeat::real_conf_template),
validate_cmd => "${filebeat_path} -N -configtest -c %",
validate_cmd => "\"${filebeat_path}\" -N -configtest -c \"%\"",
notify => Service['filebeat'],
require => File['filebeat-config-dir'],
}
Expand Down
5 changes: 3 additions & 2 deletions manifests/prospector.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@
$multiline = {},
$json = {},
$tags = [],
$symlinks = false,
) {

validate_hash($fields, $multiline, $json)
validate_array($paths, $exclude_files, $include_lines, $exclude_lines, $tags)
validate_bool($tail_files, $close_renamed, $close_removed, $close_eof, $clean_removed)
validate_bool($tail_files, $close_renamed, $close_removed, $close_eof, $clean_removed, $symlinks)

$prospector_template = $filebeat::real_version ? {
'1' => 'prospector1.yml.erb',
Expand Down Expand Up @@ -65,7 +66,7 @@
ensure => $ensure,
path => "${filebeat::config_dir}/${name}.yml",
content => template("${module_name}/${prospector_template}"),
validate_cmd => "${filebeat_path} -N -configtest -c %",
validate_cmd => "\"${filebeat_path}\" -N -configtest -c \"%\"",
notify => Service['filebeat'],
}
}
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": "0.10.0",
"version": "0.10.1",
"author": "pcfens",
"license": "Apache-2.0",
"summary": "A module to install and manage the filebeat log shipper",
Expand Down
3 changes: 3 additions & 0 deletions templates/prospector5.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ filebeat:
<%- if @max_bytes -%>
max_bytes: <%= @max_bytes %>
<%- end -%>
<%- if @symlinks -%>
symlinks: <%= @symlinks %>
<%- end -%>
<%- if @json.length > 0 -%>
### JSON configuration
Expand Down