From 40454b55076c9590d9e9ded5a85069820cf88cbd Mon Sep 17 00:00:00 2001
From: Alexander Chuprov <a.chuprov@yadro.com>
Date: Wed, 15 Nov 2023 16:08:15 +0300
Subject: [PATCH] [#56] Add loki

Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
---
 .env                                             |   8 ++++++--
 services/grafana/.hosts                          |   1 +
 services/grafana/docker-compose.yml              |   8 ++++++++
 .../dashboards/storage-node-logs.json            | Bin 0 -> 8640 bytes
 .../provisioning/datasources/datasource.yml      |   5 +++++
 services/storage/cfg/config.yml                  |   7 ++++++-
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 services/grafana/provisioning/dashboards/storage-node-logs.json

diff --git a/.env b/.env
index de7b691..0969ff5 100644
--- a/.env
+++ b/.env
@@ -12,11 +12,11 @@ NEOGO_VERSION=0.103.0
 NEOGO_IMAGE=nspccdev/neo-go
 
 # FrostFS InnerRing nodes
-IR_VERSION=365a7ca0
+IR_VERSION=0.37.0-rc.1-93-g364f835b
 IR_IMAGE=truecloudlab/frostfs-ir
 
 # FrostFS Storage nodes
-NODE_VERSION=365a7ca0
+NODE_VERSION=0.37.0-rc.1-93-g364f835b
 NODE_IMAGE=truecloudlab/frostfs-storage
 
 # NATS Server
@@ -64,3 +64,7 @@ PROMETHEUS_IMAGE=prom/prometheus
 # Grafana versions
 GRAFANA_VERSION=9.5.6
 GRAFANA_IMAGE=grafana/grafana
+
+# Loki versions
+LOKI_VERSION=2.9.1
+LOKI_IMAGE=grafana/loki
\ No newline at end of file
diff --git a/services/grafana/.hosts b/services/grafana/.hosts
index 8f36ea6..537a644 100644
--- a/services/grafana/.hosts
+++ b/services/grafana/.hosts
@@ -1 +1,2 @@
 IPV4_PREFIX.122 grafana.LOCAL_DOMAIN
+IPV4_PREFIX.123 loki.LOCAL_DOMAIN
diff --git a/services/grafana/docker-compose.yml b/services/grafana/docker-compose.yml
index 6d27299..90b67f2 100644
--- a/services/grafana/docker-compose.yml
+++ b/services/grafana/docker-compose.yml
@@ -17,6 +17,14 @@ services:
     stop_signal: SIGKILL
     env_file: [ ".env", ".int_test.env" ]
 
+  loki:
+    image: ${LOKI_IMAGE}:${LOKI_VERSION}
+    command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      grafana_int:
+      internet:
+        ipv4_address: ${IPV4_PREFIX}.123
+
 networks:
   grafana_int:
   internet:
diff --git a/services/grafana/provisioning/dashboards/storage-node-logs.json b/services/grafana/provisioning/dashboards/storage-node-logs.json
new file mode 100644
index 0000000000000000000000000000000000000000..3c91d52461b666c7f6c38057ccc4804b5cad7795
GIT binary patch
literal 8640
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
IZ&3BqZ&Y_xZ2$lO

literal 0
HcmV?d00001

diff --git a/services/grafana/provisioning/datasources/datasource.yml b/services/grafana/provisioning/datasources/datasource.yml
index 81b6a7b..7d7427f 100644
--- a/services/grafana/provisioning/datasources/datasource.yml
+++ b/services/grafana/provisioning/datasources/datasource.yml
@@ -6,3 +6,8 @@ datasources:
   access: proxy
   orgId: 1
   url: http://prometheus:9090
+- name: Loki
+  type: loki
+  access: proxy
+  orgId: 1
+  url: http://loki:3100
\ No newline at end of file
diff --git a/services/storage/cfg/config.yml b/services/storage/cfg/config.yml
index 0a85096..6b3e7a8 100644
--- a/services/storage/cfg/config.yml
+++ b/services/storage/cfg/config.yml
@@ -1,6 +1,11 @@
 # Logger section
 logger:
   level: debug # Minimum enabled logging level
+  loki:
+    enabled: true
+    endpoint: "loki.frostfs.devenv:3100/api/prom/push"
+    max_batch_delay: 1s
+    max_batch_size: 200
 
 # Profiler section
 pprof:
@@ -14,7 +19,7 @@ prometheus:
   address: :9090  # Server address
   shutdown_timeout: 15s  # Timeout for metrics HTTP server graceful shutdown
 
-  # Application tracing section
+# Application tracing section
 tracing:
   enabled: true
   exporter: otlp_grpc