Skip to content

Commit

Permalink
UPDATE Upgrade fluentd base image to 1.16.5 (#404)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
MichaelBriggs-Coralogix authored Apr 26, 2024
1 parent 8083210 commit 0e03cca
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 21 deletions.
3 changes: 3 additions & 0 deletions logs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion logs/fluentd/aws-ecs/Json_TaskDefinition
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion logs/fluentd/aws-ecs/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.15.2
v1.16.5
4 changes: 2 additions & 2 deletions logs/fluentd/aws-ecs/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
6 changes: 3 additions & 3 deletions logs/fluentd/k8s-helm/http/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion logs/fluentd/k8s-helm/http/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fluentd:

image:
repository: coralogixrepo/coralogix-fluentd-multiarch
tag: v1.16.3
tag: v1.16.5

podSecurityPolicy:
enabled: false
Expand Down
28 changes: 16 additions & 12 deletions logs/fluentd/k8s-manifest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand All @@ -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
Expand Down Expand Up @@ -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 :
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion logs/fluentd/k8s-manifest/fluentd-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0e03cca

Please sign in to comment.