CHANGELOG.md

@@ -4,6 +4,14 @@ Changelog
 ## Unreleased
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.2...HEAD)
 
+
+## [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)
+
+- Add a harvester limit [\#196](https://github.com/pcfens/puppet-filebeat/pull/196)
+- Fix documentaion error [\#198](https://github.com/pcfens/puppet-filebeat/issues/198)
+- Fix Puppet 4.10 undefined method error [\#199](https://github.com/pcfens/puppet-filebeat/pull/199)
+
 ## [v3.3.2](https://github.com/pcfens/puppet-filebeat/tree/v3.3.2)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.1...v3.3.2)
 

README.md

@@ -154,7 +154,7 @@ To drop the offset and input_type fields from all events:
 class{"filebeat":
   processors => {
     "drop_fields" => {
-      "params" => {"fields" => ["input_type", "offset"]}
+      "fields" => ["input_type", "offset"],
     },
   },
 }

manifests/prospector.pp

@@ -7,44 +7,45 @@
 # @example
 #   filebeat::prospector { 'namevar': }
 define filebeat::prospector (
-  Enum['absent', 'present'] $ensure = present,
-  Array[String] $paths              = [],
-  Array[String] $exclude_files      = [],
-  Array[String] $containers_ids     = ['\'*\''],
-  String $containers_path           = '/var/lib/docker/containers',
-  String $containers_stream         = 'all',
-  Boolean $combine_partial          = false,
-  Boolean $cri_parse_flags          = false,
-  String $encoding                  = 'plain',
-  String $input_type                = 'log',
-  Hash $fields                      = {},
-  Boolean $fields_under_root        = false,
-  Optional[String] $ignore_older    = undef,
-  Optional[String] $close_older     = undef,
-  String $doc_type                  = 'log',
-  String $scan_frequency            = '10s',
-  Integer $harvester_buffer_size    = 16384,
-  Boolean $tail_files               = false,
-  String $backoff                   = '1s',
-  String $max_backoff               = '10s',
-  Integer $backoff_factor           = 2,
-  String $close_inactive            = '5m',
-  Boolean $close_renamed            = false,
-  Boolean $close_removed            = true,
-  Boolean $close_eof                = false,
-  Integer $clean_inactive           = 0,
-  Boolean $clean_removed            = true,
-  Integer $close_timeout            = 0,
-  Boolean $force_close_files        = false,
-  Array[String] $include_lines      = [],
-  Array[String] $exclude_lines      = [],
-  String $max_bytes                 = '10485760',
-  Hash $multiline                   = {},
-  Hash $json                        = {},
-  Array[String] $tags               = [],
-  Boolean $symlinks                 = false,
-  Optional[String] $pipeline        = undef,
-  Array $processors                 = [],
+  Enum['absent', 'present'] $ensure  = present,
+  Array[String] $paths               = [],
+  Array[String] $exclude_files       = [],
+  Array[String] $containers_ids      = ['\'*\''],
+  String $containers_path            = '/var/lib/docker/containers',
+  String $containers_stream          = 'all',
+  Boolean $combine_partial           = false,
+  Boolean $cri_parse_flags           = false,
+  String $encoding                   = 'plain',
+  String $input_type                 = 'log',
+  Hash $fields                       = {},
+  Boolean $fields_under_root         = false,
+  Optional[String] $ignore_older     = undef,
+  Optional[String] $close_older      = undef,
+  String $doc_type                   = 'log',
+  String $scan_frequency             = '10s',
+  Integer $harvester_buffer_size     = 16384,
+  Optional[Integer] $harvester_limit = undef,
+  Boolean $tail_files                = false,
+  String $backoff                    = '1s',
+  String $max_backoff                = '10s',
+  Integer $backoff_factor            = 2,
+  String $close_inactive             = '5m',
+  Boolean $close_renamed             = false,
+  Boolean $close_removed             = true,
+  Boolean $close_eof                 = false,
+  Integer $clean_inactive            = 0,
+  Boolean $clean_removed             = true,
+  Integer $close_timeout             = 0,
+  Boolean $force_close_files         = false,
+  Array[String] $include_lines       = [],
+  Array[String] $exclude_lines       = [],
+  String $max_bytes                  = '10485760',
+  Hash $multiline                    = {},
+  Hash $json                         = {},
+  Array[String] $tags                = [],
+  Boolean $symlinks                  = false,
+  Optional[String] $pipeline         = undef,
+  Array $processors                  = [],
 ) {
 
   $prospector_template = $filebeat::major_version ? {

metadata.json

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

templates/prospector.yml.erb

@@ -146,7 +146,9 @@
 
   # Experimental: Max number of harvesters that are started in parallel.
   # Default is 0 which means unlimited
-  #harvester_limit: 0
+  <%- if @harvester_limit -%>
+  harvester_limit: <%= @harvester_limit %>
+  <%- end -%>
 
   ### Harvester closing options
 
@@ -192,5 +194,5 @@
   <%- if @processors.length > 0 -%>
   # Managing processors releated only for specified prospector
   processors:
-    <%- %><%= @processors.to_yaml.lines[1..-1].join.gsub(/^/, '  ') -%>
+    <%- %><%= @processors.to_yaml.lines.drop(1).join.gsub(/^/, '  ') -%>
   <%- end -%>

templates/prospector5.yml.erb

@@ -136,7 +136,9 @@ filebeat:
 
       # Experimental: Max number of harvesters that are started in parallel.
       # Default is 0 which means unlimited
-      #harvester_limit: 0
+      <%- if @harvester_limit -%>
+      harvester_limit: <%= @harvester_limit %>
+      <%- end -%>
 
       ### Harvester closing options