Showing with 19 additions and 11 deletions.
  1. +11 −1 CHANGELOG.md
  2. +1 −1 Gemfile
  3. +1 −0 README.md
  4. +1 −1 metadata.json
  5. +5 −8 templates/filebeat5.yml.erb
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ Changelog
=========

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

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

- This is the last release with support for Filebeat versions prior to 5
- Last release with support for Puppet 3
- Add Logstash SSL support [\#121](https://github.com/pcfens/puppet-filebeat/pull/121)
- Add ES loadbalance support [\#119](https://github.com/pcfens/puppet-filebeat/pull/119)

The next major release will be a breaking release for anyone using processors.

## [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)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ else
gem 'facter', :require => false, :groups => [:test]
end

ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
ENV['PUPPET_GEM_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_GEM_VERSION'].to_s
gem 'puppet', puppetversion, :require => false, :groups => [:test]
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class { 'filebeat':
'http://localhost:9200',
'http://anotherserver:9200'
],
'loadbalance' => true,
'index' => 'packetbeat',
'cas' => [
'/etc/pki/root/ca.pem',
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pcfens-filebeat",
"version": "0.12.1",
"version": "1.0.0",
"author": "pcfens",
"license": "Apache-2.0",
"summary": "A module to install and manage the filebeat log shipper",
Expand Down
13 changes: 5 additions & 8 deletions templates/filebeat5.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ output.elasticsearch:
<%- @filebeat_config['output']['elasticsearch']['hosts'].each do |host| -%>
- <%= host %>
<%- end -%>
<%- if @filebeat_config['output']['elasticsearch']['loadbalance'] != nil -%>
loadbalance: <%= @filebeat_config['output']['elasticsearch']['loadbalance'] %>
<%- end -%>
<%- if @filebeat_config['output']['elasticsearch']['compression_level'] != nil -%>
compression_level: <%= @filebeat_config['output']['elasticsearch']['compression_level'] %>
<%- end -%>
Expand Down Expand Up @@ -221,16 +224,10 @@ output.logstash:
- <%= host %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['ssl_certificate'] != nil -%>
ssl.certificate: <%= @filebeat_config['output']['logstash']['ssl_certificate'] %>
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'] %>
ssl.key: <%= @filebeat_config['output']['logstash']['ssl_key'] %>
<%- end -%>
<%- if @filebeat_config['output']['logstash']['worker'] != nil -%>
worker: <%= @filebeat_config['output']['logstash']['worker'] %>
Expand Down