From 47f64bf6fb74c848c0eb40d9b48b8e3cf5fcb546 Mon Sep 17 00:00:00 2001
From: reonokiy <reonokiy@gmail.com>
Date: Fri, 16 May 2025 18:27:52 +0800
Subject: [PATCH] update

---
 infisical/docker-compose.yml    |  3 ++-
 openobserve/docker-compose.yaml |  6 +++---
 openobserve/vector.toml         | 22 ++++++----------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/infisical/docker-compose.yml b/infisical/docker-compose.yml
index 5466cf0..ffe2ed6 100644
--- a/infisical/docker-compose.yml
+++ b/infisical/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       DB_CONNECTION_URI: postgres://infisical:${POSTGRES_PASSWORD:-infisical}@postgres:5432/infisical
       REDIS_URL: redis://redis:6379
       SITE_URL: ${SITE_URL:-http://localhost}
+      TELEMETRY_ENABLED: false
       ENCRYPTION_KEY: ${ENCRYPTION_KEY:-6c1fe4e407b8911c104518103505b218}
       AUTH_SECRET: ${AUTH_SECRET:-5lrMXKKWCVocS/uerPsl7V+TX/aaUaI7iDkgl3tSmLE=}
       # SMTP_HOST: ${SMTP_HOST}
@@ -45,7 +46,7 @@ services:
 
   postgres:
     container_name: postgres
-    image: postgres:${POSTGRES_VERSION:-14-alpine}
+    image: postgres:${POSTGRES_VERSION:-14}
     restart: always
     environment:
       POSTGRES_DB: infisical
diff --git a/openobserve/docker-compose.yaml b/openobserve/docker-compose.yaml
index 5c0281e..f45b316 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:
-      OTEL_URI: ${OTEL_URI}
-      OTEL_USER: ${OTEL_USER}
-      OTEL_PASSWORD: ${OTEL_PASSWORD}
+      OTLP_URI: ${OTLP_URI}
+      OTLP_USER: ${OTLP_USER}
+      OTLP_PASSWORD: ${OTLP_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 c2cbfb1..73da9bb 100644
--- a/openobserve/vector.toml
+++ b/openobserve/vector.toml
@@ -11,22 +11,12 @@ include_containers = ["openobserve"]
 type = "prometheus_scrape"
 endpoints = ["http://openobserve:5080/metrics"]
 
-[sinks.otel_logs]
+[sinks.observe_nokiy_net]
 type = "opentelemetry"
-encoding = "json"
-inputs = ["observe_nokiy_net_logs"]
+inputs = ["observe_nokiy_net_logs", "observe_nokiy_net_metrics"]
 protocol.type = "http"
-protocol.uri = "${OTEL_URI}"
+protocol.uri = "${OTLP_URI}/api/default"
 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"]
+protocol.auth.user = "${OTLP_USER}"
+protocol.auth.password = "${OTLP_PASSWORD}"
+protocol.headers.stream-name = "observe_nokiy_net"