From 4439f2a830e5e5de7288beec9869a2438533f6d3 Mon Sep 17 00:00:00 2001 From: Dakota Brown Date: Wed, 2 Sep 2020 07:34:45 -0400 Subject: [PATCH] Resolves pcfens#266 initial commit of filebeat::cloud hash that allows cloud.id and cloud.auth in the filebeat.yml for major version 6 --- README.md | 1 + manifests/config.pp | 1 + manifests/init.pp | 2 ++ manifests/params.pp | 1 + 4 files changed, 5 insertions(+) diff --git a/README.md b/README.md index 736cbc6..cea94fa 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ Installs and configures filebeat. - `purge_conf_dir`: [Boolean] Should files in the input configuration directory not managed by puppet be automatically purged - `enable_conf_modules`: [Boolean] Should filebeat.config.modules be enabled - `modules_dir`: [String] The directory where module configurations should be defined (default: /etc/filebeat/modules.d) +- `cloud`: [Hash] Will be converted to YAML for the optional cloud.id and cloud.auth of the configuration (see documentation, and above) - `outputs`: [Hash] Will be converted to YAML for the required outputs section of the configuration (see documentation, and above) - `shipper`: [Hash] Will be converted to YAML to create the optional shipper section of the filebeat config (see documentation) - `logging`: [Hash] Will be converted to YAML to create the optional logging section of the filebeat config (see documentation) diff --git a/manifests/config.pp b/manifests/config.pp index 93ad051..fa0d671 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -38,6 +38,7 @@ 'modules' => $filebeat::modules, }, 'http' => $filebeat::http, + 'cloud' => $filebeat::cloud, 'output' => $filebeat::outputs, 'shipper' => $filebeat::shipper, 'logging' => $filebeat::logging, diff --git a/manifests/init.pp b/manifests/init.pp index 0b89d74..d1efd42 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,6 +27,7 @@ # @param config_file_mode [String] The unix permissions mode set on configuration files (default: 0644) # @param purge_conf_dir [Boolean] Should files in the input configuration directory not managed by puppet be automatically purged # @param http [Hash] A hash of the http section of configuration +# @param cloud [Hash] Will be converted to YAML for the optional cloud of the configuration (see documentation, and above) # @param outputs [Hash] Will be converted to YAML for the required outputs section of the configuration (see documentation, and above) # @param shipper [Hash] Will be converted to YAML to create the optional shipper section of the filebeat config (see documentation) # @param logging [Hash] Will be converted to YAML to create the optional logging section of the filebeat config (see documentation) @@ -73,6 +74,7 @@ String $modules_dir = $filebeat::params::modules_dir, Boolean $enable_conf_modules = $filebeat::params::enable_conf_modules, Hash $http = $filebeat::params::http, + Hash $cloud = $filebeat::params::cloud, Hash $outputs = $filebeat::params::outputs, Hash $shipper = $filebeat::params::shipper, Hash $logging = $filebeat::params::logging, diff --git a/manifests/params.pp b/manifests/params.pp index 66db94e..fbd6957 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -20,6 +20,7 @@ $fields = {} $fields_under_root = false $http = {} + $cloud = {} $outputs = {} $shipper = {} $logging = {}