From 12433b4f3198f4f2d132c4a4f246559233c93cce Mon Sep 17 00:00:00 2001
From: xkm <xkm@xkm.be>
Date: Tue, 5 May 2026 21:28:04 +0800
Subject: [PATCH] update fluent-bit to 5.0

- fluent-bit 5.0 support tag by url
- update readme.md
---
 README.md          |  7 +++++--
 docker-compose.yml | 34 +---------------------------------
 fluent-bit.conf    | 15 ++++-----------
 3 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 206d7fe..c138461 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,13 @@
 flowchart LR
     SDK[Python SDK] -->|logs / metrics| FB[Fluent Bit]
 
-    FB -->|logs| VLA[vlogagent]
-    VLA -->|logs| VL[VictoriaLogs]
+    FB -->|logs| VL[VictoriaLogs]
 
     FB -->|metrics| VM[VictoriaMetrics]
 
     VM -->|query| GF[Grafana]
+
+    VL -->|logs| GF
 ```
 
 
@@ -30,4 +31,6 @@ flowchart TD
 
     FB -->|metrics| VM[VictoriaMetrics]
     VM -->|query| GF[Grafana]
+
+    VL -->|logs| GF
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fb72ca..57595d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   fluentbit:
-    depends_on:
-      vlagent:
-        condition: service_started
-        required: true
-    image: cr.fluentbit.io/fluent/fluent-bit:3.1.7
+    image: docker.io/fluent/fluent-bit:5.0
     restart: always
     networks:
       default: null
@@ -67,32 +63,6 @@ services:
         source: victoriametrics
         target: /vmsingle
         volume: {}
-  vlagent:
-    command:
-      - --remoteWrite.tmpDataPath=/vlagent
-      - --remoteWrite.url=http://victorialogs-1:9428/insert/native
-      - --syslog.listenAddr.tcp=0.0.0.0:8094
-    depends_on:
-      victorialogs-1:
-        condition: service_healthy
-        required: true
-    healthcheck:
-      test:
-        - CMD
-        - wget
-        - -qO-
-        - http://127.0.0.1:9429/health
-      timeout: 1s
-      interval: 1s
-      retries: 10
-    image: victoriametrics/vlagent:v1.50.0
-    networks:
-      default: null
-    volumes:
-      - type: volume
-        source: vlagent
-        target: /vlagent
-        volume: {}
   demo-app:
     build:
       context: .
@@ -121,7 +91,5 @@ volumes:
     name: fluentbit-oltp_victorialogs-1
   victoriametrics:
     name: fluentbit-oltp_victoriametrics
-  vlagent:
-    name: fluentbit-oltp_vlagent
   grafana-data:
     name: fluentbit-oltp_grafana
diff --git a/fluent-bit.conf b/fluent-bit.conf
index c937b55..ee98040 100644
--- a/fluent-bit.conf
+++ b/fluent-bit.conf
@@ -14,10 +14,6 @@
     storage.checksum      off
     storage.backlog.mem_limit 64M
 
-# Python SDK / OpenTelemetry SDK 发到这里：
-#   http://vmauth:8427/v1/logs
-#   http://vmauth:8427/v1/metrics
-# vmauth 会转发到 fluentbit:4318
 [INPUT]
     Name                  opentelemetry
     Listen                0.0.0.0
@@ -26,9 +22,6 @@
     # OTLP/HTTP 通常期望 200；Fluent Bit 默认是 201
     Successful_Response_Code 200
 
-    # 保持默认行为：/v1/logs -> v1_logs, /v1/metrics -> v1_metrics
-    Tag_From_Uri          true
-
     Buffer_Chunk_Size     1M
     Buffer_Max_Size       10M
     Threaded              On
@@ -36,7 +29,7 @@
 # Python SDK 发来的 metrics -> VictoriaMetrics remote_write
 [OUTPUT]
     Name                  prometheus_remote_write
-    Match                 *
+    Match                 v1_metrics
     Host                  victoriametrics
     Port                  8428
     Uri                   /api/v1/write
@@ -48,9 +41,9 @@
 # Python SDK 发来的 logs -> vlagent -> VictoriaLogs
 [OUTPUT]
     Name                  opentelemetry
-    Match                 *
-    Host                  vlagent
-    Port                  9429
+    Match                 v1_logs
+    Host                  victorialogs-1
+    Port                  9428
 
     Logs_Uri              /insert/opentelemetry/v1/logs