From a6f5d16e87d84513a644976bf1fc9d0ce16d8317 Mon Sep 17 00:00:00 2001
From: Seth Grover <seth.d.grover@gmail.com>
Date: Mon, 18 Nov 2024 21:29:40 -0700
Subject: [PATCH] bump fluent-bit and yq

---
 Dockerfiles/filebeat.Dockerfile               | 2 +-
 Dockerfiles/netbox.Dockerfile                 | 2 +-
 Dockerfiles/suricata.Dockerfile               | 2 +-
 scripts/third-party-logs/fluent-bit-setup.ps1 | 4 ++--
 shared/bin/zeek_install_plugins.sh            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfiles/filebeat.Dockerfile b/Dockerfiles/filebeat.Dockerfile
index 18932f286..6ca46ecd5 100644
--- a/Dockerfiles/filebeat.Dockerfile
+++ b/Dockerfiles/filebeat.Dockerfile
@@ -71,7 +71,7 @@ ENV SUPERCRONIC_VERSION "0.2.33"
 ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
 ENV SUPERCRONIC_CRONTAB "/etc/crontab"
 
-ENV YQ_VERSION "4.44.3"
+ENV YQ_VERSION "4.44.5"
 ENV YQ_URL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_"
 
 ENV EVTX_VERSION "0.8.4"
diff --git a/Dockerfiles/netbox.Dockerfile b/Dockerfiles/netbox.Dockerfile
index c422a0ce3..68a78c165 100644
--- a/Dockerfiles/netbox.Dockerfile
+++ b/Dockerfiles/netbox.Dockerfile
@@ -33,7 +33,7 @@ ENV NETBOX_INITIALIZERS_VERSION "50d077d"
 ENV NETBOX_TOPOLOGY_VERSION "4.0.1"
 ENV NETBOX_HEALTHCHECK_VERSION "0.2.0"
 
-ENV YQ_VERSION "4.44.3"
+ENV YQ_VERSION "4.44.5"
 ENV YQ_URL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_"
 
 ENV NETBOX_DEVICETYPE_LIBRARY_IMPORT_URL "https://codeload.github.com/netbox-community/Device-Type-Library-Import/tar.gz/develop"
diff --git a/Dockerfiles/suricata.Dockerfile b/Dockerfiles/suricata.Dockerfile
index 166d3be9d..8ce8b8db5 100644
--- a/Dockerfiles/suricata.Dockerfile
+++ b/Dockerfiles/suricata.Dockerfile
@@ -37,7 +37,7 @@ ENV SUPERCRONIC_VERSION "0.2.33"
 ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
 ENV SUPERCRONIC_CRONTAB "/etc/crontab"
 
-ENV YQ_VERSION "4.44.3"
+ENV YQ_VERSION "4.44.5"
 ENV YQ_URL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_"
 
 ENV SURICATA_VERSION_PATTERN "1:7.0.*"
diff --git a/scripts/third-party-logs/fluent-bit-setup.ps1 b/scripts/third-party-logs/fluent-bit-setup.ps1
index 7912a82c8..bb566e07f 100644
--- a/scripts/third-party-logs/fluent-bit-setup.ps1
+++ b/scripts/third-party-logs/fluent-bit-setup.ps1
@@ -8,8 +8,8 @@
 # Copyright (c) 2024 Battelle Energy Alliance, LLC.  All rights reserved.
 ###############################################################################
 
-$fluent_bit_version = '3.1'
-$fluent_bit_full_version = '3.1.9'
+$fluent_bit_version = '3.2'
+$fluent_bit_full_version = '3.2.1'
 
 ###############################################################################
 # select an item from a menu provided in an array
diff --git a/shared/bin/zeek_install_plugins.sh b/shared/bin/zeek_install_plugins.sh
index 2ecb92b7c..ab71198a6 100755
--- a/shared/bin/zeek_install_plugins.sh
+++ b/shared/bin/zeek_install_plugins.sh
@@ -133,8 +133,8 @@ ZKG_GITHUB_URLS=(
   "https://github.com/precurse/zeek-httpattacks"
   "https://github.com/mmguero-dev/GQUIC_Protocol_Analyzer"
   "https://github.com/SeisoLLC/zeek-kafka"
-  "https://github.com/zeek/spicy-tftp"
-  "https://github.com/zeek/spicy-zip"
+  "https://github.com/zeek/spicy-tftp|main"
+  "https://github.com/zeek/spicy-zip|main"
 )
 
 for i in ${ZKG_GITHUB_URLS[@]}; do