From 714b5a313b38ac15441b99c7e2522ca8cb3ba81a Mon Sep 17 00:00:00 2001
From: reonokiy <reonokiy@gmail.com>
Date: Fri, 16 May 2025 14:10:02 +0800
Subject: [PATCH] update

---
 grafana/docker-compose.yaml     |  7 +++++++
 openobserve/docker-compose.yaml |  6 +++---
 openobserve/vector.toml         | 31 +++++++++++++++++++------------
 3 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 grafana/docker-compose.yaml

diff --git a/grafana/docker-compose.yaml b/grafana/docker-compose.yaml
new file mode 100644
index 0000000..f3d93cd
--- /dev/null
+++ b/grafana/docker-compose.yaml
@@ -0,0 +1,7 @@
+services:
+  grafana:
+    image: grafana/grafana-enterprise
+    container_name: grafana
+    restart: unless-stopped
+    ports:
+     - '3000:3000'
diff --git a/openobserve/docker-compose.yaml b/openobserve/docker-compose.yaml
index e590a67..5c0281e 100644
--- a/openobserve/docker-compose.yaml
+++ b/openobserve/docker-compose.yaml
@@ -23,9 +23,9 @@ services:
     restart: always
     command: [ "--config", "/etc/vector/vector.toml" ]
     environment:
-      OPENOBSERVE_URL: ${OPENOBSERVE_URL}
-      OPENOBSERVE_USER: ${OPENOBSERVE_USER}
-      OPENOBSERVE_PASSWORD: ${OPENOBSERVE_PASSWORD}
+      OTEL_URI: ${OTEL_URI}
+      OTEL_USER: ${OTEL_USER}
+      OTEL_PASSWORD: ${OTEL_PASSWORD}
     volumes:
       - ${VECTOR_CONFIG_PATH:-./vector.toml}:/etc/vector/vector.toml:ro
       - ${DATA_DIR:-./data}/vector:/var/lib/vector:Z
diff --git a/openobserve/vector.toml b/openobserve/vector.toml
index 36ab852..c2cbfb1 100644
--- a/openobserve/vector.toml
+++ b/openobserve/vector.toml
@@ -11,15 +11,22 @@ include_containers = ["openobserve"]
 type = "prometheus_scrape"
 endpoints = ["http://openobserve:5080/metrics"]
 
-[sinks.openobserve]
-inputs = ["observe_nokiy_net_logs", "observe_nokiy_net_metrics"]
-type = "http"
-uri = "${OPENOBSERVE_URL}"
-method = "post"
-auth.strategy = "basic"
-auth.user = "${OPENOBSERVE_USER}"
-auth.password = "${OPENOBSERVE_PASSWORD}"
-compression = "gzip"
-encoding.codec = "json"
-encoding.timestamp_format = "rfc3339"
-healthcheck.enabled = false
+[sinks.otel_logs]
+type = "opentelemetry"
+encoding = "json"
+inputs = ["observe_nokiy_net_logs"]
+protocol.type = "http"
+protocol.uri = "${OTEL_URI}"
+protocol.auth.strategy = "basic"
+protocol.auth.user = "${OTEL_USER}"
+protocol.auth.password = "${OTEL_PASSWORD}"
+protocol.compression = "zstd"
+
+
+# [sinks.otel_metrics]
+# type = "opentelemetry"
+# inputs = ["my-source-or-transform-id"]
+
+# [sinks.otel_traces]
+# type = "opentelemetry"
+# inputs = ["my-source-or-transform-id"]