From ae960da0cd7de7d3fae592840e04c841b99b5f4f Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Mon, 23 Oct 2023 14:51:06 -0400
Subject: [PATCH 1/2] UPGRADE: influxDB v2.7.1 & telegraf v1.28.2

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
---
 so-influxdb/Dockerfile | 10 +++++-----
 so-telegraf/Dockerfile |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/so-influxdb/Dockerfile b/so-influxdb/Dockerfile
index a38363d4..9ebde4ad 100644
--- a/so-influxdb/Dockerfile
+++ b/so-influxdb/Dockerfile
@@ -1,12 +1,12 @@
-ARG INFLUX_VERSION=2.6.1
+ARG INFLUX_VERSION=2.7.1
 
-FROM ghcr.io/security-onion-solutions/ubuntu:22.04 as builder
+FROM ghcr.io/security-onion-solutions/ubuntu:23.04 as builder
 
 ARG INFLUX_VERSION
-ARG NODE_VERSION=v18.14.0
+ARG NODE_VERSION=v20.8.1
 ARG NODE_ARCH=linux-x64
 
-RUN apt update -y && apt install -y git wget xz-utils 
+RUN apt update -y && apt install -y git wget xz-utils
 RUN git clone https://github.com/influxdata/ui -b OSS-v$INFLUX_VERSION
 RUN wget https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$NODE_ARCH.tar.xz -O /node.xz
 RUN tar -xJf /node.xz
@@ -34,7 +34,7 @@ RUN chmod a+x /redirect_to_file.sh && groupmod -g 939 influxdb
 
 COPY --from=builder /ui/build /ui
 
-RUN apt update -y && apt install netcat -y && apt clean -y
+RUN apt update -y && apt install netcat-traditional -y && apt clean -y
 
 ENTRYPOINT ["/redirect_to_file.sh"]
 CMD ["/entrypoint.sh", "influxd"]
\ No newline at end of file
diff --git a/so-telegraf/Dockerfile b/so-telegraf/Dockerfile
index 9b909a90..fb316652 100644
--- a/so-telegraf/Dockerfile
+++ b/so-telegraf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/security-onion-solutions/telegraf:1.25.1-alpine
+FROM ghcr.io/security-onion-solutions/telegraf:1.28.2-alpine
 LABEL maintainer "Security Onion Solutions, LLC"
 LABEL description="Telegraf running in Docker container for use with Security Onion"
 

From 068f1a609e60abf0b262f9a83c80531e84fbb330 Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:20:08 -0400
Subject: [PATCH 2/2] Add bash to telegraf for scripts/ to function properly

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
---
 so-telegraf/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/so-telegraf/Dockerfile b/so-telegraf/Dockerfile
index fb316652..3bcc0538 100644
--- a/so-telegraf/Dockerfile
+++ b/so-telegraf/Dockerfile
@@ -4,7 +4,7 @@ LABEL description="Telegraf running in Docker container for use with Security On
 
 USER root
 
-RUN apk add --no-cache redis curl jq
+RUN apk add --no-cache redis curl jq bash
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["telegraf"]