From 8b871063df16397044fd3ba9f0c0aabf6edac7c7 Mon Sep 17 00:00:00 2001 From: bot Date: Wed, 18 Sep 2024 17:13:56 +0200 Subject: [PATCH 1/4] Bump loki to v3.1.1 --- dappnode_package.json | 5 +++++ docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dappnode_package.json b/dappnode_package.json index 1dc5db0..397eb6e 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -24,6 +24,11 @@ "repo": "grafana/grafana", "version": "11.1.0", "arg": "UPSTREAM_VERSION_GRAFANA" + }, + { + "repo": "grafana/loki", + "version": "3.1.1", + "arg": "UPSTREAM_VERSION_LOKI" } ], "architectures": ["linux/amd64"], diff --git a/docker-compose.yml b/docker-compose.yml index 52abc5e..59401ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,7 +71,7 @@ services: build: context: loki args: - UPSTREAM_VERSION: 2.7.3 + UPSTREAM_VERSION_LOKI: 3.1.1 command: "-config.file=/etc/loki/local-config.yaml" restart: always image: "loki.dms.dnp.dappnode.eth:1.0.1" From b6899273c222ef1124899d955604c600a141948b Mon Sep 17 00:00:00 2001 From: bot Date: Wed, 18 Sep 2024 17:15:05 +0200 Subject: [PATCH 2/4] Edit upstream version env in Dockerfile --- loki/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loki/Dockerfile b/loki/Dockerfile index 86e89d1..27ac2bd 100644 --- a/loki/Dockerfile +++ b/loki/Dockerfile @@ -1,6 +1,6 @@ ARG UPSTREAM_VERSION -FROM grafana/loki:${UPSTREAM_VERSION} +FROM grafana/loki:${UPSTREAM_VERSION_LOKI} COPY local-config.yaml /etc/loki/local-config.yaml \ No newline at end of file From e902269d03a58859ddddb11e61a95c90d4800cd9 Mon Sep 17 00:00:00 2001 From: bot Date: Wed, 18 Sep 2024 17:15:53 +0200 Subject: [PATCH 3/4] Fix upstream version arg --- loki/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loki/Dockerfile b/loki/Dockerfile index 27ac2bd..81044a9 100644 --- a/loki/Dockerfile +++ b/loki/Dockerfile @@ -1,5 +1,5 @@ -ARG UPSTREAM_VERSION +ARG UPSTREAM_VERSION_LOKI FROM grafana/loki:${UPSTREAM_VERSION_LOKI} From 7d779e88c57e62b84c2ddf6abb45120f7ff30aeb Mon Sep 17 00:00:00 2001 From: bot Date: Wed, 18 Sep 2024 17:39:33 +0200 Subject: [PATCH 4/4] Update loki config schema --- loki/local-config.yaml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/loki/local-config.yaml b/loki/local-config.yaml index 9173943..3cdb215 100644 --- a/loki/local-config.yaml +++ b/loki/local-config.yaml @@ -25,10 +25,10 @@ query_range: schema_config: configs: - - from: 2020-10-24 - store: boltdb-shipper + - from: 2024-04-01 + store: tsdb # Change index type to tsdb object_store: filesystem - schema: v11 + schema: v13 # Upgrade schema to v13 index: prefix: index_ period: 24h @@ -36,19 +36,10 @@ schema_config: limits_config: ingestion_rate_mb: 1024 ingestion_burst_size_mb: 1024 + allow_structured_metadata: true # Structured metadata allowed with v13 and tsdb ruler: alertmanager_url: http://localhost:9093 - -# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration -# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/ -# -# Statistics help us better understand how Loki is used, and they show us performance -# levels for most users. This helps us prioritize features and documentation. -# For more information on what's sent, look at -# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go -# Refer to the buildReport method to see what goes into a report. -# -# If you would like to disable reporting, uncomment the following lines: -#analytics: -# reporting_enabled: false +# Uncomment to disable usage statistics reporting +analytics: + reporting_enabled: false