From 04b83cab368ee94bcaaae3403d868ccd17b41adf Mon Sep 17 00:00:00 2001
From: royalcat <k.adamovich20@gmail.com>
Date: Fri, 12 Apr 2024 14:21:55 +0300
Subject: [PATCH] fix
---
docker-compose.yaml | 2 --
loki/config.yaml | 16 +++++++---------
otel-collector/config.yaml | 8 ++++++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e7a0278..c0af400 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.97.0
diff --git a/loki/config.yaml b/loki/config.yaml
index 196aaaf..649486a 100644
--- a/loki/config.yaml
+++ b/loki/config.yaml
@@ -18,6 +18,13 @@ common:
limits_config:
allow_structured_metadata: true
retention_period: 90d
+ otlp_config:
+ log_attributes:
+ - action: index_label
+ attributes:
+ - component
+ - function
+ - endpoint
query_range:
results_cache:
@@ -52,12 +59,3 @@ schema_config:
ruler:
alertmanager_url: http://localhost:9093
-
-otlp_config:
- resource_attributes:
- log_attributes:
- - action: index_label
- attributes:
- - component
- - function
- - endpoint
diff --git a/otel-collector/config.yaml b/otel-collector/config.yaml
index 8e70037..c74fd30 100644
--- a/otel-collector/config.yaml
+++ b/otel-collector/config.yaml
@@ -65,7 +65,9 @@ service:
traces:
receivers: [otlp]
processors: [batch]
- exporters: [otlp/tempo, otlp/grafana_cloud_traces]
+ exporters:
+ - otlp/tempo
+ - otlp/grafana_cloud_traces
metrics:
receivers: [otlp]
processors: [batch]
@@ -75,4 +77,6 @@ service:
logs:
receivers: [otlp]
processors: [batch]
- exporters: [otlphttp/loki, loki/grafana_cloud_logs]
+ exporters:
+ - otlphttp/loki
+ - otlphttp/grafana_cloud_logs