From de8ff6bf6809cf784d0532aa23d87ec7ed3b62cc Mon Sep 17 00:00:00 2001
From: Michael Briggs <michael.briggs@coralogix.com>
Date: Wed, 22 Nov 2023 09:01:33 -0500
Subject: [PATCH] UPDATE - Update fluentd and fluentbit to latest versions for
CVE fixes.
---
logs/CHANGELOG.md | 12 ++++++++++++
logs/fluent-bit/image/Dockerfile | 4 ++--
logs/fluent-bit/image/VERSION | 2 +-
logs/fluent-bit/k8s-helm/http/Chart.yaml | 6 +++---
logs/fluent-bit/k8s-helm/http/values.yaml | 2 +-
logs/fluentd/aws-ecs/Json_TaskDefinition | 2 +-
logs/fluentd/aws-ecs/image/Dockerfile | 2 +-
logs/fluentd/image/Dockerfile | 4 ++--
logs/fluentd/image/README.md | 2 +-
logs/fluentd/image/VERSION | 2 +-
logs/fluentd/k8s-helm/http/Chart.yaml | 6 +++---
logs/fluentd/k8s-helm/http/README.md | 1 +
logs/fluentd/k8s-helm/http/values.yaml | 2 +-
13 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/logs/CHANGELOG.md b/logs/CHANGELOG.md
index ee1f849e..adc9df05 100644
--- a/logs/CHANGELOG.md
+++ b/logs/CHANGELOG.md
@@ -2,6 +2,12 @@
## Fluentd
+### v1.16.3 / 2023-11-22
+
+* [UPGRADE] Upgrade Fluentd version to v1.16.3
+* [UPGRADE] Upgrade Fluentd Helm chart dependency to 0.5.0
+
+
### v1.16.2 / 2023-11-09
* [UPGRADE] Upgrade Fluentd version to v1.16.2
@@ -32,6 +38,12 @@
## Fluent-Bit
+### v2.2.0 / 2023-11-22
+
+* [UPGRADE] Upgrade Fluentbit version to v2.2.0
+* [UPGRADE] Upgrade Fluentbit Helm chart dependency to 0.40.0
+
+
### v2.1.4 / 2023-06-21
[CHANGE] Fixing SUB_SYSTEM_SYSTEMD value.
diff --git a/logs/fluent-bit/image/Dockerfile b/logs/fluent-bit/image/Dockerfile
index 828e7254..b49b6c8a 100644
--- a/logs/fluent-bit/image/Dockerfile
+++ b/logs/fluent-bit/image/Dockerfile
@@ -8,10 +8,10 @@ COPY ./out_coralogix.go ./go.mod ./go.sum ./
RUN go mod vendor && \
go build -buildmode=c-shared -ldflags "-s -w" -mod=vendor -o out_coralogix.$TARGETARCH.so .
-FROM fluent/fluent-bit:2.1.3
+FROM fluent/fluent-bit:2.2.0
ARG TARGETARCH
MAINTAINER Coralogix Inc. <info@coralogix.com>
-LABEL Description="Special Fluent-Bit image for Coralogix integration" Vendor="Coralogix Inc." Version="2.1.3"
+LABEL Description="Special Fluent-Bit image for Coralogix integration" Vendor="Coralogix Inc." Version="2.2.0"
COPY --from=builder /go/src/app/plugins.conf /fluent-bit/etc/
COPY --from=builder /go/src/app/out_coralogix.$TARGETARCH.so /fluent-bit/plugins/out_coralogix.so
COPY ./functions.lua /fluent-bit/etc/
diff --git a/logs/fluent-bit/image/VERSION b/logs/fluent-bit/image/VERSION
index 535b2f4d..cf2dc0bc 100644
--- a/logs/fluent-bit/image/VERSION
+++ b/logs/fluent-bit/image/VERSION
@@ -1 +1 @@
-v2.1.3
+v2.2.0
\ No newline at end of file
diff --git a/logs/fluent-bit/k8s-helm/http/Chart.yaml b/logs/fluent-bit/k8s-helm/http/Chart.yaml
index 03428a68..30454bb8 100644
--- a/logs/fluent-bit/k8s-helm/http/Chart.yaml
+++ b/logs/fluent-bit/k8s-helm/http/Chart.yaml
@@ -1,14 +1,14 @@
apiVersion: v2
name: fluent-bit-http
description: Fluent-Bit Chart with HTTP output plugin
-version: 2.1.4
-appVersion: 2.1.3
+version: 2.2.0
+appVersion: 2.2.0
keywords:
- Fluent-Bit
- HTTP output plugin
dependencies:
- name: fluent-bit
- version: "0.30.4"
+ version: "0.40.0"
repository: https://fluent.github.io/helm-charts
sources:
- https://github.com/fluent/fluent-bit/
diff --git a/logs/fluent-bit/k8s-helm/http/values.yaml b/logs/fluent-bit/k8s-helm/http/values.yaml
index 643704cd..2911000d 100644
--- a/logs/fluent-bit/k8s-helm/http/values.yaml
+++ b/logs/fluent-bit/k8s-helm/http/values.yaml
@@ -3,7 +3,7 @@ fluent-bit:
image:
repository: coralogixrepo/coralogix-fluent-bit-multiarch
- tag: v2.1.3
+ tag: v2.2.0
serviceMonitor:
enabled: true
diff --git a/logs/fluentd/aws-ecs/Json_TaskDefinition b/logs/fluentd/aws-ecs/Json_TaskDefinition
index ff812685..47ea5d9c 100644
--- a/logs/fluentd/aws-ecs/Json_TaskDefinition
+++ b/logs/fluentd/aws-ecs/Json_TaskDefinition
@@ -47,7 +47,7 @@
"memoryReservation": 512,
"volumesFrom": [],
"stopTimeout": null,
- "image": "docker.io/coralogixrepo/fluentd-coralogix-ecs:1.15.2",
+ "image": "docker.io/coralogixrepo/fluentd-coralogix-ecs:1.16.3",
"startTimeout": null,
"firelensConfiguration": null,
"dependsOn": null,
diff --git a/logs/fluentd/aws-ecs/image/Dockerfile b/logs/fluentd/aws-ecs/image/Dockerfile
index 0135ba94..70ff5ad5 100644
--- a/logs/fluentd/aws-ecs/image/Dockerfile
+++ b/logs/fluentd/aws-ecs/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM coralogixrepo/coralogix-fluentd-multiarch:v1.15.2
+FROM coralogixrepo/coralogix-fluentd-multiarch:v1.16.3
USER root
RUN gem install fluent-plugin-docker_metadata_filter
RUN gem install fluent-plugin-script
diff --git a/logs/fluentd/image/Dockerfile b/logs/fluentd/image/Dockerfile
index ce411d6f..ff7f33c4 100644
--- a/logs/fluentd/image/Dockerfile
+++ b/logs/fluentd/image/Dockerfile
@@ -1,10 +1,10 @@
-ARG IMAGE_VERSION=v1.16.2-debian-forward-1.1
+ARG IMAGE_VERSION=v1.16.3-debian-forward-1.0
FROM fluent/fluentd-kubernetes-daemonset:${IMAGE_VERSION}
# Image description labels
LABEL Description="Multi-Arch FluentD image for Coralogix integration" \
Vendor="Coralogix Inc." \
- Version="1.16.2" \
+ Version="1.16.3" \
Maintainer="Coralogix Inc. <info@coralogix.com>"
# Change user
diff --git a/logs/fluentd/image/README.md b/logs/fluentd/image/README.md
index 45219ff1..6036e4a4 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.16.2-debian-forward-1.1`
+`fluent/fluentd-kubernetes-daemonset:v1.16.3-debian-forward-1.0`
Supported plugin List:
diff --git a/logs/fluentd/image/VERSION b/logs/fluentd/image/VERSION
index 2d1081d6..aedc631c 100644
--- a/logs/fluentd/image/VERSION
+++ b/logs/fluentd/image/VERSION
@@ -1 +1 @@
-v1.16.2
+v1.16.3
diff --git a/logs/fluentd/k8s-helm/http/Chart.yaml b/logs/fluentd/k8s-helm/http/Chart.yaml
index 0cd8d1c9..c3171511 100644
--- a/logs/fluentd/k8s-helm/http/Chart.yaml
+++ b/logs/fluentd/k8s-helm/http/Chart.yaml
@@ -1,14 +1,14 @@
apiVersion: v2
name: fluentd-http
description: Fluentd Chart with HTTP output plugin
-version: 0.0.13
-appVersion: v1.16.2
+version: 0.0.14
+appVersion: v1.16.3
keywords:
- Fluentd
- HTTP output plugin
dependencies:
- name: fluentd
- version: "0.4.3"
+ version: "0.5.0"
repository: https://fluent.github.io/helm-charts
tags:
- fluentd with http output plugin
diff --git a/logs/fluentd/k8s-helm/http/README.md b/logs/fluentd/k8s-helm/http/README.md
index 9dcee5f0..3bc144eb 100644
--- a/logs/fluentd/k8s-helm/http/README.md
+++ b/logs/fluentd/k8s-helm/http/README.md
@@ -58,6 +58,7 @@ Therefore, the PodSecurityPolicy is disabled in this chart since version 0.0.11.
| EU | `ingress.coralogix.com` |
| EU2 | `ingress.eu2.coralogix.com` |
| US | `ingress.coralogix.us` |
+| US2 |`ingress.cx498-aws-us-west-2.coralogix.com`|
| SG | `ingress.coralogixsg.com` |
| IN | `ingress.coralogix.in` |
diff --git a/logs/fluentd/k8s-helm/http/values.yaml b/logs/fluentd/k8s-helm/http/values.yaml
index 8056dcf7..e8761c92 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.16.2
+ tag: v1.16.3
podSecurityPolicy:
enabled: false