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 0000000..3c91d52 Binary files /dev/null and b/services/grafana/provisioning/dashboards/storage-node-logs.json differ 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