changed files

loki/loki.yaml

@@ -3,24 +3,34 @@ auth_enabled: false
 server:
   http_listen_port: 3100
 
-ingester:
-  lifecycler:
-    ring:
-      kvstore:
-        store: inmemory
-  wal:
-    enabled: false
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
 
 schema_config:
   configs:
-    - from: 2020-10-15
-      store: boltdb-shipper
+    - from: 2023-01-01
+      store: tsdb
       object_store: filesystem
-      schema: v11
+      schema: v12
       index:
         prefix: index_
         period: 24h
 
-storage_config:
-  filesystem:
-    directory: /loki/chunks
+compactor:
+  working_directory: /loki/compactor
+  shared_store: filesystem
+
+limits_config:
+  retention_period: 168h # 7 дней
+
+analytics:
+  reporting_enabled: false

otel/otel-collector.yaml

@@ -2,34 +2,32 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: 0.0.0.0:4317
       http:
+        endpoint: 0.0.0.0:4318
 
 processors:
   batch:
 
 exporters:
+  loki:
+    endpoint: http://loki:3100/loki/api/v1/push
+
   prometheus:
-    endpoint: 0.0.0.0:8888
-
-  otlphttp/loki:
-    endpoint: http://loki:3100/otlp
-
-  otlphttp/tempo:
-    endpoint: http://tempo:4318/v1/traces
+    endpoint: 0.0.0.0:8889
 
 service:
+  telemetry:
+    metrics:
+      address: 0.0.0.0:8888
+
   pipelines:
+    logs:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [loki]
+
     metrics:
       receivers: [otlp]
       processors: [batch]
       exporters: [prometheus]
-
-    logs:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/loki]
-
-    traces:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/tempo]