diff --git a/flux2/apps/monitoring/loki-release.yaml b/flux2/apps/monitoring/loki-release.yaml index e52ff5abea5b0a9eeaaf33a4021ffcc7564d4ba9..5f6927f8dbd71971e38b8668a505576ac7444408 100644 --- a/flux2/apps/monitoring/loki-release.yaml +++ b/flux2/apps/monitoring/loki-release.yaml @@ -11,7 +11,7 @@ spec: # https://artifacthub.io/packages/helm/grafana/loki # renovate: registryUrl=https://grafana.github.io/helm-charts chart: loki - version: 2.7.0 + version: 2.8.0 sourceRef: kind: HelmRepository name: grafana diff --git a/flux2/apps/monitoring/loki-values-configmap.yaml b/flux2/apps/monitoring/loki-values-configmap.yaml index c794447b1712a2effd4a364450f4fb0af942ab24..cfaa8131a079af057f5895b5ff3389da19b76341 100644 --- a/flux2/apps/monitoring/loki-values-configmap.yaml +++ b/flux2/apps/monitoring/loki-values-configmap.yaml @@ -19,15 +19,11 @@ data: - 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: @@ -41,28 +37,17 @@ data: 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 - # https://grafana.com/docs/loki/v2.3.0/operations/storage/retention/#retention-configuration^B + # https://grafana.com/docs/loki/latest/operations/storage/retention/ + limits_config: + retention_period: 48h + reject_old_samples_max_age: 48h + chunk_store_config: + max_look_back_period: 48h + table_manager: + retention_deletes_enabled: true + retention_period: 48h 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: 48h # 2 days - chunk_store_config: - max_look_back_period: 48h # 2 days - table_manager: - retention_deletes_enabled: true - retention_period: 48h # 7 days