chore: update loki

pepr.ts

@@ -4,7 +4,6 @@ import { DataStore } from "pepr/dist/lib/storage";
 import cfg from "./package.json";
 import { istio } from "./src/pepr/istio";
 import { Component, setupLogger } from "./src/pepr/logger";
-import { loki } from "./src/pepr/loki";
 import { operator } from "./src/pepr/operator";
 import { setupAuthserviceSecret } from "./src/pepr/operator/controllers/keycloak/authservice/config";
 import { Policy } from "./src/pepr/operator/crd";
@@ -27,9 +26,6 @@ const log = setupLogger(Component.STARTUP);
     // UDS Core Policies
     policies,
 
-    // Loki schemaConfig update
-    loki,
-
     // Istio service mesh
     istio,
 

src/loki/common/zarf.yaml

@@ -13,7 +13,7 @@ components:
         localPath: ../chart
       - name: loki
         url: https://grafana.github.io/helm-charts/
-        version: 6.6.2
+        version: 6.12.0
         namespace: loki
         valuesFiles:
           - ../values/values.yaml

src/loki/values/registry1-values.yaml

@@ -2,7 +2,7 @@ loki:
   image:
     registry: registry1.dso.mil
     repository: ironbank/opensource/grafana/loki
-    tag: 3.0.0
+    tag: 3.1.1
   podSecurityContext:
     fsGroup: 10001
     runAsGroup: 10001
@@ -19,7 +19,7 @@ gateway:
   image:
     registry: registry1.dso.mil
     repository: ironbank/opensource/nginx/nginx-alpine
-    tag: 1.25.3
+    tag: 1.26.2
 memcached:
   image:
     repository: registry1.dso.mil/ironbank/opensource/memcached/memcached

src/loki/values/unicorn-values.yaml

@@ -2,12 +2,12 @@ loki:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/loki
-    tag: 3.0.0
+    tag: 3.1.1
 gateway:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/nginx-fips
-    tag: 1.25.5
+    tag: 1.27.1
 memcached:
   image:
     repository: cgr.dev/du-uds-defenseunicorns/memcached

src/loki/values/upstream-values.yaml

@@ -2,13 +2,13 @@ loki:
   image:
     registry: docker.io
     repository: grafana/loki
-    tag: 3.0.0
+    tag: 3.1.1
 
 gateway:
   image:
     registry: docker.io
     repository: nginxinc/nginx-unprivileged
-    tag: 1.25-alpine
+    tag: 1.27-alpine
 
 memcached:
   image:

src/loki/values/values.yaml

@@ -48,15 +48,9 @@ loki:
         index:
           prefix: loki_tsdb_
           period: 24h
-      - from: 2024-06-04
-        store: tsdb
-        object_store: "{{ .Values.loki.storage.type }}"
-        schema: v13
-        index:
-          prefix: loki_tsdb_
-          period: 24h
   limits_config:
     split_queries_by_interval: "30m"
+    allow_structured_metadata: false
   query_scheduler:
     max_outstanding_requests_per_tenant: 32000 # This is the default in Loki 3.0
   extraMemberlistConfig:

src/loki/zarf.yaml

@@ -16,8 +16,8 @@ components:
         valuesFiles:
           - ./values/upstream-values.yaml
     images:
-      - docker.io/grafana/loki:3.0.0
-      - docker.io/nginxinc/nginx-unprivileged:1.25-alpine
+      - docker.io/grafana/loki:3.1.1
+      - docker.io/nginxinc/nginx-unprivileged:1.27-alpine
       - docker.io/memcached:1.6.27-alpine
 
   - name: loki
@@ -32,8 +32,8 @@ components:
         valuesFiles:
           - ./values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/loki:3.0.0
-      - registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.25.3
+      - registry1.dso.mil/ironbank/opensource/grafana/loki:3.1.1
+      - registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.26.2
       - registry1.dso.mil/ironbank/opensource/memcached/memcached:1.6.27
 
   - name: loki
@@ -48,6 +48,6 @@ components:
         valuesFiles:
           - ./values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/loki:3.0.0
-      - cgr.dev/du-uds-defenseunicorns/nginx-fips:1.25.5
+      - cgr.dev/du-uds-defenseunicorns/loki:3.1.1
+      - cgr.dev/du-uds-defenseunicorns/nginx-fips:1.27.1
       - cgr.dev/du-uds-defenseunicorns/memcached:1.6.27