Merge branch '874-update-and-configure-loki' into 'master'

Update and configure loki

See merge request openappstack/openappstack!469

flux2/apps/monitoring/loki-release.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       # https://artifacthub.io/packages/helm/grafana/loki
       chart: loki
-      version: 2.5.2
+      version: 2.6.0
       sourceRef:
         kind: HelmRepository
         name: grafana

flux2/apps/monitoring/loki-values-configmap.yaml

@@ -49,14 +49,20 @@ data:
           shared_store: filesystem
         filesystem:
           directory: /data/loki/chunks
+      # https://grafana.com/docs/loki/v2.3.0/operations/storage/retention/#retention-configuration^B
       compactor:
         working_directory: /data/loki/boltdb-shipper-compactor
         shared_store: filesystem
+        compaction_interval: 10m
+        retention_enabled: true
+        retention_delete_delay: 2h
+        retention_delete_worker_count: 150
       limits_config:
+        retention_period: 48h # 2 days
         reject_old_samples: true
-        reject_old_samples_max_age: 168h  # 7 days
+        reject_old_samples_max_age: 48h  # 2 days
       chunk_store_config:
-        max_look_back_period: 168h  # 7 days
+        max_look_back_period: 48h  # 2 days
       table_manager:
         retention_deletes_enabled: true
-        retention_period: 168h  # 7 days
+        retention_period: 48h  # 7 days