Showing with 51 additions and 33 deletions.
  1. +6 −1 CHANGELOG.md
  2. +5 −1 manifests/config.pp
  3. +3 −0 manifests/init.pp
  4. +33 −30 manifests/params.pp
  5. +1 −1 metadata.json
  6. +3 −0 templates/filebeat.yml.erb
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ Changelog
=========

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

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

- Support setting registry options [\#284](https://github.com/pcfens/puppet-filebeat/pull/284)

## [v4.10.0](https://github.com/pcfens/puppet-filebeat/tree/v4.10.0)
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.9.0...v4.10.0)
Expand Down
6 changes: 5 additions & 1 deletion manifests/config.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

if versioncmp($major_version, '6') >= 0 {
$filebeat_config_temp = delete_undef_values({
'shutdown_timeout' => $filebeat::shutdown_timeout,
'name' => $filebeat::beat_name,
'tags' => $filebeat::tags,
'max_procs' => $filebeat::max_procs,
Expand All @@ -36,6 +35,11 @@
},
'shutdown_timeout' => $filebeat::shutdown_timeout,
'modules' => $filebeat::modules,
'registry' => {
'path' => $filebeat::registry_path,
'file_permissions' => $filebeat::registry_file_permissions,
'flush' => $filebeat::registry_flush,
},
},
'http' => $filebeat::http,
'cloud' => $filebeat::cloud,
Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
String $systemd_override_dir = $filebeat::params::systemd_override_dir,
Optional[String] $extra_validate_options = undef,
Hash $autodiscover = $filebeat::params::autodiscover,
Optional[String] $registry_path = $filebeat::params::registry_path,
Optional[String] $registry_file_permissions = $filebeat::params::registry_file_permissions,
Optional[String] $registry_flush = $filebeat::params::registry_flush,

) inherits filebeat::params {

Expand Down
63 changes: 33 additions & 30 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,40 @@
#
# @summary Set a bunch of default parameters
class filebeat::params {
$manage_package = true
$service_ensure = running
$service_enable = true
$spool_size = 2048
$idle_timeout = '5s'
$publish_async = false
$shutdown_timeout = '0'
$beat_name = $::fqdn
$tags = []
$max_procs = undef
$config_file_mode = '0644'
$config_dir_mode = '0755'
$purge_conf_dir = true
$enable_conf_modules = false
$fields = {}
$fields_under_root = false
$http = {}
$cloud = {}
$outputs = {}
$shipper = {}
$logging = {}
$autodiscover = {}
$run_options = {}
$modules = []
$kernel_fail_message = "${::kernel} is not supported by filebeat."
$osfamily_fail_message = "${::osfamily} is not supported by filebeat."
$conf_template = "${module_name}/pure_hash.yml.erb"
$disable_config_test = false
$xpack = undef
$systemd_override_dir = '/etc/systemd/system/filebeat.service.d'
$manage_package = true
$service_ensure = running
$service_enable = true
$spool_size = 2048
$idle_timeout = '5s'
$publish_async = false
$shutdown_timeout = '0'
$beat_name = $::fqdn
$tags = []
$max_procs = undef
$config_file_mode = '0644'
$config_dir_mode = '0755'
$purge_conf_dir = true
$enable_conf_modules = false
$fields = {}
$fields_under_root = false
$http = {}
$cloud = {}
$outputs = {}
$shipper = {}
$logging = {}
$autodiscover = {}
$run_options = {}
$modules = []
$kernel_fail_message = "${::kernel} is not supported by filebeat."
$osfamily_fail_message = "${::osfamily} is not supported by filebeat."
$conf_template = "${module_name}/pure_hash.yml.erb"
$disable_config_test = false
$xpack = undef
$systemd_override_dir = '/etc/systemd/system/filebeat.service.d'
$systemd_beat_log_opts_template = "${module_name}/systemd/logging.conf.erb"
$registry_path = '/var/lib/filebeat'
$registry_file_permissions = '0600'
$registry_flush = '0s'

# These are irrelevant as long as the template is set based on the major_version parameter
# if versioncmp('1.9.1', $::rubyversion) > 0 {
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": "4.10.0",
"version": "4.11.0",
"author": "pcfens",
"summary": "A module to install and manage the filebeat log shipper",
"license": "Apache-2.0",
Expand Down
3 changes: 3 additions & 0 deletions templates/filebeat.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ filebeat.idle_timeout: <%= @filebeat_config['filebeat']['idle_timeout'] %>
<% end -%>
filebeat.config_dir: <%= @filebeat_config['filebeat']['config_dir'] %>
filebeat.shutdown_timeout: <%= @filebeat_config['filebeat']['shutdown_timeout'] %>
filebeat.registry.path: <%= @filebeat_config['filebeat']['registry']['path'] %>
filebeat.registry.file_permissions: <%= @filebeat_config['filebeat']['registry']['file_permissions'] %>
filebeat.registry.flush: <%= @filebeat_config['filebeat']['registry']['flush'] %>

#================================ General =====================================

Expand Down