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

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

## [v4.5.0](https://github.com/pcfens/puppet-filebeat/tree/v4.5.0)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.4.2...v4.5.0)

- Restart filebeat when config files are removed [\#258](https://github.com/pcfens/puppet-filebeat/pull/258)
- Support TCP and UDP input plugins [\#259](https://github.com/pcfens/puppet-filebeat/pull/259)

## [v4.4.2](https://github.com/pcfens/puppet-filebeat/tree/v4.4.2)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.4.1...v4.4.2)
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,8 @@ to fully understand what these parameters do.
[See above](#json-logs). (default: {})
- `multiline`: [Hash] Options that control how Filebeat handles log messages that span multiple lines.
[See above](#multiline-logs). (default: {})
- `host`: [String] Host and port used to read events for TCP or UDP plugin (default: localhost:9000)
- `max_message_size`: [String] The maximum size of the message received over TCP or UDP (default: undef)

## Limitations
This module doesn't load the [elasticsearch index template](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-getting-started.html#filebeat-template) into elasticsearch (required when shipping
Expand Down
3 changes: 3 additions & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
recurse => $filebeat::purge_conf_dir,
purge => $filebeat::purge_conf_dir,
force => true,
notify => Service['filebeat'],
}
} # end Linux

Expand Down Expand Up @@ -155,6 +156,7 @@
recurse => $filebeat::purge_conf_dir,
purge => $filebeat::purge_conf_dir,
force => true,
notify => Service['filebeat'],
}
} # end FreeBSD

Expand Down Expand Up @@ -188,6 +190,7 @@
recurse => $filebeat::purge_conf_dir,
purge => $filebeat::purge_conf_dir,
force => true,
notify => Service['filebeat'],
}
} # end OpenBSD

Expand Down
2 changes: 2 additions & 0 deletions manifests/input.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
Optional[String] $pipeline = undef,
Array $processors = [],
Boolean $pure_array = false,
String $host = 'localhost:9000',
Optional[String] $max_message_size = undef,
) {

$input_template = $filebeat::major_version ? {
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.4.2",
"version": "4.5.0",
"author": "pcfens",
"summary": "A module to install and manage the filebeat log shipper",
"license": "Apache-2.0",
Expand Down
7 changes: 6 additions & 1 deletion templates/input.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
- <%= tag %>
<%- end -%>
<%- end -%>
<%- if @input_type == 'docker' -%>
<%- if @input_type =~ /(tcp|udp)/ -%>
host: <%= @host %>
<%- if @max_message_size -%>
max_message_size: <%= @max_message_size %>
<%- end -%>
<%- elsif @input_type == 'docker' -%>
containers:
ids:
<%- @containers_ids.each do |id| -%>
Expand Down