Skip to content
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

Replace legacy functions and datatypes #67

Closed
wants to merge 5 commits into from
Closed

Replace legacy functions and datatypes #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cca7606
Update init.pp
r-savcenko Oct 18, 2023
f8f2933
Update init.pp
r-savcenko Oct 18, 2023
c47b6d6
Update config.pp
r-savcenko Oct 18, 2023
1287ae0
Update init.pp
r-savcenko Dec 12, 2023
dbef13f
Update init.pp
r-savcenko Dec 12, 2023
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
2 changes: 1 addition & 1 deletion manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
if (versioncmp($winlogbeat::real_version, '7') < 0) {
$winlogbeat_config['winlogbeat']['event_logs'].each | $k,$v | {
if has_key($v,'processors') {
if 'processors' in $v {
fail("winlogbeat versions < 7 do not support processors key within an event_log entry\n 'processors' key present in ${k}")
}
}
Expand Down
61 changes: 26 additions & 35 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,35 @@
# @param event_logs_merge [Boolean] Whether $event_logs should merge all hiera sources, or use simple automatic parameter lookup

class winlogbeat (
$major_version = undef,
$package_ensure = $winlogbeat::params::package_ensure,
$service_ensure = $winlogbeat::params::service_ensure,
$service_enable = $winlogbeat::params::service_enable,
$service_provider = $winlogbeat::params::service_provider,
$registry_file = $winlogbeat::params::registry_file,
$config_file = $winlogbeat::params::config_file,
$outputs = $winlogbeat::params::outputs,
$shipper = $winlogbeat::params::shipper,
$logging = $winlogbeat::params::logging,
$run_options = $winlogbeat::params::run_options,
$conf_template = undef,
$download_url = undef,
$install_dir = $winlogbeat::params::install_dir,
$tmp_dir = $winlogbeat::params::tmp_dir,
Optional[String] $major_version = undef,
String $package_ensure = $winlogbeat::params::package_ensure,
String $service_ensure = $winlogbeat::params::service_ensure,
Boolean $service_enable = $winlogbeat::params::service_enable,
Optional[String] $service_provider = $winlogbeat::params::service_provider,
String $registry_file = $winlogbeat::params::registry_file,
Stdlib::Windowspath $config_file = $winlogbeat::params::config_file,
Hash $outputs = $winlogbeat::params::outputs,
Hash $shipper = $winlogbeat::params::shipper,
Hash $logging = $winlogbeat::params::logging,
Hash $run_options = $winlogbeat::params::run_options,
Optional[String] $conf_template = undef,
Optional[Stdlib::HTTPUrl] $download_url = undef,
String $install_dir = $winlogbeat::params::install_dir,
String $tmp_dir = $winlogbeat::params::tmp_dir,
#### v5 only ####
$use_generic_template = $winlogbeat::params::use_generic_template,
$beat_name = $winlogbeat::params::beat_name,
$tags = $winlogbeat::params::tags,
$queue_size = $winlogbeat::params::queue_size,
$max_procs = $winlogbeat::params::max_procs,
$fields = $winlogbeat::params::fields,
$fields_under_root = $winlogbeat::params::fields_under_root,
$metrics = undef,
Boolean $use_generic_template = $winlogbeat::params::use_generic_template,
Stdlib::Fqdn $beat_name = $winlogbeat::params::beat_name,
Array $tags = $winlogbeat::params::tags,
Integer $queue_size = $winlogbeat::params::queue_size,
Optional[Integer] $max_procs = $winlogbeat::params::max_procs,
Hash $fields = $winlogbeat::params::fields,
Boolean $fields_under_root = $winlogbeat::params::fields_under_root,
Optional[Hash] $metrics = undef,
#### End v5 only ####
$event_logs = {},
$event_logs_merge = false,
$proxy_address = undef,
Hash $event_logs = {},
Boolean $event_logs_merge = false,
Optional[Stdlib::HTTPUrl] $proxy_address = undef,
) inherits winlogbeat::params {
validate_bool($event_logs_merge)

if $major_version == undef and getvar('winlogbeat_version') == undef {
$real_version = '5'
} elsif $major_version == undef and versioncmp($facts['winlogbeat_version'], '5.0.0') >= 0 {
Expand Down Expand Up @@ -98,13 +96,6 @@
if $config_file != $winlogbeat::params::config_file {
warning('You\'ve specified a non-standard config_file location - winlogbeat may fail to start unless you\'re doing something to fix this')
}

validate_hash($outputs, $logging, $event_logs_final)
validate_string($registry_file, $package_ensure)

if(!empty($proxy_address)) {
validate_re($proxy_address, ['^(http(?:s)?\:\/\/[a-zA-Z0-9]+(?:(?:\.|\-)[a-zA-Z0-9]+)+(?:\:\d+)?(?:\/[\w\-]+)*(?:\/?|\/\w+\.[a-zA-Z]{2,4}(?:\?[\w]+\=[\w\-]+)?)?(?:\&[\w]+\=[\w\-]+)*)$'], 'ERROR: You must enter a proxy url in a valid format i.e. http://proxy.net:3128')
}
contain winlogbeat::install
contain winlogbeat::config
contain winlogbeat::service
Expand Down