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.

Sign up for GitHub

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

Jump to bottom

chore(helm-chart)!: Update Helm release loki to v6 #3998

Merged
merged 5 commits into from May 18, 2024
Merged

chore(helm-chart)!: Update Helm release loki to v6 #3998

merged 5 commits into from May 18, 2024

Conversation

budimanjojo-bot[bot]
Copy link
Contributor

@budimanjojo-bot budimanjojo-bot bot commented Apr 8, 2024 •
edited

This PR contains the following updates:

Package Update Change
loki (source) major 5.48.0 -> 6.5.2

Release Notes

grafana/helm-charts (loki)

v6.5.2

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Source commit: grafana/loki@5ada92b

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

v6.5.1

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Source commit: grafana/loki@67ed2f7

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

v6.5.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@2855c5a

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

v6.4.2

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@3070ea7

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

v6.4.1

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@d751134

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

v6.4.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@af5be90

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

v6.3.4

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@8096748

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

v6.3.3

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@6d307e5

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

v6.3.2

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@68b23dc

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

v6.3.1

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@9edb0ce

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

v6.3.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@5912fec

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

v6.2.5

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@fcb2b0a

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

v6.2.4

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@e39677f

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

v6.2.3

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@0cb470f

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

v6.2.2

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@19bfef4

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

v6.2.1

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@0d8ff9e

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

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.

@budimanjojo-bot budimanjojo-bot bot added renovate/helm Pull request to a Renovate helm update renovatebot Pull request created by Renovate type/major Pull request of type major version bump labels Apr 8, 2024
@budimanjojo-bot
Copy link
Contributor Author

budimanjojo-bot bot commented Apr 9, 2024 •
edited 

--- cluster/apps/monitoring-system/loki/base Kustomization: flux-system/monitoring-system-loki HelmRelease: monitoring-system/loki

+++ cluster/apps/monitoring-system/loki/base Kustomization: flux-system/monitoring-system-loki HelmRelease: monitoring-system/loki

@@ -13,22 +13,27 @@

       chart: loki
       interval: 15m
       sourceRef:
         kind: HelmRepository
         name: grafana-charts
         namespace: flux-system
-      version: 5.48.0
+      version: 6.5.2
   install:
     createNamespace: true
     remediation:
       retries: 5
   interval: 15m
   upgrade:
     remediation:
       retries: 5
   values:
+    backend:
+      replicas: 0
+    chunksCache:
+      enabled: false
+    deploymentMode: SingleBinary
     gateway:
       image:
         registry: ghcr.io
       ingress:
         annotations:
           nginx.ingress.kubernetes.io/whitelist-source-range: |
@@ -58,12 +63,21 @@

       limits_config:
         ingestion_burst_size_mb: 1000
         ingestion_rate_mb: 50
         per_stream_rate_limit: 5MB
         per_stream_rate_limit_burst: 20MB
         retention_period: 14d
+      schemaConfig:
+        configs:
+        - from: '2024-04-01T00:00:00Z'
+          index:
+            period: 24h
+            prefix: loki_index_
+          object_store: filesystem
+          schema: v13
+          store: tsdb
       storage:
         type: filesystem
     monitoring:
       lokiCanary:
         enabled: false
       selfMonitoring:
@@ -71,14 +85,20 @@

         grafanaAgent:
           installOperator: false
       serviceMonitor:
         enabled: false
         metricsInstance:
           enabled: false
+    read:
+      replicas: 0
+    resultsCache:
+      enabled: false
     singleBinary:
       persistence:
         size: 5Gi
         storageClass: rook-ceph-block
       replicas: 1
     test:
       enabled: false
+    write:
+      replicas: 0

@budimanjojo-bot budimanjojo-bot bot force-pushed the renovate/loki-6.x branch 8 times, most recently from d47df22 to 255f887 Compare April 22, 2024 18:18
@budimanjojo-bot budimanjojo-bot bot force-pushed the renovate/loki-6.x branch 5 times, most recently from 820e293 to 4c2e18e Compare May 6, 2024 17:15
@budimanjojo-bot
chore(helm-chart)!: Update Helm release loki to v6
cb00657 
Signed-off-by: budimanjojo-bot <111944664+budimanjojo-bot[bot]@users.noreply.github.com>
@budimanjojo-bot
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.

@budimanjojo-bot
Copy link
Contributor Author

budimanjojo-bot bot commented May 18, 2024 •
edited 

--- HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki

+++ HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki

@@ -26,50 +26,63 @@

       retention_delete_worker_count: 150
       retention_enabled: true
       shared_store: filesystem
       working_directory: /var/loki/boltdb-shipper-compactor
     frontend:
       scheduler_address: ""
+      tail_proxy_url: http://loki-querier.monitoring-system.svc.cluster.local:3100
     frontend_worker:
       scheduler_address: ""
     index_gateway:
-      mode: ring
+      mode: simple
     limits_config:
       ingestion_burst_size_mb: 1000
       ingestion_rate_mb: 50
       max_cache_freshness_per_query: 10m
       per_stream_rate_limit: 5MB
       per_stream_rate_limit_burst: 20MB
+      query_timeout: 300s
       reject_old_samples: true
       reject_old_samples_max_age: 168h
       retention_period: 14d
       split_queries_by_interval: 15m
+      volume_enabled: true
     memberlist:
       join_members:
       - loki-memberlist
+    pattern_ingester:
+      enabled: false
     query_range:
       align_queries_with_step: true
     ruler:
       storage:
         type: local
     runtime_config:
       file: /etc/loki/runtime-config/runtime-config.yaml
     schema_config:
       configs:
-      - from: "2022-01-11"
+      - from: "2024-04-01T00:00:00Z"
         index:
           period: 24h
           prefix: loki_index_
         object_store: filesystem
-        schema: v12
-        store: boltdb-shipper
+        schema: v13
+        store: tsdb
     server:
       grpc_listen_port: 9095
       http_listen_port: 3100
+      http_server_read_timeout: 600s
+      http_server_write_timeout: 600s
     storage_config:
+      boltdb_shipper:
+        index_gateway_client:
+          server_address: ""
       hedging:
         at: 250ms
         max_per_second: 20
         up_to: 3
+      tsdb_shipper:
+        index_gateway_client:
+          server_address: ""
     tracing:
       enabled: false
 
--- HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki-gateway

+++ HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/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.monitoring-system.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.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/push {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /distributor/ring {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
+    \    }\n    location = /otlp/v1/logs {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # Ingester\n    location = /flush {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /ingester/ {\n      proxy_pass       http://loki.monitoring-system.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.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # MemberListKV\n    location = /memberlist {\n      proxy_pass \
     \      http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n   \
-    \ }\n\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
+    \ }\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /api/prom/rules {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /api/prom/rules/ {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/rules {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /loki/api/v1/rules/ {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/alerts {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/rules {\n      proxy_pass       http://loki.monitoring-system.svc.cluster.local:3100$request_uri;\n\
--- HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki-dashboards-1

+++ HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki-dashboards-1

@@ -1,23 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-1
-  namespace: monitoring-system
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: '1'
-data:
-  loki-chunks.json: |
[Diff truncated by flux-local]
--- HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki-dashboards-2

+++ HelmRelease: monitoring-system/loki ConfigMap: monitoring-system/loki-dashboards-2

@@ -1,23 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-2
-  namespace: monitoring-system
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: '1'
-data:
-  loki-reads-resources.json: |
[Diff truncated by flux-local]
--- HelmRelease: monitoring-system/loki ClusterRole: monitoring-system/loki-clusterrole

+++ HelmRelease: monitoring-system/loki ClusterRole: monitoring-system/loki-clusterrole

@@ -1,20 +0,0 @@

----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-  name: loki-clusterrole
-rules:
-- apiGroups:
-  - ''
-  resources:
-  - configmaps
-  - secrets
-  verbs:
-  - get
-  - watch
-  - list
-
--- HelmRelease: monitoring-system/loki ClusterRoleBinding: monitoring-system/loki-clusterrolebinding

+++ HelmRelease: monitoring-system/loki ClusterRoleBinding: monitoring-system/loki-clusterrolebinding

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

----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: loki-clusterrolebinding
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-subjects:
-- kind: ServiceAccount
-  name: loki
-  namespace: monitoring-system
-roleRef:
-  kind: ClusterRole
-  name: loki-clusterrole
-  apiGroup: rbac.authorization.k8s.io
-
--- HelmRelease: monitoring-system/loki Service: monitoring-system/loki-gateway

+++ HelmRelease: monitoring-system/loki Service: monitoring-system/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: monitoring-system/loki Deployment: monitoring-system/loki-gateway

+++ HelmRelease: monitoring-system/loki Deployment: monitoring-system/loki-gateway

@@ -36,19 +36,19 @@

       terminationGracePeriodSeconds: 30
       containers:
       - name: nginx
         image: ghcr.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:
@@ -64,14 +64,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: gateway
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: config
         configMap:
           name: loki-gateway
--- HelmRelease: monitoring-system/loki StatefulSet: monitoring-system/loki

+++ HelmRelease: monitoring-system/loki StatefulSet: monitoring-system/loki

@@ -42,13 +42,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=all
         ports:
         - name: http-metrics
@@ -84,14 +84,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: single-binary
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: tmp
         emptyDir: {}
       - name: config
--- HelmRelease: monitoring-system/loki ServiceAccount: monitoring-system/loki-canary

+++ HelmRelease: monitoring-system/loki ServiceAccount: monitoring-system/loki-canary

@@ -0,0 +1,13 @@

+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: loki-canary
+  namespace: monitoring-system
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+automountServiceAccountToken: true
+
--- HelmRelease: monitoring-system/loki Service: monitoring-system/loki-canary

+++ HelmRelease: monitoring-system/loki Service: monitoring-system/loki-canary

@@ -0,0 +1,23 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-canary
+  namespace: monitoring-system
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+spec:
+  type: ClusterIP
+  ports:
+  - name: http-metrics
+    port: 3500
+    targetPort: http-metrics
+    protocol: TCP
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: canary
+
--- HelmRelease: monitoring-system/loki DaemonSet: monitoring-system/loki-canary

+++ HelmRelease: monitoring-system/loki DaemonSet: monitoring-system/loki-canary

@@ -0,0 +1,67 @@

+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: loki-canary
+  namespace: monitoring-system
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: canary
+  updateStrategy:
+    rollingUpdate:
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/instance: loki
+        app.kubernetes.io/component: canary
+    spec:
+      serviceAccountName: loki-canary
+      securityContext:
+        fsGroup: 10001
+        runAsGroup: 10001
+        runAsNonRoot: true
+        runAsUser: 10001
+      containers:
+      - name: loki-canary
+        image: docker.io/grafana/loki-canary:3.0.0
+        imagePullPolicy: IfNotPresent
+        args:
+        - -addr=loki-gateway.monitoring-system.svc.cluster.local.:80
+        - -labelname=pod
+        - -labelvalue=$(POD_NAME)
+        - -push=true
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+        volumeMounts: null
+        ports:
+        - name: http-metrics
+          containerPort: 3500
+          protocol: TCP
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: http-metrics
+          initialDelaySeconds: 15
+          timeoutSeconds: 1
+      volumes: null
+

@budimanjojo budimanjojo merged commit 748f7dc into main May 18, 2024
4 checks passed
@budimanjojo budimanjojo deleted the renovate/loki-6.x branch May 18, 2024 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
renovate/helm Pull request to a Renovate helm update renovatebot Pull request created by Renovate type/major Pull request of type major version bump
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@budimanjojo