Merge pull request #2099 from gasmick/main

[loki-distributed] update to loki version 2.7.1
grafana · Jan 12, 2023 · 5ec00d6 · 5ec00d6
2 parents ce3e030 + 0205451
commit 5ec00d6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 7 deletions.
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
-appVersion: 2.6.1
-version: 0.68.1
+appVersion: 2.7.1
+version: 0.69.0
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -1,6 +1,6 @@
 # loki-distributed
 
-![Version: 0.68.1](https://img.shields.io/badge/Version-0.68.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 0.69.0](https://img.shields.io/badge/Version-0.69.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 
@@ -24,6 +24,25 @@ helm repo add grafana https://grafana.github.io/helm-charts
 
 Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions.
 
+### From 0.68.x to 0.69.0
+The in-memory `fifocache` has been renamed to more general `embedded_cache`, which currently doesn't have a `max_size_items` attribute.
+```yaml
+loki:
+  config: |
+    chunk_store_config:
+      chunk_cache_config:
+        embedded_cache:
+          enabled: false
+```
+
+`compactor_address` has to be explicitly set in the `common` section of the config.
+```yaml
+loki:
+  config: |
+    common:
+      compactor_address: {{ include "loki.compactorFullname" . }}:3100
+```
+
 ### From 0.41.x to 0.42.0
 All containers were previously named "loki". This version changes the container names to make the chart compatible with the loki-mixin. Now the container names correctly reflect the component (querier, distributor, ingester, ...). If you are using custom prometheus rules that use the container name you probably have to change them.
 

diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl
@@ -22,6 +22,25 @@ helm repo add grafana https://grafana.github.io/helm-charts
 
 Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions.
 
+### From 0.68.x to 0.69.0
+The in-memory `fifocache` has been renamed to more general `embedded_cache`, which currently doesn't have a `max_size_items` attribute.
+```yaml
+loki:
+  config: |
+    chunk_store_config:
+      chunk_cache_config:
+        embedded_cache:
+          enabled: false 
+```
+
+`compactor_address` has to be explicitly set in the `common` section of the config.
+```yaml
+loki:
+  config: |
+    common:
+      compactor_address: {{"{{"}} include "loki.compactorFullname" . {{"}}"}}:3100
+```
+
 ### From 0.41.x to 0.42.0
 All containers were previously named "loki". This version changes the container names to make the chart compatible with the loki-mixin. Now the container names correctly reflect the component (querier, distributor, ingester, ...). If you are using custom prometheus rules that use the container name you probably have to change them.
 

diff --git a/charts/loki-distributed/ci/cache-values.yaml b/charts/loki-distributed/ci/cache-values.yaml
@@ -5,6 +5,9 @@ loki:
     server:
       http_listen_port: 3100
 
+    common:
+      compactor_address: {{ include "loki.compactorFullname" . }}:3100
+
     distributor:
       ring:
         kvstore:

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -82,6 +82,9 @@ loki:
     server:
       http_listen_port: 3100
 
+    common:
+      compactor_address: {{ include "loki.compactorFullname" . }}:3100
+
     distributor:
       ring:
         kvstore:
@@ -138,7 +141,8 @@ loki:
       max_look_back_period: 0s
       {{- if .Values.memcachedChunks.enabled }}
       chunk_cache_config:
-        enable_fifocache: false
+        embedded_cache:
+          enabled: false
         memcached_client:
           consistent_hash: true
           addresses: dnssrv+_memcached-client._tcp.{{ include "loki.memcachedChunksFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}
@@ -165,9 +169,8 @@ loki:
             addresses: dnssrv+_memcached-client._tcp.{{ include "loki.memcachedFrontendFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}
             consistent_hash: true
           {{- else }}
-          enable_fifocache: true
-          fifocache:
-            max_size_items: 1024
+          embedded_cache:
+            enabled: true
             ttl: 24h
           {{- end }}