chore: update loki to 3.1.1 (#449)

## Description
Updates for bringing in loki renovate updates

## Related Issue

Fixes #308 

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request)
followed

---------

Co-authored-by: Micah Nagel <micah.nagel@defenseunicorns.com>
Co-authored-by: Rob Ferguson <rjferguson21@gmail.com>

src/grafana/chart/templates/uds-package.yaml

@@ -56,3 +56,10 @@ spec:
         remoteSelector:
           app.kubernetes.io/name: keycloak
         description: "SSO Provider"
+
+      # Egress allowed to KubeAPI
+      - direction: Egress
+        selector:
+          app.kubernetes.io/name: grafana
+        remoteGenerated: KubeAPI
+        description: "Datasources Watcher"

src/loki/chart/templates/uds-package.yaml

@@ -31,7 +31,6 @@ spec:
           app.kubernetes.io/name: prometheus
         ports:
           - 3100
-          - 8080
         description: "Prometheus Metrics"
 
       - direction: Ingress

src/loki/common/zarf.yaml

@@ -13,7 +13,7 @@ components:
         localPath: ../chart
       - name: loki
         url: https://grafana.github.io/helm-charts/
-        version: 5.47.1
+        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: 2.9.6
+    tag: 3.1.1
   podSecurityContext:
     fsGroup: 10001
     runAsGroup: 10001
@@ -19,4 +19,8 @@ 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
+    tag: 1.6.27

src/loki/values/unicorn-values.yaml

@@ -2,9 +2,13 @@ loki:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/loki
-    tag: 2.9.8
+    tag: 3.1.1
 gateway:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/nginx-fips
-    tag: 1.27.0
+    tag: 1.27.1
+memcached:
+  image:
+    repository: cgr.dev/du-uds-defenseunicorns/memcached
+    tag: 1.6.27

src/loki/values/upstream-values.yaml

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

src/loki/values/values.yaml

@@ -14,6 +14,12 @@ memberlist:
   service:
     publishNotReadyAddresses: true
 
+chunksCache:
+  enabled: false
+
+resultsCache:
+  enabled: false
+
 loki:
   configStorageType: Secret
   # Disable telemetry that doesn't function in the airgap
@@ -33,8 +39,18 @@ loki:
       insecure: false
   commonConfig:
     replication_factor: 1
+  schemaConfig:
+    configs:
+      - from: 2023-04-01
+        store: tsdb
+        object_store: "{{ .Values.loki.storage.type }}"
+        schema: v12
+        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:
@@ -72,6 +88,8 @@ rbac:
 test:
   enabled: false
 
+deploymentMode: SimpleScalable
+
 # Configuration for the single binary node(s)
 singleBinary:
   # -- Number of replicas for the single binary
@@ -113,27 +131,35 @@ sidecar:
     # -- Whether or not to create a sidecar to ingest rule from specific ConfigMaps and/or Secrets.
     enabled: false
 
+memcachedExporter:
+  # -- Whether memcached metrics should be exported
+  enabled: false
+
 monitoring:
-  enabled: true
-  selfMonitoring:
-    enabled: false
-    grafanaAgent:
-      installOperator: false
-  lokiCanary:
-    enabled: false
+  serviceMonitor:
+    enabled: true
+
+lokiCanary:
+  enabled: false
+
 gateway:
   enabled: true
   # Remove default anti-affinity to support single node
-  affinity: ""
+  affinity: null
+
+  # Gateway has no metrics https://github.com/grafana/loki/issues/13201
+  service:
+    labels:
+      prometheus.io/service-monitor: "false"
 
 read:
   # Remove default anti-affinity to support single node
-  affinity: ""
+  affinity: null
 
 write:
   # Remove default anti-affinity to support single node
-  affinity: ""
+  affinity: null
 
 backend:
   # Remove default anti-affinity to support single node
-  affinity: ""
+  affinity: null

src/loki/zarf.yaml

@@ -16,8 +16,9 @@ components:
         valuesFiles:
           - ./values/upstream-values.yaml
     images:
-      - docker.io/grafana/loki:2.9.6
-      - 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
     required: true
@@ -31,8 +32,9 @@ components:
         valuesFiles:
           - ./values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/loki:2.9.6
-      - 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
     required: true
@@ -46,5 +48,6 @@ components:
         valuesFiles:
           - ./values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/loki:2.9.8
-      - cgr.dev/du-uds-defenseunicorns/nginx-fips:1.27.0
+      - 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

src/test/app-tenant.yaml

@@ -23,12 +23,6 @@ spec:
         gateway: tenant
         host: demo-8081
         port: 8081
-      - service: test-tenant-app-cidr
-        selector:
-          app: test-tenant-app
-        remoteCidr: "192.168.0.0/16"
-        host: demo-8080
-        port: 8080
 ---
 apiVersion: v1
 kind: Service