From 472b17c74e0183b27eaf7806c4ffcb66b4d47a11 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Tue, 12 Apr 2022 20:57:29 +0200
Subject: [PATCH 1/3] allow filebeat major_version 8 to be used

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 2aa67e1..9720c93 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -59,7 +59,7 @@
   Boolean $manage_package                                             = $filebeat::params::manage_package,
   Boolean $manage_repo                                                = $filebeat::params::manage_repo,
   Boolean $manage_apt                                                 = $filebeat::params::manage_apt,
-  Enum['5','6', '7'] $major_version                                   = $filebeat::params::major_version,
+  Enum['5','6', '7', '8'] $major_version                              = $filebeat::params::major_version,
   Variant[Boolean, Enum['stopped', 'running']] $service_ensure        = $filebeat::params::service_ensure,
   Boolean $service_enable                                             = $filebeat::params::service_enable,
   Optional[String]  $service_provider                                 = $filebeat::params::service_provider,

From 6e2627c5f350b39f4dbb7c95c3e18468a390b854 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Wed, 4 May 2022 16:29:55 +0200
Subject: [PATCH 2/3] adapt changes for filestream

---
 manifests/input.pp  | 14 +++++++++-----
 manifests/params.pp | 10 +++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/manifests/input.pp b/manifests/input.pp
index 757daf0..a5e0b37 100644
--- a/manifests/input.pp
+++ b/manifests/input.pp
@@ -54,12 +54,16 @@
   Optional[String] $max_message_size       = undef,
 ) {
 
-  if versioncmp($facts['filebeat_version'], '7.16') > 0 {
-    $input_template = 'filestream.yml.erb'
-  } elsif versioncmp($facts['filebeat_version'], '6') > 0 {
-    $input_template = 'input.yml.erb'
+  if Integer($filebeat::major_version) < 8 {
+    if versioncmp($facts['filebeat_version'], '7.16') > 0 {
+      $input_template = 'filestream.yml.erb'
+    } elsif versioncmp($facts['filebeat_version'], '6') > 0 {
+      $input_template = 'input.yml.erb'
+    } else {
+      $input_template = 'prospector.yml.erb'
+    }
   } else {
-    $input_template = 'prospector.yml.erb'
+    $input_template = 'filestream.yml.erb'
   }
 
   if 'filebeat_version' in $facts and $facts['filebeat_version'] != false {
diff --git a/manifests/params.pp b/manifests/params.pp
index 02808c2..332d80b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -169,9 +169,13 @@
     }
   }
 
-  if versioncmp($facts['filebeat_version'], '7.16') > 0 {
-    $default_input_type = 'filestream'
+  if Integer($filebeat::major_version) < 8 {
+    if versioncmp($facts['filebeat_version'], '7.16') > 0 {
+      $default_input_type = 'filestream'
+    } else {
+      $default_input_type = 'log'
+    }
   } else {
-    $default_input_type = 'log'
+    $default_input_type = 'filestream'
   }
 }

From bd2022b22093fe22e6b386720f894514ea0e4c84 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Wed, 4 May 2022 16:34:41 +0200
Subject: [PATCH 3/3] fix major_version assignment in params

---
 manifests/params.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 332d80b..468500a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -73,7 +73,7 @@
       $manage_repo = true
       $manage_apt  = true
       $filebeat_path = '/usr/share/filebeat/bin/filebeat'
-      $major_version = '7'
+      $major_version = '8'
     }
   }
   case $::kernel {
@@ -169,7 +169,7 @@
     }
   }
 
-  if Integer($filebeat::major_version) < 8 {
+  if Integer($major_version) < 8 {
     if versioncmp($facts['filebeat_version'], '7.16') > 0 {
       $default_input_type = 'filestream'
     } else {