rebase with upstream (#37)

* Bump ruby from 3.3.4-slim to 3.3.5-slim (kokuwaio#112)

* fix wording (kokuwaio#115)

* disable YAML_PRETTIER

* Bump github/super-linter from 6 to 7 (kokuwaio#111)

Bumps [github/super-linter](https://github.com/github/super-linter) from 6 to 7.
- [Release notes](https://github.com/github/super-linter/releases)
- [Changelog](https://github.com/github/super-linter/blob/main/CHANGELOG.md)
- [Commits](github/super-linter@v6...v7)

---
updated-dependencies:
- dependency-name: github/super-linter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruby from 3.3.5-slim to 3.3.6-slim (kokuwaio#122)

* Bump ruby from 3.3.6-slim to 3.4.1-slim (kokuwaio#128)

Bumps ruby from 3.3.6-slim to 3.4.1-slim.

---
updated-dependencies:
- dependency-name: ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ruby from 3.4.1-slim to 3.4.2-slim (kokuwaio#132)

* use ghcr only (kokuwaio#135)

Signed-off-by: André Bauer <[email protected]>

* remove quay.io (kokuwaio#136)

* Update fluent-plugin-systemd requirement from 1.1.0 to 1.1.1 (kokuwaio#134)

Updates the requirements on [fluent-plugin-systemd](https://github.com/reevoo/fluent-plugin-systemd) to permit the latest version.
- [Release notes](https://github.com/reevoo/fluent-plugin-systemd/releases)
- [Commits](fluent-plugins-nursery/fluent-plugin-systemd@v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: fluent-plugin-systemd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update docker image link

* fix link

* Delete test.conf

* Update oj requirement from 3.16.9 to 3.16.10 (kokuwaio#133)

Updates the requirements on [oj](https://github.com/ohler55/oj) to permit the latest version.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](ohler55/oj@v3.16.9...v3.16.10)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update activesupport requirement from 8.0.1 to 8.0.2 (kokuwaio#137)

* Update fluent-plugin-prometheus requirement from 2.2.0 to 2.2.1 (kokuwaio#138)

* Bump ruby from 3.4.2-slim to 3.4.3-slim (kokuwaio#139)

* Bump ruby from 3.4.3-slim to 3.4.4-slim (kokuwaio#140)

* Update oj requirement from 3.16.10 to 3.16.11 (kokuwaio#141)

* Update fluent-plugin-concat requirement from 2.5.0 to 2.6.0 (kokuwaio#142)

* Bump ruby from 3.4.4-slim to 3.4.5-slim (kokuwaio#143)

* Bump actions/checkout from 4 to 5 (kokuwaio#145)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update activesupport requirement from 8.0.2 to 8.0.2.1 (kokuwaio#144)

Updates the requirements on [activesupport](https://github.com/rails/rails) to permit the latest version.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v8.0.2.1/activesupport/CHANGELOG.md)
- [Commits](rails/rails@v8.0.2...v8.0.2.1)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-version: 8.0.2.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update fluentd

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: André Bauer <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: André Bauer <[email protected]>

Author: 3 people

.github/workflows/ci.yaml

@@ -9,25 +9,26 @@ jobs:
   super-linter:
     permissions:
       statuses: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter/slim@v6
+        uses: github/super-linter/slim@v7
         env:
           DEFAULT_BRANCH: master
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_SHELL_SHFMT: false
+          VALIDATE_YAML_PRETTIER: false
 
   docker-build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/release-drafter.yaml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: release-drafter/release-drafter@v6
         env:

.github/workflows/release.yaml

@@ -15,24 +15,17 @@ jobs:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to quay.io container registry
-        uses: docker/login-action@v3 
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USER }}
-          password: ${{ secrets.QUAY_TOKEN }}
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -46,7 +39,6 @@ jobs:
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/fluentd-elasticsearch
-            quay.io/fluentd_elasticsearch/fluentd
           tags: |
             type=ref,event=branch
             type=ref,event=tag

Dockerfile

@@ -24,7 +24,7 @@
 # 3. Remove build dependencies.
 # 4. Cleanup leftover caches & files.
 
-FROM ruby:3.3.4-slim AS builder
+FROM ruby:3.4.5-slim AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -39,7 +39,7 @@ RUN apt-get update && \
     echo 'gem: --no-document' >> /etc/gemrc && \
     gem install --file Gemfile
 
-FROM ruby:3.3.4-slim
+FROM ruby:3.4.5-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 

Gemfile

@@ -1,17 +1,20 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '8.0.1'
+gem 'activesupport', '8.0.2.1'
 gem 'elasticsearch-xpack', '7.17.11'
 gem 'fluentd', '1.18.0'
-gem 'fluent-plugin-concat', '2.5.0'
+gem 'fluent-plugin-concat', '2.6.0'
 gem 'fluent-plugin-detect-exceptions', '0.0.16'
 gem 'fluent-plugin-elasticsearch', '5.4.3'
 gem 'fluent-plugin-kubernetes_metadata_filter', '3.7.1'
 gem 'fluent-plugin-multi-format-parser', '1.1.0'
 gem 'fluent-plugin-opensearch', '1.1.5'
-gem 'fluent-plugin-prometheus', '2.2.0'
-gem 'fluent-plugin-systemd', '1.1.0'
-gem 'oj', '3.16.9'
+gem 'fluent-plugin-prometheus', '2.2.1'
+gem 'fluent-plugin-systemd', '1.1.1'
+gem 'fluent-plugin-record-modifier', '2.2.0'
+gem 'fluent-plugin-rewrite-tag-filter', '2.4.0'
+gem 'fluent-plugin-dedot_filter', '1.0.0'
+gem 'oj', '3.16.11'
 gem 'fluent-plugin-record-modifier', '2.2.0'
 gem 'fluent-plugin-rewrite-tag-filter', '2.4.0'
 gem 'fluent-plugin-dedot_filter', '1.0.0'

README.md

@@ -4,6 +4,6 @@ Docker image for fluentd-elasticsearch which was used in [Kubernetes](https://gi
 
 It's used now in the [Kokuwa fluentd-elasticsearch Helm chart](https://github.com/kokuwaio/helm-charts/tree/main/charts/fluentd-elasticsearch).
 
-Docker repo: <https://quay.io/repository/fluentd_elasticsearch/fluentd>
+Docker repository: <https://ghcr.io/kokuwaio/fluentd-elasticsearch>
 
 Last version before removal in Kubernetes was: <https://github.com/kubernetes/kubernetes/tree/9682b7248fb69733c2a0ee53618856e87b067f16/cluster/addons/fluentd-elasticsearch>