Ref #32619: update Loki

Author: LEDfan

README.md

@@ -280,8 +280,22 @@ have as password `password`). You can log into grafana
 on <http://grafana.shinyproxy-demo.local>, with the username and password `
 admin`.
 
-## Further work
+## Upgrade to 3.1.0
 
-This project could also provide a set of rules in order to set up alerting.
+This repository uses the same version numbers as ShinyProxy. Always use the same
+version of ShinyProxy and this repository.
 
-**(c) Copyright Open Analytics NV, 2022.**
+In release 3.1.0 of this repository, all components were upgraded. In order to
+maintain your logs and metrics, it's important to take the following steps when
+updating:
+
+- edit line 50
+  of [`overlays/loki/configs/config.yaml`](overlays/loki/configs/config.yaml):
+  change the day to be one day after you upgrade Loki. E.g. if you update this
+  on `2024-03-25` (25 March 2024), change the date to `2024-03-26`. If you do
+  not modify this line, you will no longer be able to access logs from before
+  the upgrade. See
+  the [Loki docs](https://grafana.com/docs/loki/latest/operations/storage/schema/)
+  for more information.
+
+**(c) Copyright Open Analytics NV, 2022-2024.**

bases/loki/base.yaml

@@ -1,4 +1,4 @@
-manifest_version=2.13.3
+manifest_version=5.44.1
 component=loki
 
 outfile=../base.yaml
@@ -14,6 +14,13 @@ update:
 	helm fetch grafana/loki --untar --untardir $(helm_dir) --version $(manifest_version)
 	# use namespace loki here, because the namespace is hard coded in the configuration of nginx in the loki-gateway component
 	helm template --include-crds --namespace loki --release-name dummy-release \
+			--set singleBinary.replicas=1 --set monitoring.selfMonitoring.enabled=false \
+			--set monitoring.selfMonitoring.grafanaAgent.installOperator=false \
+			--set monitoring.lokiCanary.enabled=false --set test.enabled=false \
+			--set loki.storage.type=filesystem \
+			--set loki.commonConfig.replication_factor=1 \
+			--set loki.auth_enabled=false \
+			--set gateway.enabled=false \
             $(helm_dir)/$(component) | sed -e s/dummy-release-//g|grep -v dummy-release > $(outfile)
 
 	rm -rf $(helm_dir)

bases/loki/scripts/Makefile

@@ -1,44 +1,38 @@
 # This is based on the config file from the loki helm chart.
-# It was changed to set up retention for 90 days, see: https://grafana.com/docs/loki/latest/operations/storage/retention/
+# Modifications are commented below
 
 auth_enabled: false
-chunk_store_config:
-  max_look_back_period: 0s
-compactor:
-  shared_store: filesystem
-  working_directory: /data/loki/boltdb-shipper-compactor
-  compaction_interval: 10m            # MODIFIED
-  retention_enabled: true             # MODIFIED
-  retention_delete_delay: 2h          # MODIFIED
-  retention_delete_worker_count: 150  # MODIFIED
-ingester:
-  chunk_block_size: 262144
-  chunk_idle_period: 3m
-  chunk_retain_period: 1m
-  lifecycler:
-    ring:
-      replication_factor: 1
-  max_transfer_retries: 0
-  wal:
-    dir: /data/loki/wal
+common:
+  compactor_address: 'http://loki:3100'
+  path_prefix: /var/loki
+  replication_factor: 1
+  storage:
+    filesystem:
+      chunks_directory: /var/loki/loki/chunks
+      rules_directory: /var/loki/rules
+frontend:
+  scheduler_address: ""
+frontend_worker:
+  scheduler_address: ""
+index_gateway:
+  mode: ring
 limits_config:
-  enforce_metric_name: false
-  max_entries_limit_per_query: 5000
+  max_cache_freshness_per_query: 10m
   reject_old_samples: true
   reject_old_samples_max_age: 168h
-  retention_period: 90d               # MODIFIED
-#  split_queries_by_interval: 15m      # https://github.com/grafana/loki/issues/5123#issuecomment-1167018445
-#  max_query_parallelism: 32           # https://github.com/grafana/loki/issues/5123#issuecomment-1167018445
-  split_queries_by_interval: 0
-query_range:
-  parallelise_shardable_queries: false
-#query_scheduler:
-#  max_outstanding_requests_per_tenant: 4096 # https://github.com/grafana/loki/issues/5123#issuecomment-1167018445
-#frontend:
-#  max_outstanding_per_tenant: 4096     # https://github.com/grafana/loki/issues/5123#issuecomment-1167018445
+  split_queries_by_interval: 15m
+  # Modified to have retention of 90 days
+  retention_period: 90d
 memberlist:
   join_members:
-    - 'dummy-release-loki-memberlist'
+    - loki-memberlist
+query_range:
+  align_queries_with_step: true
+ruler:
+  storage:
+    type: local
+runtime_config:
+  file: /etc/loki/runtime-config/runtime-config.yaml
 schema_config:
   configs:
     - from: "2020-10-24"
@@ -48,17 +42,30 @@ schema_config:
       object_store: filesystem
       schema: v11
       store: boltdb-shipper
+
+    # ###############################################################################
+    # IMPORTANT: update this date to be one day after you update Loki!              #
+    # This ensures old logs are still accessible, while new logs use the new schema #
+    # ###############################################################################
+    - from: "2024-03-19"
+      index:
+        period: 24h
+        prefix: loki_index_
+      object_store: filesystem
+      schema: v12
+      store: boltdb-shipper
 server:
   grpc_listen_port: 9095
   http_listen_port: 3100
 storage_config:
-  boltdb_shipper:
-    active_index_directory: /data/loki/boltdb-shipper-active
-    cache_location: /data/loki/boltdb-shipper-cache
-    cache_ttl: 24h
-    shared_store: filesystem
-  filesystem:
-    directory: /data/loki/chunks
-table_manager:
-  retention_deletes_enabled: false
-  retention_period: 0s
+  hedging:
+    at: 250ms
+    max_per_second: 20
+    up_to: 3
+tracing:
+  enabled: false
+
+# modified to make retention work
+# https://grafana.com/docs/loki/latest/setup/upgrade/#240
+compactor:
+  retention_enabled: true

overlays/loki/configs/config.yaml

@@ -4,15 +4,15 @@ kind: Kustomization
 namespace: loki
 
 resources:
-  - resources/loki.namespace.yaml
-  - ../../bases/loki
+- resources/loki.namespace.yaml
+- ../../bases/loki
 
-patchesStrategicMerge:
-  - patches/loki.statefulset.yaml
+configMapGenerator:
+- behavior: replace
+  files:
+  - config.yaml=configs/config.yaml
+  name: loki
+  namespace: loki
 
-secretGenerator:
-  - name: loki
-    namespace: loki
-    behavior: replace
-    files:
-      - loki.yaml=configs/config.yaml
+patches:
+- path: patches/loki.statefulset.yaml