Showing with 19 additions and 7 deletions.
  1. +9 −1 CHANGELOG.md
  2. +6 −2 manifests/install.pp
  3. +2 −2 metadata.json
  4. +2 −2 templates/prospector.yml.erb
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ Changelog
=========

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

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

- Sort field keys [\#55](https://github.com/pcfens/puppet-filebeat/pull/55),
[\#57](https://github.com/pcfens/puppet-filebeat/issues/57)
- Refresh the filebeat service when packages are updated [\#56](https://github.com/pcfens/puppet-filebeat/issues/56)


## [v0.8.5](https://github.com/pcfens/puppet-filebeat/tree/v0.8.5)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.4...v0.8.5)
Expand Down
8 changes: 6 additions & 2 deletions manifests/install.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@

case $::kernel {
'Linux': {
class{ 'filebeat::install::linux': }
class{ 'filebeat::install::linux':
notify => Class['filebeat::service'],
}
Anchor['filebeat::install::begin'] -> Class['filebeat::install::linux'] -> Anchor['filebeat::install::end']
if $::filebeat::manage_repo {
class { 'filebeat::repo': }
Class['filebeat::repo'] -> Class['filebeat::install::linux']
}
}
'Windows': {
class{'filebeat::install::windows':}
class{'filebeat::install::windows':
notify => Class['filebeat::service'],
}
Anchor['filebeat::install::begin'] -> Class['filebeat::install::windows'] -> Anchor['filebeat::install::end']
}
default: {
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pcfens-filebeat",
"version": "0.8.5",
"version": "0.8.6",
"author": "pcfens",
"license": "Apache-2.0",
"summary": "A module to install and manage the filebeat log shipper",
Expand Down Expand Up @@ -84,7 +84,7 @@
"requirements": [
{
"name": "pe",
"version_requirement": ">= 3.0.0 < 2016.3.0"
"version_requirement": ">= 3.0.0 < 2016.5.0"
},
{
"name": "puppet",
Expand Down
4 changes: 2 additions & 2 deletions templates/prospector.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ filebeat:
<%- end -%>
<%- if @fields.length > 0 -%>
fields:
<%- @fields.each_pair do |k, v| -%>
<%= k %>: <%= v %>
<%- @fields.sort_by{|k,v| k}.each do |key, value| -%>
<%= key %>: <%= value %>
<%- end -%>
<%- end -%>
fields_under_root: <%= @fields_under_root %>
Expand Down