Merge branch 'master' into dependabot/docker/ruby-3.4.7-slim

Author: vomba

.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

Gemfile

@@ -1,17 +1,20 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '8.0.1'
+gem 'activesupport', '8.1.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>