From 68a650eba5adf2ecb9dd8c1992f77d19421898f9 Mon Sep 17 00:00:00 2001
From: Jamie Murphy <jamiemurphyit@gmail.com>
Date: Tue, 25 Jul 2023 13:54:08 +0100
Subject: [PATCH 1/4] bump beat versions to 8.8.2

---
 dist/fetch_collectors.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/fetch_collectors.sh b/dist/fetch_collectors.sh
index 7c55921..8b17a30 100755
--- a/dist/fetch_collectors.sh
+++ b/dist/fetch_collectors.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ARCHS=( x86 x86_64 )
-FILEBEAT_VERSION=7.11.1
-WINLOGBEAT_VERSION=7.11.1
+FILEBEAT_VERSION=8.8.2
+WINLOGBEAT_VERSION=8.8.2
 
 # $1: beat name
 # $2: beat operating system

From 952e87f42c07e081d8a2285bc0a7189f3b99164b Mon Sep 17 00:00:00 2001
From: Marco Pfatschbacher <marco@graylog.com>
Date: Wed, 2 Aug 2023 11:38:01 +0200
Subject: [PATCH 2/4] Keep win32 beats at version 7.17.12

Those were the last ones released for win32

We might consider removing win32 support for the sidecar as well.
---
 dist/fetch_collectors.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dist/fetch_collectors.sh b/dist/fetch_collectors.sh
index 8b17a30..1ab7390 100755
--- a/dist/fetch_collectors.sh
+++ b/dist/fetch_collectors.sh
@@ -2,7 +2,9 @@
 
 ARCHS=( x86 x86_64 )
 FILEBEAT_VERSION=8.8.2
+FILEBEAT_VERSION_32=7.17.12
 WINLOGBEAT_VERSION=8.8.2
+WINLOGBEAT_VERSION_32=7.17.12
 
 # $1: beat name
 # $2: beat operating system
@@ -40,7 +42,12 @@ download_beat()
 
 for ARCH in "${ARCHS[@]}"
 do
-  download_beat "filebeat" "windows" ${FILEBEAT_VERSION} ${ARCH}
-  download_beat "winlogbeat" "windows" ${WINLOGBEAT_VERSION} ${ARCH}
+  #download_beat "filebeat" "linux" ${FILEBEAT_VERSION} ${ARCH}
+  :
 done
 
+download_beat "filebeat" "windows" ${FILEBEAT_VERSION} x86_64
+download_beat "filebeat" "windows" ${FILEBEAT_VERSION_32} x86
+
+download_beat "winlogbeat" "windows" ${WINLOGBEAT_VERSION} x86_64
+download_beat "winlogbeat" "windows" ${WINLOGBEAT_VERSION_32} x86

From 0b1cb6300708cf9bbb2935fe4dc26701e8625375 Mon Sep 17 00:00:00 2001
From: Marco Pfatschbacher <marco@graylog.com>
Date: Wed, 2 Aug 2023 11:52:33 +0200
Subject: [PATCH 3/4] Bump to latest version 8.9.0

---
 dist/fetch_collectors.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/fetch_collectors.sh b/dist/fetch_collectors.sh
index 1ab7390..f6bcfef 100755
--- a/dist/fetch_collectors.sh
+++ b/dist/fetch_collectors.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 ARCHS=( x86 x86_64 )
-FILEBEAT_VERSION=8.8.2
+FILEBEAT_VERSION=8.9.0
 FILEBEAT_VERSION_32=7.17.12
-WINLOGBEAT_VERSION=8.8.2
+WINLOGBEAT_VERSION=8.9.0
 WINLOGBEAT_VERSION_32=7.17.12
 
 # $1: beat name

From 88642b60d3133cfe4c7ec34ae44afceceb2b5e8e Mon Sep 17 00:00:00 2001
From: Marco Pfatschbacher <marco@graylog.com>
Date: Wed, 2 Aug 2023 11:58:13 +0200
Subject: [PATCH 4/4] Add changelog

---
 changelog/unreleased/pr-476.toml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/unreleased/pr-476.toml

diff --git a/changelog/unreleased/pr-476.toml b/changelog/unreleased/pr-476.toml
new file mode 100644
index 0000000..b3382b6
--- /dev/null
+++ b/changelog/unreleased/pr-476.toml
@@ -0,0 +1,6 @@
+type = "c"
+message = "Update shipped beats collectors to verion 8.9.0"
+
+issues = ["426", "437"]
+pulls = ["476"]
+