Showing with 21 additions and 4 deletions.
  1. +7 −2 CHANGELOG.md
  2. +2 −2 metadata.json
  3. +12 −0 templates/filebeat5.yml.erb
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ Changelog
=========

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

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

- Add support for SSL in Logstash [\#117](https://github.com/pcfens/puppet-filebeat/pull/117)

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

Windows users: you may see a restart and replacement of your existing filebeat directory.
There's a very brief discussion of the change in the [pull request](https://github.com/pcfens/puppet-filebeat/pull/113#issuecomment-307628477)

- Support upgrades in Windows [\113](https://github.com/pcfens/puppet-filebeat/pull/113)
- Support upgrades in Windows [\#113](https://github.com/pcfens/puppet-filebeat/pull/113)
- Add optional repo_priority parameter [\#110](https://github.com/pcfens/puppet-filebeat/pull/110)
- Update external dependencies, including pinning apt version

Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pcfens-filebeat",
"version": "0.12.0",
"version": "0.12.1",
"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": "puppet",
"version_requirement": ">= 3.5.0 < 5.0.0"
"version_requirement": ">= 3.5.0 < 6.0.0"
}
]
}
12 changes: 12 additions & 0 deletions templates/filebeat5.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,18 @@ output.logstash:
<%- @filebeat_config['output']['logstash']['hosts'].each do |host| -%>
- <%= host %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['ssl_certificate'] != nil -%>
ssl.certificate: <%= @filebeat_config['output']['logstash']['ssl_certificate'] %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['ssl_key'] != nil -%>
ssl.certificate: <%= @filebeat_config['output']['logstash']['ssl_key'] %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['ssl_certificate'] != nil -%>
ssl.certificate: <%= @filebeat_config['output']['logstash']['ssl_certificate'] %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['ssl_key'] != nil -%>
ssl.certificate: <%= @filebeat_config['output']['logstash']['ssl_key'] %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['worker'] != nil -%>
worker: <%= @filebeat_config['output']['logstash']['worker'] %>
<%- end -%>
Expand Down