From 2535697be386d5556b103533af794333b50bd07f Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:21:33 +0100
Subject: [PATCH 01/16] Update Dockerfile

- remove the downgrade of fluent-plugin-kubernetes_metadata_filter
- use the new fluent-pluging-splunkhec 2.1 which came with v1.16.0
- bump flunetd-operator to v1.16.2
---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ec8a8d..dc68d87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,8 @@
-FROM vmware/kube-fluentd-operator:v1.12.0
+FROM vmware/kube-fluentd-operator:v1.16.2
 
 RUN set -e \
  && tdnf install -y jq \
- && gem install -N fluent-plugin-kubernetes_metadata_filter -v "2.4.1" \
- && gem uninstall fluent-plugin-kubernetes_metadata_filter -v "2.4.2" \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
- && gem install -N fluent-plugin-splunk-hec -v "1.1.0" \
  && echo OK
 
 # Patch configuration files:

From 0444266f875665aa793e4a5420f98c115cb47056 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 19 Jan 2022 16:45:08 +0100
Subject: [PATCH 02/16] tdnf install sed, install fluent-plugin-splunk-hec

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dc68d87..e77ee7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,13 @@
 FROM vmware/kube-fluentd-operator:v1.16.2
 
 RUN set -e \
- && tdnf install -y jq \
+ && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
+ && gem install -N fluent-plugin-splunk-hec -v "1.2.9" \
  && echo OK
 
 # Patch configuration files:
-# - Include kube-system.conf after the configs of all other namespaces. 
+# - Include kube-system.conf after the configs of all other namespaces.
 #   The original behaviour was to include kube-system.conf before all other namespaces.
 RUN set -e \
  && sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \

From 1f5abf1d13916a7b334f3d40de6834749eddca7a Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 26 Jan 2022 16:10:06 +0100
Subject: [PATCH 03/16] rename 'kube-system' to 'admin namespace'

Filename changed:
- https://github.com/vmware/kube-fluentd-operator/commit/a74915c36f91d472c7465024a3ce94e3497fd715
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e77ee7e..106c8c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,5 +10,5 @@ RUN set -e \
 # - Include kube-system.conf after the configs of all other namespaces.
 #   The original behaviour was to include kube-system.conf before all other namespaces.
 RUN set -e \
- && sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
+ && sed -i '/^#.*admin namespace/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
  && sed -i '/format3/ s!/[|]!/|^!' /templates/kubernetes.conf

From d4c5fd7529fd918219541129d9782ae9d4715c6d Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:09:36 +0100
Subject: [PATCH 04/16] Fluent Plugin Splunk HEC v1.2.10

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 106c8c7..7d9636a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM vmware/kube-fluentd-operator:v1.16.2
 RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
- && gem install -N fluent-plugin-splunk-hec -v "1.2.9" \
+ && gem install -N fluent-plugin-splunk-hec -v "1.2.10" \
  && echo OK
 
 # Patch configuration files:

From ee84f06678d11610cf405077cc4b0c7c6a1a7925 Mon Sep 17 00:00:00 2001
From: Jonas Rutishauser <jonas.rutishauser@alumni.ethz.ch>
Date: Fri, 10 Jun 2022 13:44:22 +0200
Subject: [PATCH 05/16] Update to version 1.16.6 and use relabel to allow
 kube-system.conf before all

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d9636a..a0bfa0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,13 @@
-FROM vmware/kube-fluentd-operator:v1.16.2
+FROM vmware/kube-fluentd-operator:v1.16.6
 
 RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
- && gem install -N fluent-plugin-splunk-hec -v "1.2.10" \
  && echo OK
 
 # Patch configuration files:
-# - Include kube-system.conf after the configs of all other namespaces.
-#   The original behaviour was to include kube-system.conf before all other namespaces.
+# - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
+# - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs
 RUN set -e \
- && sed -i '/^#.*admin namespace/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
- && sed -i '/format3/ s!/[|]!/|^!' /templates/kubernetes.conf
+  && sed -i 's/@type null/@type relabel\n  @label @DEFAULT_OUTPUT/' /templates/fluent.conf \
+  && sed -i 's!/var/log/kubelet.log!/var/lib/rancher/rke2/agent/logs/kubelet.log!' /templates/kubernetes.conf

From bcc3012d292d57a085301b6aa58e27971a9ec85b Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Mon, 19 Dec 2022 14:37:10 +0100
Subject: [PATCH 06/16] bump fluentd-operator to v1.16.8

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a0bfa0f..536c3b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vmware/kube-fluentd-operator:v1.16.6
+FROM vmware/kube-fluentd-operator:v1.16.8
 
 RUN set -e \
  && tdnf install -y jq sed \

From 2b61a181adaf7de689bbde02c19f8df814e45dee Mon Sep 17 00:00:00 2001
From: Jonas Rutishauser <jonas.rutishauser@css.ch>
Date: Wed, 28 Dec 2022 20:30:56 +0100
Subject: [PATCH 07/16] Use patched config reloader

---
 Dockerfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 536c3b3..6c8b51d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,12 @@
+# Use patched reloader. Can be removed after version with fix (https://github.com/vmware/kube-fluentd-operator/pull/360) is available.
+FROM golang:1.18 as builder
+WORKDIR /go/src/github.com/vmware/kube-fluentd-operator
+RUN set -e \
+ && git clone --depth 1 --branch bugfix/migration-mode-with-cr-namespaces https://github.com/jonasrutishauser/kube-fluentd-operator.git . \
+ && cd config-reloader \
+ && GO111MODULE=on GOARCH=amd64 CGO_ENABLED=0 go build -v -ldflags "-X github.com/vmware/kube-fluentd-operator/config-reloader/config.Version=1.16.8-1 -w -s" .
+# End patch build
+
 FROM vmware/kube-fluentd-operator:v1.16.8
 
 RUN set -e \
@@ -5,6 +14,9 @@ RUN set -e \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && echo OK
 
+# Use patched reloader
+COPY --from=builder /go/src/github.com/vmware/kube-fluentd-operator/config-reloader/config-reloader /bin/config-reloader
+
 # Patch configuration files:
 # - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
 # - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs

From 4b8b4c6a2dd4c921d000857d5dc895cbc1f1746f Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Tue, 8 Aug 2023 08:53:37 +0200
Subject: [PATCH 08/16] remove patch and update fluentd-operator

---
 Dockerfile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c8b51d..d998c05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,10 @@
-# Use patched reloader. Can be removed after version with fix (https://github.com/vmware/kube-fluentd-operator/pull/360) is available.
-FROM golang:1.18 as builder
-WORKDIR /go/src/github.com/vmware/kube-fluentd-operator
-RUN set -e \
- && git clone --depth 1 --branch bugfix/migration-mode-with-cr-namespaces https://github.com/jonasrutishauser/kube-fluentd-operator.git . \
- && cd config-reloader \
- && GO111MODULE=on GOARCH=amd64 CGO_ENABLED=0 go build -v -ldflags "-X github.com/vmware/kube-fluentd-operator/config-reloader/config.Version=1.16.8-1 -w -s" .
-# End patch build
-
-FROM vmware/kube-fluentd-operator:v1.16.8
+FROM vmware/kube-fluentd-operator:v1.17.6
 
 RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && echo OK
 
-# Use patched reloader
-COPY --from=builder /go/src/github.com/vmware/kube-fluentd-operator/config-reloader/config-reloader /bin/config-reloader
-
 # Patch configuration files:
 # - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
 # - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs

From 6aeb33b69b1d4cd797851bd32d1add76d381c194 Mon Sep 17 00:00:00 2001
From: ChristianBieri1995
 <122007149+ChristianBieri1995@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:16:05 +0200
Subject: [PATCH 09/16] Update base image and add fluent-plugin-grafana-loki
 in/to dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d998c05..a370896 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
-FROM vmware/kube-fluentd-operator:v1.17.6
+FROM vmware/kube-fluentd-operator:v1.18.2
 
 RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
+ && gem install -N fluent-plugin-grafana-loki -v "1.2.20" \
  && echo OK
 
 # Patch configuration files:

From b506769e71b264f148de7a3d84901d7e410b2b38 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Tue, 11 Jun 2024 16:28:16 +0200
Subject: [PATCH 10/16] downgrade to fluentd-operator v1.18.0

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a370896..ad27510 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vmware/kube-fluentd-operator:v1.18.2
+FROM vmware/kube-fluentd-operator:v1.18.0
 
 RUN set -e \
  && tdnf install -y jq sed \

From 01688ae586e85a3e27a2ac00c802dac503f50643 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:24:13 +0200
Subject: [PATCH 11/16] use base image 1.17.6

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ad27510..5eaff89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vmware/kube-fluentd-operator:v1.18.0
+FROM vmware/kube-fluentd-operator:v1.17.6
 
 RUN set -e \
  && tdnf install -y jq sed \

From 4f2f3d5cf27fe54c1829bbbcd56c8fe352a667c8 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:24:14 +0100
Subject: [PATCH 12/16] update fluent-plugin-splunk-hec to v1.3.3

update fluent-plugin-splunk-hec to v1.3.3
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 5eaff89..c72b59a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && gem install -N fluent-plugin-grafana-loki -v "1.2.20" \
+ && gem install fluent-plugin-splunk-hec -v "1.3.3" \
  && echo OK
 
 # Patch configuration files:

From dbed384be2d3f94b295d0c9c35e44326ad75f432 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:25:40 +0100
Subject: [PATCH 13/16] update fluentd-operator to v1.18.2

update fluentd-operator to v1.18.2
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c72b59a..bbea7a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vmware/kube-fluentd-operator:v1.17.6
+FROM vmware/kube-fluentd-operator:v1.18.2
 
 RUN set -e \
  && tdnf install -y jq sed \

From aed72ea920963153a8fe31988b8e3e772209f756 Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 13 Nov 2024 12:51:39 +0100
Subject: [PATCH 14/16] fix to Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bbea7a3..3005e3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && gem install -N fluent-plugin-grafana-loki -v "1.2.20" \
- && gem install fluent-plugin-splunk-hec -v "1.3.3" \
+ && gem install -N fluent-plugin-splunk-hec -v "1.3.3" \
  && echo OK
 
 # Patch configuration files:

From 7207b49ff39a5940c3ab9bfb86aa5e7d79ff318b Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 13 Nov 2024 13:16:05 +0100
Subject: [PATCH 15/16] another try with fluent-plugin-splunk-hec -v "1.3.3"

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3005e3a..2b98a59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,12 @@ RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && gem install -N fluent-plugin-grafana-loki -v "1.2.20" \
- && gem install -N fluent-plugin-splunk-hec -v "1.3.3" \
  && echo OK
 
+RUN bundle install && \
+    gem uninstall fluent-plugin-splunk-hec -a -x && \
+    gem install -N fluent-plugin-splunk-hec -v "1.3.3"
+    
 # Patch configuration files:
 # - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
 # - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs

From 187afa54e328b7dd57ff55fb2fcbedde134ffb0f Mon Sep 17 00:00:00 2001
From: sebv7 <77109079+sebv7@users.noreply.github.com>
Date: Wed, 13 Nov 2024 13:34:29 +0100
Subject: [PATCH 16/16] another try for fluent-plugin-splunk-hec

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b98a59..d1b37b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,10 @@ RUN set -e \
  && tdnf install -y jq sed \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && gem install -N fluent-plugin-grafana-loki -v "1.2.20" \
+ && gem uninstall fluent-plugin-splunk-hec -a -x \
+ && gem install -N fluent-plugin-splunk-hec -v "1.3.3" \
  && echo OK
-
-RUN bundle install && \
-    gem uninstall fluent-plugin-splunk-hec -a -x && \
-    gem install -N fluent-plugin-splunk-hec -v "1.3.3"
-    
+ 
 # Patch configuration files:
 # - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
 # - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs