From c8761a3212e4796dada0f364e7add3c5185e4e42 Mon Sep 17 00:00:00 2001
From: Michael Briggs
 <120486102+MichaelBriggs-Coralogix@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:46:31 -0500
Subject: [PATCH] FEAT - Update fluentd image to 1.16.2 (#327)

* FEAT - Update fluentd image to 1.16.2

* FEAT - Update Fluentd Helm chart to use new image
---
 logs/CHANGELOG.md                      |  4 ++++
 logs/fluentd/image/Dockerfile          | 10 +++++-----
 logs/fluentd/image/README.md           |  4 ++--
 logs/fluentd/image/VERSION             |  2 +-
 logs/fluentd/k8s-helm/http/Chart.yaml  |  4 ++--
 logs/fluentd/k8s-helm/http/values.yaml |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/logs/CHANGELOG.md b/logs/CHANGELOG.md
index 09e64ae1..ee1f849e 100644
--- a/logs/CHANGELOG.md
+++ b/logs/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Fluentd
 
+### v1.16.2 / 2023-11-09
+
+* [UPGRADE] Upgrade Fluentd version to v1.16.2
+
 ### v1.15.2 / 2023-06-20
 
 * [DOWNGRADE] Restoring the image version to 0.0.7 in the Fluentd Helm (Coralogix Plugin) 'values.yaml' file
diff --git a/logs/fluentd/image/Dockerfile b/logs/fluentd/image/Dockerfile
index 43919d03..ce411d6f 100644
--- a/logs/fluentd/image/Dockerfile
+++ b/logs/fluentd/image/Dockerfile
@@ -1,17 +1,17 @@
-ARG IMAGE_VERSION=v1.15.2-debian-forward-1.0
+ARG IMAGE_VERSION=v1.16.2-debian-forward-1.1
 FROM fluent/fluentd-kubernetes-daemonset:${IMAGE_VERSION}
 
 # Image description labels
 LABEL Description="Multi-Arch FluentD image for Coralogix integration" \
       Vendor="Coralogix Inc." \
-      Version="1.0.0" \
+      Version="1.16.2" \
       Maintainer="Coralogix Inc. <info@coralogix.com>"
 
 # Change user
 USER root
 
 # Installing dependencies and plugins
-RUN gem install elasticsearch -v 7.13
+RUN gem install elasticsearch -v 8.11
 
 RUN gem install fluent-plugin-coralogix \
       fluent-plugin-parser-cri \
@@ -22,5 +22,5 @@ RUN gem install fluent-plugin-coralogix \
       fluent-plugin-elasticsearch
 
 
-RUN gem install fluent-plugin-kubernetes_metadata_filter -v 2.11.1
-RUN gem install fluent-plugin-prometheus -v 2.0.3
+RUN gem install fluent-plugin-kubernetes_metadata_filter -v 3.4.0
+RUN gem install fluent-plugin-prometheus -v 2.1.0
diff --git a/logs/fluentd/image/README.md b/logs/fluentd/image/README.md
index 4d292b79..45219ff1 100644
--- a/logs/fluentd/image/README.md
+++ b/logs/fluentd/image/README.md
@@ -5,7 +5,7 @@ This folder contains the docker file for the image Coralogix promotes along with
 ## Image base
 
 This image is based on the open source image:
-`fluent/fluentd-kubernetes-daemonset:v1.15.2-debian-forward-1.0`
+`fluent/fluentd-kubernetes-daemonset:v1.16.2-debian-forward-1.1`
 
 Supported plugin List:
 
@@ -19,4 +19,4 @@ Supported plugin List:
 | fluent-plugin-concat                     | (https://github.com/fluent-plugins-nursery/fluent-plugin-concat)         |
 | fluent-plugin-rewrite-tag-filter         | (https://github.com/fluent/fluent-plugin-rewrite-tag-filter)             |
 | fluent-plugin-detect-exceptions          | (https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions) |
-| fluent-plugin-elasticsearch              | )(https://github.com/uken/fluent-plugin-elasticsearch)                   |
+| fluent-plugin-elasticsearch              | (https://github.com/uken/fluent-plugin-elasticsearch)                    |
diff --git a/logs/fluentd/image/VERSION b/logs/fluentd/image/VERSION
index c2c536ea..2d1081d6 100644
--- a/logs/fluentd/image/VERSION
+++ b/logs/fluentd/image/VERSION
@@ -1 +1 @@
-v1.15.2
+v1.16.2
diff --git a/logs/fluentd/k8s-helm/http/Chart.yaml b/logs/fluentd/k8s-helm/http/Chart.yaml
index 59235d94..0cd8d1c9 100644
--- a/logs/fluentd/k8s-helm/http/Chart.yaml
+++ b/logs/fluentd/k8s-helm/http/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: fluentd-http
 description: Fluentd Chart with HTTP output plugin
-version: 0.0.12
-appVersion: v1.15.2
+version: 0.0.13
+appVersion: v1.16.2
 keywords:
   - Fluentd
   - HTTP output plugin
diff --git a/logs/fluentd/k8s-helm/http/values.yaml b/logs/fluentd/k8s-helm/http/values.yaml
index d55eca36..8056dcf7 100644
--- a/logs/fluentd/k8s-helm/http/values.yaml
+++ b/logs/fluentd/k8s-helm/http/values.yaml
@@ -3,7 +3,7 @@ fluentd:
 
   image:
     repository: coralogixrepo/coralogix-fluentd-multiarch
-    tag: v1.15.2
+    tag: v1.16.2
 
   podSecurityPolicy:
     enabled: false