Refactoring (#87)

- Remove Kafka Ingester: We now only support the Fluent Bit output
  plugin for ClickHouse
- Use `log/slog` instead of `zap` for logging
- Update Fluent Bit to version 4.0.2
- Adjust examples for development
- Adjust CI/CD Pipeline
- Add Linting
- Rename Docker Image
- Format YAML Files

Author: ricoberger

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: [ricoberger]
+custom: ["https://www.paypal.me/ricoberger"]

.github/codeql/codeql-config.yaml

@@ -1,3 +1,4 @@
+---
 version: 2
 updates:
   - package-ecosystem: "github-actions"

.github/dependabot.yml

@@ -1,3 +1,4 @@
+---
 name-template: "$RESOLVED_VERSION"
 tag-template: "$RESOLVED_VERSION"
 version-template: "v$MAJOR.$MINOR.$PATCH"
@@ -15,15 +16,15 @@ version-resolver:
   minor:
     labels:
       - "changelog: added"
-      - "changelog: changed"
   patch:
     labels:
+      - "changelog: changed"
       - "changelog: fixed"
   default: patch
 category-template: "### $TITLE"
-change-template: '- #$NUMBER: $TITLE @$AUTHOR'
+change-template: "- #$NUMBER: $TITLE @$AUTHOR"
 template: |
   $CHANGES
 replacers:
-  - search: ':warning:'
-    replace: ':warning: _Breaking change:_ :warning:'
+  - search: ":warning:"
+    replace: ":warning: _Breaking change:_ :warning:"

.github/release.yaml

@@ -1,3 +1,4 @@
+---
 name: Continuous Delivery
 
 on:
@@ -8,90 +9,49 @@ on:
       - v*
 
 jobs:
-  plugin:
-    name: Plugin
+  docker:
+    name: Docker
     runs-on: ubuntu-latest
     permissions:
       packages: write
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set Docker Tag
-        id: tag
-        run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo TAG=${GITHUB_REF:10} >> $GITHUB_ENV
-          else
-            echo TAG=main >> $GITHUB_ENV
-          fi
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
+      - name: Docker Metadata
+        id: metadata
+        uses: docker/metadata-action@v5
         with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ghcr.io
-
-      - name: Build and Push Docker Image
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          context: .
-          file: ./cmd/plugin/Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/klogs:${{ env.TAG }}-plugin
-
-  ingester:
-    name: Ingester
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set Docker Tag
-        id: tag
-        run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo TAG=${GITHUB_REF:10} >> $GITHUB_ENV
-          else
-            echo TAG=main >> $GITHUB_ENV
-          fi
+          images: |
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{raw}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to DockerHub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Push Docker Image
-        id: docker_build
+      - name: Build and Push Docker Image (webhook)
+        id: docker_build_webhook
         uses: docker/build-push-action@v6
         with:
           push: true
           context: .
-          file: ./cmd/ingester/Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/klogs:${{ env.TAG }}-ingester
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}

.github/workflows/codeql.yaml

@@ -1,3 +1,4 @@
+---
 name: Continuous Integration
 
 on:
@@ -25,22 +26,37 @@ jobs:
           cache: true
           cache-dependency-path: go.sum
 
-      - name: Download Dependencies
-        run: |
-          go mod download
-
-      - name: Vet
-        run: |
-          make vet
+      - name: Lint
+        uses: golangci/golangci-lint-action@v7
 
       - name: Test
         run: |
           make test
 
-      - name: Build Plugin
+      - name: Build
         run: |
-          make build-plugin
+          make build
 
-      - name: Build Ingester
-        run: |
-          make build-ingester
+  docker:
+    name: Docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker Image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          context: .
+          file: Dockerfile
+          platforms: linux/amd64

.github/workflows/continuous-delivery.yaml

@@ -1,3 +1,4 @@
+---
 name: Release
 
 on:

.github/workflows/continuous-integration.yaml

@@ -0,0 +1,38 @@
+---
+version: "2"
+linters:
+  default: none
+  enable:
+    - bodyclose
+    - gosec
+    - govet
+    - ineffassign
+    - noctx
+    - staticcheck
+    - unused
+    - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/kobsio/klogs
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.github/workflows/release.yaml

@@ -1,12 +1,11 @@
-# We can't go past 1.20.2 until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898
-FROM golang:1.20.2 as build
+FROM golang:1.24.3 AS build
 WORKDIR /root
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
-RUN make build-plugin
+RUN make build
 
-FROM fluent/fluent-bit:3.2.8
+FROM fluent/fluent-bit:4.0.2
 COPY --from=build /root/out_clickhouse.so /fluent-bit/bin/
 EXPOSE 2020
 CMD ["/fluent-bit/bin/fluent-bit", "--plugin", "/fluent-bit/bin/out_clickhouse.so", "--config", "/fluent-bit/etc/fluent-bit.conf"]