Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(loki)!: Update helm-release ( 5.47.2 → 6.3.4 ) #2799

Merged
merged 10 commits into from
Apr 27, 2024
Merged

Conversation

tyriis-automation[bot]
Copy link
Contributor

@tyriis-automation tyriis-automation bot commented Apr 8, 2024

This PR contains the following updates:

Package Update Change OpenSSF
loki (source) major 5.47.2 -> 6.2.0 OpenSSF Scorecard

Warning

Some dependencies could not be looked up. Check the Dependency Dashboard for more information.


Release Notes

grafana/helm-charts (loki)

v6.2.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@c4aa6ea

Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.2.0

v6.1.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@2e32ec5

Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.1.0

v6.0.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@79b876b

Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.0.0


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

@tyriis-automation tyriis-automation bot added renovate/flux renovate flux manager renovate/helm renovate helm datasource type/major a major update area/kubernetes cluster/talos-flux labels Apr 8, 2024
@tyriis-automation
Copy link
Contributor Author

tyriis-automation bot commented Apr 8, 2024

🦙 MegaLinter status: ✅ SUCCESS

Descriptor Linter Files Fixed Errors Elapsed time
✅ EDITORCONFIG editorconfig-checker 66 0 0.32s
✅ MARKDOWN markdownlint 1 0 0.7s
✅ REPOSITORY gitleaks yes no 3.47s
✅ TERRAFORM terraform-fmt 2 0 0.16s
✅ TERRAFORM tflint yes no 0.35s
✅ YAML prettier 61 0 2.66s
✅ YAML yamllint 62 0 1.48s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@tyriis-automation
Copy link
Contributor Author

tyriis-automation bot commented Apr 8, 2024

--- kubernetes/talos-flux/apps/observability/loki/app Kustomization: flux-system/apps-loki HelmRelease: observability/loki

+++ kubernetes/talos-flux/apps/observability/loki/app Kustomization: flux-system/apps-loki HelmRelease: observability/loki

@@ -15,13 +15,13 @@

       chart: loki
       interval: 30m
       sourceRef:
         kind: HelmRepository
         name: grafana-charts
         namespace: flux-system
-      version: 5.47.2
+      version: 6.3.4
   install:
     remediation:
       retries: 3
   interval: 30m
   maxHistory: 10
   timeout: 30m
@@ -29,204 +29,117 @@

     cleanupOnFail: true
     remediation:
       remediateLastFailure: true
       retries: 3
   values:
     backend:
-      affinity: |
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 1
-              podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    {{- include "loki.backendSelectorLabels" . | nindent 12 }}
-                topologyKey: kubernetes.io/hostname
-      extraVolumeMounts:
-      - mountPath: /rules/fake
-        name: loki-rules
-      - mountPath: /tmp/scratch
-        name: loki-rules-tmp
-      - mountPath: /tmp/loki-tmp
-        name: loki-tmp
       extraVolumes:
       - configMap:
           name: loki-alerting-rules
         name: loki-rules
-      - emptyDir: {}
-        name: loki-rules-tmp
-      - emptyDir: {}
-        name: loki-tmp
       persistence:
         size: 15Gi
         storageClass: ceph-block
       replicas: 3
+    deploymentMode: SimpleScalable
     gateway:
-      affinity: |
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 1
-              podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    {{- include "loki.gatewaySelectorLabels" . | nindent 12 }}
-                topologyKey: kubernetes.io/hostname
-      enabled: true
       ingress:
         enabled: false
       replicas: 3
     loki:
+      analytics:
+        reporting_enabled: false
+      auth_enabled: false
+      compactor:
+        retention_delete_delay: 2h
+        retention_delete_worker_count: 150
+        retention_enabled: true
+      ingester:
+        chunk_encoding: snappy
+        max_chunk_age: 1h
+      limits_config:
+        enforce_metric_name: false
+        ingestion_burst_size_mb: 32
+        ingestion_rate_mb: 16
+        max_cache_freshness_per_query: 10m
+        reject_old_samples: true
+        reject_old_samples_max_age: 168h
+        retention_period: 14d
+        shard_streams:
+          enabled: true
+        split_queries_by_interval: 15m
       podAnnotations:
         secret.reloader.stakater.com/reload: loki-s3
-      structuredConfig:
-        analytics:
-          reporting_enabled: false
-        auth_enabled: false
-        common:
-          path_prefix: /var/loki
-          replication_factor: 3
-          ring:
-            kvstore:
-              store: memberlist
-          storage:
-            s3:
-              http_config:
-                idle_conn_timeout: 90s
-                insecure_skip_verify: true
-                response_header_timeout: 0s
-              insecure: false
-              s3: null
-              s3forcepathstyle: true
-              sse_encryption: false
-        compactor:
-          compaction_interval: 10m
-          retention_delete_delay: 2h
-          retention_delete_worker_count: 150
-          retention_enabled: true
-          shared_store: s3
-          working_directory: /var/loki/boltdb-shipper-compactor
-        distributor:
-          ring:
-            kvstore:
-              store: memberlist
-        ingester:
-          lifecycler:
-            ring:
-              kvstore:
-                store: memberlist
-          max_chunk_age: 1h
-        limits_config:
-          enforce_metric_name: false
-          ingestion_burst_size_mb: 32
-          ingestion_rate_mb: 16
-          max_cache_freshness_per_query: 10m
-          reject_old_samples: true
-          reject_old_samples_max_age: 168h
-          retention_period: 14d
-          shard_streams:
-            enabled: true
-          split_queries_by_interval: 15m
-        memberlist:
-          join_members:
-          - loki-memberlist
-        ruler:
-          alertmanager_url: http://prometheus-alertmanager.observability.svc.cluster.local:9093
-          enable_alertmanager_v2: true
-          enable_api: true
-          ring:
-            kvstore:
-              store: memberlist
-          rule_path: /tmp/scratch
-          storage:
-            local:
-              directory: /rules
-            type: local
-        schema_config:
-          configs:
-          - from: '2023-01-01'
-            index:
-              period: 24h
-              prefix: loki_index_
-            object_store: s3
-            schema: v12
-            store: boltdb-shipper
-        server:
-          grpc_listen_port: 9095
-          http_listen_port: 3100
-          log_level: info
+      rulerConfig:
+        alertmanager_url: http://prometheus-alertmanager.observability.svc.cluster.local:9093
+        enable_alertmanager_v2: true
+        enable_api: true
+        rule_path: /rules/fake
+        storage:
+          local:
+            directory: /rules
+          type: local
+      schemaConfig:
+        configs:
+        - from: '2024-04-01'
+          index:
+            period: 24h
+            prefix: loki_index_
+          object_store: s3
+          schema: v13
+          store: tsdb
+      server:
+        log_level: info
+      storage:
+        bucketNames:
+          chunks: ''
+        s3:
+          s3ForcePathStyle: true
+        type: s3
+    lokiCanary:
+      enabled: false
     monitoring:
       dashboards:
         annotations:
           kustomize.toolkit.fluxcd.io/substitute: disabled
         labels:
           grafana_dashboard: 'true'
-      lokiCanary:
-        enabled: false
-      selfMonitoring:
-        enabled: false
-        grafanaAgent:
-          installOperator: false
       serviceMonitor:
         enabled: true
     read:
-      affinity: |
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 1
-              podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    {{- include "loki.readSelectorLabels" . | nindent 12 }}
-                topologyKey: kubernetes.io/hostname
-      extraVolumeMounts:
-      - mountPath: /rules/fake
-        name: loki-rules
-      - mountPath: /tmp/scratch
-        name: loki-rules-tmp
-      - mountPath: /tmp/loki-tmp
-        name: loki-tmp
       extraVolumes:
       - configMap:
           name: loki-alerting-rules
         name: loki-rules
-      - emptyDir: {}
-        name: loki-rules-tmp
-      - emptyDir: {}
-        name: loki-tmp
       persistence:
         size: 15Gi
         storageClass: ceph-block
       replicas: 3
+    sidecar:
+      rules:
+        folder: /rules/fake
+        searchNamespace: ALL
     test:
       enabled: false
     write:
-      affinity: |
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 1
-              podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    {{- include "loki.writeSelectorLabels" . | nindent 12 }}
-                topologyKey: kubernetes.io/hostname
       persistence:
         size: 15Gi
         storageClass: ceph-block
       replicas: 3
   valuesFrom:
   - kind: Secret
     name: loki-s3
-    targetPath: loki.structuredConfig.common.storage.s3.bucketnames
+    targetPath: loki.storage.bucketNames.chunks
     valuesKey: S3_BUCKET_NAME
   - kind: Secret
     name: loki-s3
-    targetPath: loki.structuredConfig.common.storage.s3.endpoint
+    targetPath: loki.storage.s3.endpoint
     valuesKey: S3_BUCKET_HOST
   - kind: Secret
     name: loki-s3
-    targetPath: loki.structuredConfig.common.storage.s3.access_key_id
+    targetPath: loki.storage.s3.accessKeyId
     valuesKey: S3_ACCESS_KEY
   - kind: Secret
     name: loki-s3
-    targetPath: loki.structuredConfig.common.storage.s3.secret_access_key
+    targetPath: loki.storage.s3.secretAccessKey
     valuesKey: S3_SECRET_KEY
 

@tyriis-automation
Copy link
Contributor Author

tyriis-automation bot commented Apr 8, 2024

--- HelmRelease: observability/loki ConfigMap: observability/loki

+++ HelmRelease: observability/loki ConfigMap: observability/loki

@@ -8,108 +8,9 @@

     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
 data:
   config.yaml: |2
 
-    analytics:
-      reporting_enabled: false
-    auth_enabled: false
-    common:
-      compactor_address: 'http://loki-backend:3100'
-      path_prefix: /var/loki
-      replication_factor: 3
-      ring:
-        kvstore:
-          store: memberlist
-      storage:
-        s3:
-          access_key_id: '**PLACEHOLDER**'
-          bucketnames: '**PLACEHOLDER**'
-          endpoint: '**PLACEHOLDER**'
-          http_config:
-            idle_conn_timeout: 90s
-            insecure_skip_verify: true
-            response_header_timeout: 0s
-          insecure: false
-          s3: null
-          s3forcepathstyle: true
-          secret_access_key: '**PLACEHOLDER**'
-          sse_encryption: false
-    compactor:
-      compaction_interval: 10m
-      retention_delete_delay: 2h
-      retention_delete_worker_count: 150
-      retention_enabled: true
-      shared_store: s3
-      working_directory: /var/loki/boltdb-shipper-compactor
-    distributor:
-      ring:
-        kvstore:
-          store: memberlist
-    frontend:
-      scheduler_address: query-scheduler-discovery.observability.svc.cluster.local.:9095
-    frontend_worker:
-      scheduler_address: query-scheduler-discovery.observability.svc.cluster.local.:9095
-    index_gateway:
-      mode: ring
-    ingester:
-      lifecycler:
-        ring:
-          kvstore:
-            store: memberlist
-      max_chunk_age: 1h
-    limits_config:
-      enforce_metric_name: false
-      ingestion_burst_size_mb: 32
-      ingestion_rate_mb: 16
-      max_cache_freshness_per_query: 10m
-      reject_old_samples: true
-      reject_old_samples_max_age: 168h
-      retention_period: 14d
-      shard_streams:
-        enabled: true
-      split_queries_by_interval: 15m
-    memberlist:
-      join_members:
-      - loki-memberlist
-    query_range:
-      align_queries_with_step: true
-    ruler:
-      alertmanager_url: http://prometheus-alertmanager.observability.svc.cluster.local:9093
-      enable_alertmanager_v2: true
-      enable_api: true
-      ring:
-        kvstore:
-          store: memberlist
-      rule_path: /tmp/scratch
-      storage:
-        local:
-          directory: /rules
-        s3:
-          bucketnames: ruler
-          insecure: false
-          s3forcepathstyle: false
-        type: local
-    runtime_config:
-      file: /etc/loki/runtime-config/runtime-config.yaml
-    schema_config:
-      configs:
-      - from: "2023-01-01"
-        index:
-          period: 24h
-          prefix: loki_index_
-        object_store: s3
-        schema: v12
-        store: boltdb-shipper
-    server:
-      grpc_listen_port: 9095
-      http_listen_port: 3100
-      log_level: info
-    storage_config:
-      hedging:
-        at: 250ms
-        max_per_second: 20
-        up_to: 3
-    tracing:
-      enabled: false
+    Error: 'error converting YAML to JSON: yaml: line 26: did not find expected alphabetic
+      or numeric character'
 
--- HelmRelease: observability/loki ConfigMap: observability/loki-gateway

+++ HelmRelease: observability/loki ConfigMap: observability/loki-gateway

@@ -20,23 +20,25 @@

     \    1.1;\n\n  default_type application/octet-stream;\n  log_format   main '$remote_addr\
     \ - $remote_user [$time_local]  $status '\n        '\"$request\" $body_bytes_sent\
     \ \"$http_referer\" '\n        '\"$http_user_agent\" \"$http_x_forwarded_for\"\
     ';\n  access_log   /dev/stderr  main;\n\n  sendfile     on;\n  tcp_nopush   on;\n\
     \  resolver kube-dns.kube-system.svc.cluster.local.;\n  \n\n  server {\n    listen\
     \             8080;\n    listen             [::]:8080;\n\n    location = / {\n\
-    \      return 200 'OK';\n      auth_basic off;\n    }\n\n\n    # Distributor\n\
-    \    location = /api/prom/push {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
+    \      return 200 'OK';\n      auth_basic off;\n    }\n\n    ########################################################\n\
+    \    # Configure backend targets# Distributor\n    location = /api/prom/push {\n\
+    \      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/push {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /distributor/ring {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
+    \    }\n    location = /otlp/v1/logs {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # Ingester\n    location = /flush {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /ingester/ {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /ingester {\n      internal;        # to suppress 301\n\
     \    }\n\n    # Ring\n    location = /ring {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # MemberListKV\n    location = /memberlist {\n      proxy_pass \
     \      http://loki-write.observability.svc.cluster.local:3100$request_uri;\n \
-    \   }\n\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
+    \   }\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /api/prom/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /api/prom/rules/ {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /loki/api/v1/rules/ {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/alerts {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
@@ -46,13 +48,13 @@

     \    }\n    location = /loki/api/v1/cache/generation_numbers {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # IndexGateway\n    location = /indexgateway/ring {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # QueryScheduler\n    location = /scheduler/ring {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
-    \    }\n\n    # Config\n    location = /config {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
+    \    }\n\n    # Config\n    location = /config {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n\n    # QueryFrontend, Querier\n    location = /api/prom/tail {\n  \
     \    proxy_pass       http://loki-read.observability.svc.cluster.local:3100$request_uri;\n\
     \      proxy_set_header Upgrade $http_upgrade;\n      proxy_set_header Connection\
     \ \"upgrade\";\n    }\n    location = /loki/api/v1/tail {\n      proxy_pass  \
     \     http://loki-read.observability.svc.cluster.local:3100$request_uri;\n   \
     \   proxy_set_header Upgrade $http_upgrade;\n      proxy_set_header Connection\
--- HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-1

+++ HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-1

@@ -1,25 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-1
-  namespace: observability
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: 'true'
-  annotations:
-    kustomize.toolkit.fluxcd.io/substitute: disabled
-data:
-  loki-chunks.json: |
[Diff truncated by flux-local]
--- HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-2

+++ HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-2

@@ -1,25 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-2
-  namespace: observability
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: 'true'
-  annotations:
-    kustomize.toolkit.fluxcd.io/substitute: disabled
-data:
-  loki-reads-resources.json: |
[Diff truncated by flux-local]
--- HelmRelease: observability/loki Service: observability/query-scheduler-discovery

+++ HelmRelease: observability/loki Service: observability/query-scheduler-discovery

@@ -1,29 +0,0 @@

----
-apiVersion: v1
-kind: Service
-metadata:
-  name: query-scheduler-discovery
-  namespace: observability
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/component: backend
-    prometheus.io/service-monitor: 'false'
-spec:
-  type: ClusterIP
-  clusterIP: None
-  publishNotReadyAddresses: true
-  ports:
-  - name: http-metrics
-    port: 3100
-    targetPort: http-metrics
-    protocol: TCP
-  - name: grpc
-    port: 9095
-    targetPort: grpc
-    protocol: TCP
-  selector:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/component: backend
-
--- HelmRelease: observability/loki Service: observability/loki-gateway

+++ HelmRelease: observability/loki Service: observability/loki-gateway

@@ -9,15 +9,15 @@

     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: gateway
 spec:
   type: ClusterIP
   ports:
-  - name: http
+  - name: http-metrics
     port: 80
-    targetPort: http
+    targetPort: http-metrics
     protocol: TCP
   selector:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 
--- HelmRelease: observability/loki Deployment: observability/loki-gateway

+++ HelmRelease: observability/loki Deployment: observability/loki-gateway

@@ -38,19 +38,19 @@

       terminationGracePeriodSeconds: 30
       containers:
       - name: nginx
         image: docker.io/nginxinc/nginx-unprivileged:1.24-alpine
         imagePullPolicy: IfNotPresent
         ports:
-        - name: http
+        - name: http-metrics
           containerPort: 8080
           protocol: TCP
         readinessProbe:
           httpGet:
             path: /
-            port: http
+            port: http-metrics
           initialDelaySeconds: 15
           timeoutSeconds: 1
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -63,21 +63,17 @@

           mountPath: /tmp
         - name: docker-entrypoint-d-override
           mountPath: /docker-entrypoint.d
         resources: {}
       affinity:
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: loki
-                  app.kubernetes.io/instance: loki
-                  app.kubernetes.io/component: gateway
-              topologyKey: kubernetes.io/hostname
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/component: gateway
+            topologyKey: kubernetes.io/hostname
       volumes:
       - name: config
         configMap:
           name: loki-gateway
       - name: tmp
         emptyDir: {}
--- HelmRelease: observability/loki Deployment: observability/loki-read

+++ HelmRelease: observability/loki Deployment: observability/loki-read

@@ -39,13 +39,13 @@

         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       terminationGracePeriodSeconds: 30
       containers:
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=read
         - -legacy-read-mode=false
         - -common.compactor-grpc-address=loki-backend.observability.svc.cluster.local:9095
@@ -77,30 +77,20 @@

         - name: runtime-config
           mountPath: /etc/loki/runtime-config
         - name: tmp
           mountPath: /tmp
         - name: data
           mountPath: /var/loki
-        - mountPath: /rules/fake
-          name: loki-rules
-        - mountPath: /tmp/scratch
-          name: loki-rules-tmp
-        - mountPath: /tmp/loki-tmp
-          name: loki-tmp
         resources: {}
       affinity:
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: loki
-                  app.kubernetes.io/instance: loki
-                  app.kubernetes.io/component: read
-              topologyKey: kubernetes.io/hostname
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/component: read
+            topologyKey: kubernetes.io/hostname
       volumes:
       - name: tmp
         emptyDir: {}
       - name: data
         emptyDir: {}
       - name: config
@@ -112,11 +102,7 @@

       - name: runtime-config
         configMap:
           name: loki-runtime
       - configMap:
           name: loki-alerting-rules
         name: loki-rules
-      - emptyDir: {}
-        name: loki-rules-tmp
-      - emptyDir: {}
-        name: loki-tmp
 
--- HelmRelease: observability/loki StatefulSet: observability/loki-backend

+++ HelmRelease: observability/loki StatefulSet: observability/loki-backend

@@ -51,26 +51,28 @@

         env:
         - name: METHOD
           value: WATCH
         - name: LABEL
           value: loki_rule
         - name: FOLDER
-          value: /rules
+          value: /rules/fake
         - name: RESOURCE
           value: both
+        - name: NAMESPACE
+          value: ALL
         - name: WATCH_SERVER_TIMEOUT
           value: '60'
         - name: WATCH_CLIENT_TIMEOUT
           value: '60'
         - name: LOG_LEVEL
           value: INFO
         volumeMounts:
         - name: sc-rules-volume
-          mountPath: /rules
+          mountPath: /rules/fake
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=backend
         - -legacy-read-mode=false
         ports:
@@ -102,31 +104,21 @@

           mountPath: /etc/loki/runtime-config
         - name: tmp
           mountPath: /tmp
         - name: data
           mountPath: /var/loki
         - name: sc-rules-volume
-          mountPath: /rules
-        - mountPath: /rules/fake
-          name: loki-rules
-        - mountPath: /tmp/scratch
-          name: loki-rules-tmp
-        - mountPath: /tmp/loki-tmp
-          name: loki-tmp
+          mountPath: /rules/fake
         resources: {}
       affinity:
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: loki
-                  app.kubernetes.io/instance: loki
-                  app.kubernetes.io/component: backend
-              topologyKey: kubernetes.io/hostname
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/component: backend
+            topologyKey: kubernetes.io/hostname
       volumes:
       - name: tmp
         emptyDir: {}
       - name: config
         configMap:
           name: loki
@@ -138,16 +130,12 @@

           name: loki-runtime
       - name: sc-rules-volume
         emptyDir: {}
       - configMap:
           name: loki-alerting-rules
         name: loki-rules
-      - emptyDir: {}
-        name: loki-rules-tmp
-      - emptyDir: {}
-        name: loki-tmp
   volumeClaimTemplates:
   - apiVersion: v1
     kind: PersistentVolumeClaim
     metadata:
       name: data
     spec:
--- HelmRelease: observability/loki StatefulSet: observability/loki-write

+++ HelmRelease: observability/loki StatefulSet: observability/loki-write

@@ -41,13 +41,13 @@

         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       terminationGracePeriodSeconds: 300
       containers:
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=write
         ports:
         - name: http-metrics
@@ -78,21 +78,17 @@

           mountPath: /etc/loki/runtime-config
         - name: data
           mountPath: /var/loki
         resources: {}
       affinity:
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: loki
-                  app.kubernetes.io/instance: loki
-                  app.kubernetes.io/component: write
-              topologyKey: kubernetes.io/hostname
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                app.kubernetes.io/component: write
+            topologyKey: kubernetes.io/hostname
       volumes:
       - name: config
         configMap:
           name: loki
           items:
           - key: config.yaml
--- HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-chunks-cache

+++ HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-chunks-cache

@@ -0,0 +1,18 @@

+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: loki-memcached-chunks-cache
+  namespace: observability
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-chunks-cache
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-chunks-cache
+  maxUnavailable: 1
+
--- HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-results-cache

+++ HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-results-cache

@@ -0,0 +1,18 @@

+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: loki-memcached-results-cache
+  namespace: observability
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-results-cache
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-results-cache
+  maxUnavailable: 1
+
--- HelmRelease: observability/loki Service: observability/loki-query-scheduler-discovery

+++ HelmRelease: observability/loki Service: observability/loki-query-scheduler-discovery

@@ -0,0 +1,29 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-query-scheduler-discovery
+  namespace: observability
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: backend
+    prometheus.io/service-monitor: 'false'
+spec:
+  type: ClusterIP
+  clusterIP: None
+  publishNotReadyAddresses: true
+  ports:
+  - name: http-metrics
+    port: 3100
+    targetPort: http-metrics
+    protocol: TCP
+  - name: grpc
+    port: 9095
+    targetPort: grpc
+    protocol: TCP
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: backend
+
--- HelmRelease: observability/loki Service: observability/loki-chunks-cache

+++ HelmRelease: observability/loki Service: observability/loki-chunks-cache

@@ -0,0 +1,26 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-chunks-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-chunks-cache
+  namespace: observability
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - name: memcached-client
+    port: 11211
+    targetPort: 11211
+  - name: http-metrics
+    port: 9150
+    targetPort: 9150
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-chunks-cache
+
--- HelmRelease: observability/loki Service: observability/loki-results-cache

+++ HelmRelease: observability/loki Service: observability/loki-results-cache

@@ -0,0 +1,26 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-results-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-results-cache
+  namespace: observability
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - name: memcached-client
+    port: 11211
+    targetPort: 11211
+  - name: http-metrics
+    port: 9150
+    targetPort: 9150
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-results-cache
+
--- HelmRelease: observability/loki StatefulSet: observability/loki-chunks-cache

+++ HelmRelease: observability/loki StatefulSet: observability/loki-chunks-cache

@@ -0,0 +1,88 @@

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: loki-chunks-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-chunks-cache
+    name: memcached-chunks-cache
+  namespace: observability
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-chunks-cache
+      name: memcached-chunks-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: loki-chunks-cache
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/instance: loki
+        app.kubernetes.io/component: memcached-chunks-cache
+        name: memcached-chunks-cache
+      annotations: null
+    spec:
+      serviceAccountName: loki
+      securityContext: {}
+      initContainers: []
+      nodeSelector: {}
+      affinity: {}
+      topologySpreadConstraints: []
+      tolerations: []
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: memcached
+        image: memcached:1.6.23-alpine
+        imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 9830Mi
+          requests:
+            cpu: 500m
+            memory: 9830Mi
+        ports:
+        - containerPort: 11211
+          name: client
+        args:
+        - -m 8192
+        - --extended=modern,track_sizes
+        - -I 5m
+        - -c 16384
+        - -v
+        - -u 11211
+        env: null
+        envFrom: null
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      - name: exporter
+        image: prom/memcached-exporter:v0.14.2
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 9150
+          name: http-metrics
+        args:
+        - --memcached.address=localhost:11211
+        - --web.listen-address=0.0.0.0:9150
+        resources:
+          limits: {}
+          requests: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+
--- HelmRelease: observability/loki StatefulSet: observability/loki-results-cache

+++ HelmRelease: observability/loki StatefulSet: observability/loki-results-cache

@@ -0,0 +1,88 @@

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: loki-results-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-results-cache
+    name: memcached-results-cache
+  namespace: observability
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-results-cache
+      name: memcached-results-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: loki-results-cache
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/instance: loki
+        app.kubernetes.io/component: memcached-results-cache
+        name: memcached-results-cache
+      annotations: null
+    spec:
+      serviceAccountName: loki
+      securityContext: {}
+      initContainers: []
+      nodeSelector: {}
+      affinity: {}
+      topologySpreadConstraints: []
+      tolerations: []
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: memcached
+        image: memcached:1.6.23-alpine
+        imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 1229Mi
+          requests:
+            cpu: 500m
+            memory: 1229Mi
+        ports:
+        - containerPort: 11211
+          name: client
+        args:
+        - -m 1024
+        - --extended=modern,track_sizes
+        - -I 5m
+        - -c 16384
+        - -v
+        - -u 11211
+        env: null
+        envFrom: null
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      - name: exporter
+        image: prom/memcached-exporter:v0.14.2
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 9150
+          name: http-metrics
+        args:
+        - --memcached.address=localhost:11211
+        - --web.listen-address=0.0.0.0:9150
+        resources:
+          limits: {}
+          requests: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+

@tyriis-automation tyriis-automation bot force-pushed the renovate/loki-6.x branch 2 times, most recently from c0b1360 to 1c1f889 Compare April 10, 2024 19:07
@tyriis-automation tyriis-automation bot changed the title feat(loki): update helm-release to v6 feat(loki)!: Update helm-release ( 5.47.2 → 6.1.0 ) Apr 10, 2024
@tyriis-automation tyriis-automation bot changed the title feat(loki)!: Update helm-release ( 5.47.2 → 6.1.0 ) feat(loki)!: Update helm-release ( 5.47.2 → 6.2.0 ) Apr 11, 2024
@jazzlyn jazzlyn requested a review from tyriis April 12, 2024 19:05
@tyriis-automation
Copy link
Contributor Author

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

Warning: custom changes will be lost.

@jazzlyn
Copy link
Collaborator

jazzlyn commented Apr 12, 2024

config needs to be checked again

@jazzlyn jazzlyn changed the title feat(loki)!: Update helm-release ( 5.47.2 → 6.2.0 ) feat(loki)!: Update helm-release ( 5.47.2 → 6.3.4 ) Apr 27, 2024
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@jazzlyn jazzlyn merged commit c525442 into main Apr 27, 2024
18 checks passed
@jazzlyn jazzlyn deleted the renovate/loki-6.x branch April 27, 2024 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/kubernetes cluster/talos-flux renovate/flux renovate flux manager renovate/helm renovate helm datasource type/major a major update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant