CHANGELOG.md

@@ -2,8 +2,13 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.2...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.4.0...HEAD)
 
+## [v3.4.0](https://github.com/pcfens/puppet-filebeat/tree/v3.4.0)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.3...v3.4.0)
+
+- Add filebeat.config.modules section [\#204](https://github.com/pcfens/puppet-filebeat/pull/204)
+- Fix filebeat::prospector::fields_under_root [\#205](https://github.com/pcfens/puppet-filebeat/pull/205)
 
 ## [v3.3.3](https://github.com/pcfens/puppet-filebeat/tree/v3.3.3)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.2...v3.3.3)

README.md

@@ -232,7 +232,7 @@ Installs and configures filebeat.
 - `service_provider`: [String] The provider parameter on the filebeat service (default: on RedHat based systems use redhat, otherwise undefined)
 - `spool_size`: [Integer] How large the spool should grow before being flushed to the network (default: 2048)
 - `idle_timeout`: [String] How often the spooler should be flushed even if spool size isn't reached (default: 5s)
-- `publish_async`: [Boolean] If set to true filebeat will publish while preparing the next batch of lines to transmit (defualt: false)
+- `publish_async`: [Boolean] If set to true filebeat will publish while preparing the next batch of lines to transmit (default: false)
 - `registry_file`: [String] The registry file used to store positions, must be an absolute path (default is OS dependent - see params.pp)
 - `config_file`: [String] Where the configuration file managed by this module should be placed. If you think
   you might want to use this, read the [limitations](#using-config_file) first. Defaults to the location
@@ -245,6 +245,8 @@ Installs and configures filebeat.
 - `config_file_owner`: [String] The owner of the configuration files, including prospectors (default: root). Linux only.
 - `config_file_group`: [String] The group of the configuration files, including prospectors (default: root). Linux only.
 - `purge_conf_dir`: [Boolean] Should files in the prospector 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)
 - `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)

manifests/config.pp

@@ -20,6 +20,10 @@
           'enabled' => true,
           'path'    => "${filebeat::config_dir}/*.yml",
         },
+        'config.modules' => {
+          'enabled' => $filebeat::enable_conf_modules,
+          'path'    => "${filebeat::modules_dir}/*.yml",
+        },
         'shutdown_timeout'   => $filebeat::shutdown_timeout,
         'modules'           => $filebeat::modules,
       },

manifests/init.pp

@@ -70,6 +70,8 @@
   Optional[String] $config_dir_owner                                  = $filebeat::params::config_dir_owner,
   Optional[String] $config_dir_group                                  = $filebeat::params::config_dir_group,
   Boolean $purge_conf_dir                                             = $filebeat::params::purge_conf_dir,
+  String  $modules_dir                                                = $filebeat::params::modules_dir,
+  Boolean $enable_conf_modules                                        = $filebeat::params::enable_conf_modules,
   Hash    $outputs                                                    = $filebeat::params::outputs,
   Hash    $shipper                                                    = $filebeat::params::shipper,
   Hash    $logging                                                    = $filebeat::params::logging,

manifests/params.pp

@@ -17,6 +17,7 @@
   $config_file_mode      = '0644'
   $config_dir_mode       = '0755'
   $purge_conf_dir        = true
+  $enable_conf_modules   = false
   $fields                = {}
   $fields_under_root     = false
   $outputs               = {}
@@ -74,6 +75,7 @@
       $config_file_group = 'root'
       $config_dir_owner  = 'root'
       $config_dir_group  = 'root'
+      $modules_dir        = '/etc/filebeat/modules.d'
       $registry_file     = '/var/lib/filebeat/registry'
       # These parameters are ignored if/until tarball installs are supported in Linux
       $tmp_dir         = '/tmp'
@@ -97,6 +99,7 @@
       $config_file_group = 'wheel'
       $config_dir_owner  = 'root'
       $config_dir_group  = 'wheel'
+      $modules_dir       = '/usr/local/etc/filebeat.modules.d'
       $registry_file     = '/var/lib/filebeat/registry'
       $tmp_dir           = '/tmp'
       $service_provider  = undef
@@ -112,6 +115,7 @@
       $config_file_group = 'wheel'
       $config_dir_owner  = 'root'
       $config_dir_group  = 'wheel'
+      $modules_dir        = '/etc/filebeat/modules.d'
       $registry_file     = '/var/db/filebeat/.filebeat'
       $tmp_dir           = '/tmp'
       $service_provider  = undef
@@ -127,6 +131,7 @@
       $config_dir_group = undef
       $config_file      = 'C:/Program Files/Filebeat/filebeat.yml'
       $config_dir       = 'C:/Program Files/Filebeat/conf.d'
+      $modules_dir      = 'C:/Program Files/Filebeat/modules.d'
       $registry_file    = 'C:/ProgramData/filebeat/registry'
       $install_dir      = 'C:/Program Files'
       $tmp_dir          = 'C:/Windows/Temp'

manifests/prospector.pp

@@ -18,7 +18,7 @@
   String $encoding                   = 'plain',
   String $input_type                 = 'log',
   Hash $fields                       = {},
-  Boolean $fields_under_root         = false,
+  Boolean $fields_under_root         = $filebeat::fields_under_root,
   Optional[String] $ignore_older     = undef,
   Optional[String] $close_older      = undef,
   String $doc_type                   = 'log',

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "author": "pcfens",
   "summary": "A module to install and manage the filebeat log shipper",
   "license": "Apache-2.0",