From 0e03ccae3f1506df44d9eb796a83d0246d0c72be Mon Sep 17 00:00:00 2001 From: Michael Briggs <120486102+MichaelBriggs-Coralogix@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:05:47 -0400 Subject: [PATCH] UPDATE Upgrade fluentd base image to 1.16.5 (#404) * UPDATE Upgrade fluentd base image to 1.16.5 * UPGRADE update fluentd deployments to use 1.16.5 * BUG Fix Fluentd manifest deployment README * FEAT Add comment Fluentd k8s README.md --- logs/CHANGELOG.md | 3 +++ logs/fluentd/aws-ecs/Json_TaskDefinition | 2 +- logs/fluentd/aws-ecs/VERSION | 2 +- logs/fluentd/aws-ecs/image/Dockerfile | 4 ++-- logs/fluentd/k8s-helm/http/Chart.yaml | 6 ++--- logs/fluentd/k8s-helm/http/values.yaml | 2 +- logs/fluentd/k8s-manifest/README.md | 28 +++++++++++++---------- logs/fluentd/k8s-manifest/fluentd-ds.yaml | 2 +- 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/logs/CHANGELOG.md b/logs/CHANGELOG.md index 2f02fcad..e70f35ef 100644 --- a/logs/CHANGELOG.md +++ b/logs/CHANGELOG.md @@ -2,6 +2,9 @@ ## Fluentd +### v1.16.5 / 2024-04-25 +* [UPGRADE] Upgrade Fluentd Helm chart dependency to 0.5.2 +* ### v1.16.5 / 2024-04-24 * [UPGRADE] Upgrade Fluentd version to v1.16.5 diff --git a/logs/fluentd/aws-ecs/Json_TaskDefinition b/logs/fluentd/aws-ecs/Json_TaskDefinition index 47ea5d9c..ef5bc828 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.16.3", + "image": "docker.io/coralogixrepo/fluentd-coralogix-ecs:1.16.5", "startTimeout": null, "firelensConfiguration": null, "dependsOn": null, diff --git a/logs/fluentd/aws-ecs/VERSION b/logs/fluentd/aws-ecs/VERSION index c2c536ea..de1fb70f 100644 --- a/logs/fluentd/aws-ecs/VERSION +++ b/logs/fluentd/aws-ecs/VERSION @@ -1 +1 @@ -v1.15.2 +v1.16.5 diff --git a/logs/fluentd/aws-ecs/image/Dockerfile b/logs/fluentd/aws-ecs/image/Dockerfile index 70ff5ad5..f4e1116e 100644 --- a/logs/fluentd/aws-ecs/image/Dockerfile +++ b/logs/fluentd/aws-ecs/image/Dockerfile @@ -1,8 +1,8 @@ -FROM coralogixrepo/coralogix-fluentd-multiarch:v1.16.3 +FROM coralogixrepo/coralogix-fluentd-multiarch:v1.16.5 USER root RUN gem install fluent-plugin-docker_metadata_filter RUN gem install fluent-plugin-script RUN apt update && apt install -y curl -COPY fargate.rb /fluentd/etc/ +COPY fargate.rb /fluentd/etc/ COPY fluent.conf /fluentd/etc/ COPY firelens.conf /fluentd/etc/ diff --git a/logs/fluentd/k8s-helm/http/Chart.yaml b/logs/fluentd/k8s-helm/http/Chart.yaml index c3171511..a1489001 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.14 -appVersion: v1.16.3 +version: 0.0.15 +appVersion: v1.16.5 keywords: - Fluentd - HTTP output plugin dependencies: - name: fluentd - version: "0.5.0" + version: "0.5.2" repository: https://fluent.github.io/helm-charts tags: - fluentd with http output plugin diff --git a/logs/fluentd/k8s-helm/http/values.yaml b/logs/fluentd/k8s-helm/http/values.yaml index f71e8858..303ce7ab 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.3 + tag: v1.16.5 podSecurityPolicy: enabled: false diff --git a/logs/fluentd/k8s-manifest/README.md b/logs/fluentd/k8s-manifest/README.md index 51bb3958..8ad554f1 100644 --- a/logs/fluentd/k8s-manifest/README.md +++ b/logs/fluentd/k8s-manifest/README.md @@ -31,16 +31,16 @@ change 'ENDPOINT' according to your logs endpoint from the table below. And apply it: ```bash -kubectl apply -f fluentd-env-cm.yaml +kubectl apply -f fluentd-env-cm.yaml -n monitoring ``` Next apply the manifest files in this directory: ```bash -kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-cm.yaml -kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-rbac.yaml -kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc.yaml -kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-ds.yaml +kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-cm.yaml -n monitoring +kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-rbac.yaml -n monitoring +kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc.yaml -n monitoring +kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-ds.yaml -n monitoring ``` The output should be : @@ -61,7 +61,7 @@ service/fluentd-http created If you have prometheus-operator installed you can also install this service monitor resource: ```bash -kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc-monitor.yaml +kubectl apply -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc-monitor.yaml -n monitoring ``` ## Modifying applicationName and subsystemName @@ -144,11 +144,11 @@ To achive that we modify the 'record_transformer' filter: To remove all resources created with manifest files use these commands: ```bash -kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-cm.yaml -kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-rbac.yaml -kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc.yaml -kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-ds.yaml -kubectl delete -f fluentd-env-cm.yaml +kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-cm.yaml -n monitoring +kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-rbac.yaml -n monitoring +kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-svc.yaml -n monitoring +kubectl delete -f https://raw.githubusercontent.com/coralogix/telemetry-shippers/master/logs/fluentd/k8s-manifest/fluentd-ds.yaml -n monitoring +kubectl delete -f fluentd-env-cm.yaml -n monitoring ``` The output should be : @@ -177,12 +177,16 @@ configmap "fluentd-env" deleted | SG | `ingress.coralogixsg.com` | | IN | `ingress.coralogix.in` | +## Deploy to different namespace + +If you wish to deploy the fluentd integration to a different namespace other than "monitoring" you'll need to change the fluentd-rbac.yaml file ClusterRoleBinding namespace accordingly. + ## Disable Systemd Logs In order to disable the systemd logs, remove the `fluentd-systemd-conf` configmap: ```yaml -kubectl delete cm fluentd-systemd-conf +kubectl delete cm fluentd-systemd-conf -n monitoring ``` ## Dashboard diff --git a/logs/fluentd/k8s-manifest/fluentd-ds.yaml b/logs/fluentd/k8s-manifest/fluentd-ds.yaml index 432b347d..51d8d72e 100644 --- a/logs/fluentd/k8s-manifest/fluentd-ds.yaml +++ b/logs/fluentd/k8s-manifest/fluentd-ds.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: fluentd-http containers: - name: fluentd - image: "coralogixrepo/coralogix-fluentd-multiarch:v1.15.2" + image: "coralogixrepo/coralogix-fluentd-multiarch:v1.16.5" imagePullPolicy: IfNotPresent env: - name: FLUENTD_CONF