Merge branch 'fix-loki-release' into 'master'

lower retention_period to a multiple of chunks.period (1x168h)

See merge request openappstack/openappstack!457

flux2/apps/monitoring/kustomization.yaml

@@ -3,9 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: oas
 resources:
-  - pvc.yaml
   - eventrouter-release.yaml
-  - loki-release.yaml
-  - promtail-release.yaml
   - kube-prometheus-stack-release.yaml
   - loki-configmap.yaml
+  - loki-release.yaml
+  - loki-values-configmap.yaml
+  - promtail-release.yaml
+  - pvc.yaml

flux2/apps/monitoring/loki-release.yaml

@@ -16,62 +16,14 @@ spec:
         name: grafana
         namespace: flux-system
   interval: 1h
-  values:
-    # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml
-    resources:
-      limits:
-        cpu: 800m
-        memory: 360Mi
-      requests:
-        cpu: 400m
-        memory: 180Mi
-    persistence:
-      enabled: true
-      accessModes:
-        - ReadWriteOnce
-      size: 10Gi
-      annotations: {}
-      # existingClaim:
-    # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml#L46
-    config:
-      # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml#L48
-      ingester:
-        chunk_idle_period: 30m
-        chunk_block_size: 1048576
-        chunk_retain_period: 15m
-        max_transfer_retries: 10
-      # https://github.com/grafana/loki/blob/main/cmd/loki/loki-local-config.yaml
-      # https://grafana.com/docs/loki/latest/operations/storage/retention
-      schema_config:
-        configs:
-          - from: 2021-05-31
-            store: boltdb-shipper
-            object_store: filesystem
-            schema: v11
-            index:
-              prefix: index_
-              period: 24h
-      storage_config:
-        boltdb_shipper:
-          active_index_directory: /data/loki/boltdb-shipper-active
-          cache_location: /data/loki/boltdb-shipper-cache
-          cache_ttl: 24h         # Can be increased for faster performance over longer query periods, uses more disk space
-          shared_store: filesystem
-        filesystem:
-          directory: /data/loki/chunks
-      compactor:
-        working_directory: /data/loki/boltdb-shipper-compactor
-        shared_store: filesystem
-      limits_config:
-        reject_old_samples: true
-        reject_old_samples_max_age: 168h  # 7 days
-      chunk_store_config:
-        max_look_back_period: 192h  # 8 days
-      table_manager:
-        retention_deletes_enabled: true
-        retention_period: 192h  # 8 days
-  # Allow custom values either by configMap or by secret
+  install:
+    timeout: 15m
+    remediation:
+      retries: 2
   valuesFrom:
+    - kind: ConfigMap
+      name: oas-loki-values
+    # Allow overriding values by ConfigMap or Secret
     - kind: ConfigMap
       name: oas-loki-override
       optional: true

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

+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: oas-loki-values
+data:
+  values.yaml: |
+    # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml
+    resources:
+      limits:
+        cpu: 800m
+        memory: 360Mi
+      requests:
+        cpu: 400m
+        memory: 180Mi
+    persistence:
+      enabled: true
+      accessModes:
+        - ReadWriteOnce
+      size: 10Gi
+      annotations: {}
+      # existingClaim:
+    # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml#L46
+    config:
+      # https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml#L48
+      ingester:
+        chunk_idle_period: 30m
+        chunk_block_size: 1048576
+        chunk_retain_period: 15m
+        max_transfer_retries: 10
+      # https://github.com/grafana/loki/blob/main/cmd/loki/loki-local-config.yaml
+      # https://grafana.com/docs/loki/latest/operations/storage/retention
+      schema_config:
+        configs:
+          - from: 2021-05-31
+            store: boltdb-shipper
+            object_store: filesystem
+            schema: v11
+            index:
+              prefix: index_
+              period: 24h
+            chunks:
+              period: 24h
+      storage_config:
+        boltdb_shipper:
+          active_index_directory: /data/loki/boltdb-shipper-active
+          cache_location: /data/loki/boltdb-shipper-cache
+          cache_ttl: 24h         # Can be increased for faster performance over longer query periods, uses more disk space
+          shared_store: filesystem
+        filesystem:
+          directory: /data/loki/chunks
+      compactor:
+        working_directory: /data/loki/boltdb-shipper-compactor
+        shared_store: filesystem
+      limits_config:
+        reject_old_samples: true
+        reject_old_samples_max_age: 168h  # 7 days
+      chunk_store_config:
+        max_look_back_period: 168h  # 7 days
+      table_manager:
+        retention_deletes_enabled: true
+        retention_period: 168h  # 7 days