Skip to content

Add support for setting 'migration.6_to_7.enabled' #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skrussell wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for setting 'migration.6_to_7.enabled' #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dbf729
Add support for setting 'migration.6_to_7.enabled'
skrussell Feb 25, 2020
ea73b23
Merge tag 'v4.9.0'
skrussell Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,18 @@
'monitoring' => $filebeat::monitoring,
'setup' => $setup,
})
# Add the migration.6_to_7.enabled section, if requested:
if $filebeat::migrate_67 {
$filebeat_config_temp_migrate = deep_merge($filebeat_config_temp, { 'migration.6_to_7.enabled' => true })
} else {
$filebeat_config_temp_migrate = $filebeat_config_temp
}
# Add the 'xpack' section if supported (version >= 6.1.0) and not undef
if $filebeat::xpack and versioncmp($filebeat::package_ensure, '6.1.0') >= 0 {
$filebeat_config = deep_merge($filebeat_config_temp, {'xpack' => $filebeat::xpack})
$filebeat_config = deep_merge($filebeat_config_temp_migrate, {'xpack' => $filebeat::xpack})
}
else {
$filebeat_config = $filebeat_config_temp
$filebeat_config = $filebeat_config_temp_migrate
}
} else {
$filebeat_config_temp = delete_undef_values({
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
# @param inputs_merge [Boolean] Whether $inputs should merge all hiera sources, or use simple automatic parameter lookup
# proxy_address [String] Proxy server to use for downloading files
# @param xpack [Hash] Configuration items to export internal stats to a monitoring Elasticsearch cluster
# @param migrate_67 [Boolean] Decides whether to add the migration.6_to_7.enabled setting (default: false)
# @param extra_validate_options [String] Extra command line options to pass to the configuration validation command
# @param autodiscover [Hash] Will be converted to YAML for the optional autodiscover section of the configuration (see documentation, and above)
class filebeat (
Expand Down Expand Up @@ -91,6 +92,7 @@
Hash $fields = $filebeat::params::fields,
Boolean $fields_under_root = $filebeat::params::fields_under_root,
Boolean $disable_config_test = $filebeat::params::disable_config_test,
Boolean $migrate_67 = $filebeat::params::migrate_67,
Array $processors = [],
Optional[Hash] $monitoring = undef,
Variant[Hash, Array] $inputs = {},
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
$conf_template = "${module_name}/pure_hash.yml.erb"
$disable_config_test = false
$xpack = undef
$migrate_67 = false
$systemd_override_dir = '/etc/systemd/system/filebeat.service.d'
$systemd_beat_log_opts_template = "${module_name}/systemd/logging.conf.erb"

Expand Down