Skip to content

chore(deps): update helm release loki to v3.3.1#804

Merged
kashalls merged 1 commit intomainfrom
renovate/loki-3.x
Nov 5, 2022
Merged

chore(deps): update helm release loki to v3.3.1#804
kashalls merged 1 commit intomainfrom
renovate/loki-3.x

Conversation

@renovate
Copy link
Contributor

@renovate renovate bot commented Sep 21, 2022 •
edited
Loading

Mend Renovate

This PR contains the following updates:

Package Update Change
loki (source) minor 3.0.5 -> 3.3.1

⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information.

Release Notes

grafana/helm-charts

v3.3.1

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@b523ff3

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

v3.3.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@6c53113

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

v3.2.2

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@488e64e

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

v3.2.1

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@c9165fb

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

v3.2.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@3e7e444

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

v3.1.0

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@afd63c5

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

v3.0.9

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@9265b8e

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

v3.0.8

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@d8eb8b2

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

v3.0.7

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@1e22b14

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

v3.0.6

Helm chart for Grafana Loki in simple, scalable mode

Source commit: grafana/loki@41861bd

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

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 Mend Renovate. View repository job log here.

@renovate renovate bot requested a review from kashalls as a code owner September 21, 2022 17:55
@github-actions
Copy link

github-actions bot commented Sep 21, 2022

Path: cluster/apps/monitoring/loki/helm-release.yaml
Version: 3.0.5 -> 3.1.0

@@ -83,6 +83,12 @@
           bucketnames: chunks
           insecure: false
           s3forcepathstyle: false
+    limits_config:
+      enforce_metric_name: false
+      max_cache_freshness_per_query: 10m
+      reject_old_samples: true
+      reject_old_samples_max_age: 168h
+      split_queries_by_interval: 15m
     memberlist:
       join_members:
       - loki-memberlist
@@ -381,6 +387,28 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 ---
+# Source: loki/templates/loki-canary/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-canary
+  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
+---
 # Source: loki/templates/read/service-read-headless.yaml
 apiVersion: v1
 kind: Service
@@ -509,6 +537,67 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: write
 ---
+# Source: loki/templates/loki-canary/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: loki-canary
+  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
+  template:
+    metadata:
+      annotations:
+      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:latest
+          imagePullPolicy: IfNotPresent
+          args:
+            - -addr=loki-gateway.default.svc.cluster.local
+            - -labelname=pod
+            - -labelvalue=$(POD_NAME)
+            - -user=self-monitoring
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+          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
+---
 # Source: loki/charts/grafana-agent-operator/templates/operator-deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -562,7 +651,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 0cb9086dcc675b4532167108595944f77b051dbb65c95d1a57ac1ae8e8207e75
+        checksum/config: efe5b424ca2342992399bd9f1a3463a97d466f5a7c9744c9e59670382510dafa
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -651,7 +740,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: ea3418e0bbe89e2638cdb05d2b264b9b4fa94f33a38794f3641af291108e427e
       labels:
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/name: loki
@@ -659,6 +748,7 @@
         app.kubernetes.io/component: read
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -754,7 +844,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: ea3418e0bbe89e2638cdb05d2b264b9b4fa94f33a38794f3641af291108e427e
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -762,6 +852,7 @@
         app.kubernetes.io/part-of: memberlist
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -943,10 +1034,10 @@
     app.kubernetes.io/managed-by: Helm
 spec:
   clients:
-    #TODO: need to support auth here
     - url: http://loki-gateway.default.svc.cluster.local/loki/api/v1/push
       externalLabels:
         cluster: loki
+      tenantId: self-monitoring
   # Supply an empty namespace selector to look in all namespaces. Remove
   # this to only look in the same namespace as the LogsInstance CR
   podLogsNamespaceSelector: {}
@@ -1088,12 +1179,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: loki-read
+  name: loki
   labels:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: read
 spec:
   selector:
     matchLabels:
@@ -1106,6 +1196,7 @@
           - "false"
   endpoints:
     - port: http-metrics
+      path: /metrics
       relabelings:
         - sourceLabels: [job]
           replacement: "default/$1"
@@ -1123,6 +1214,19 @@
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
+# Source: loki/templates/loki-canary/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: loki-canary
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+  annotations:
+    "helm.sh/hook": post-install
+---
 # Source: loki/charts/grafana-agent-operator/templates/tests/test-grafanaagent.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

@renovate renovate bot changed the title chore(deps): update helm release loki to v3.1.0 chore(deps): update helm release loki to v3.2.0 Sep 26, 2022
@renovate renovate bot force-pushed the renovate/loki-3.x branch from 4a6792f to 14ee5c1 Compare September 26, 2022 14:39
@github-actions
Copy link

github-actions bot commented Sep 26, 2022

Path: cluster/apps/monitoring/loki/helm-release.yaml
Version: 3.0.5 -> 3.2.0

@@ -83,6 +83,12 @@
           bucketnames: chunks
           insecure: false
           s3forcepathstyle: false
+    limits_config:
+      enforce_metric_name: false
+      max_cache_freshness_per_query: 10m
+      reject_old_samples: true
+      reject_old_samples_max_age: 168h
+      split_queries_by_interval: 15m
     memberlist:
       join_members:
       - loki-memberlist
@@ -174,6 +180,14 @@
           proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
         }
 
+        location ~ /prometheus/api/v1/alerts.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
+        location ~ /prometheus/api/v1/rules.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
         location = /loki/api/v1/push {
           proxy_pass       http://loki-write.default.svc.cluster.local:3100$request_uri;
         }
@@ -381,6 +395,28 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 ---
+# Source: loki/templates/loki-canary/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-canary
+  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
+---
 # Source: loki/templates/read/service-read-headless.yaml
 apiVersion: v1
 kind: Service
@@ -509,6 +545,67 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: write
 ---
+# Source: loki/templates/loki-canary/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: loki-canary
+  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
+  template:
+    metadata:
+      annotations:
+      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:latest
+          imagePullPolicy: IfNotPresent
+          args:
+            - -addr=loki-gateway.default.svc.cluster.local
+            - -labelname=pod
+            - -labelvalue=$(POD_NAME)
+            - -user=self-monitoring
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+          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
+---
 # Source: loki/charts/grafana-agent-operator/templates/operator-deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -562,7 +659,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 0cb9086dcc675b4532167108595944f77b051dbb65c95d1a57ac1ae8e8207e75
+        checksum/config: cc7db9b7a5ad58583ecf5e463565bc64869bd826667e13a1f7a08b916793868e
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -651,7 +748,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 162ed3e0f80313960dc91238dfa10fa35857227adc78aab38c5c93b544082fd7
       labels:
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/name: loki
@@ -659,6 +756,7 @@
         app.kubernetes.io/component: read
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -754,7 +852,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 162ed3e0f80313960dc91238dfa10fa35857227adc78aab38c5c93b544082fd7
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -762,6 +860,7 @@
         app.kubernetes.io/part-of: memberlist
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -943,10 +1042,10 @@
     app.kubernetes.io/managed-by: Helm
 spec:
   clients:
-    #TODO: need to support auth here
     - url: http://loki-gateway.default.svc.cluster.local/loki/api/v1/push
       externalLabels:
         cluster: loki
+      tenantId: self-monitoring
   # Supply an empty namespace selector to look in all namespaces. Remove
   # this to only look in the same namespace as the LogsInstance CR
   podLogsNamespaceSelector: {}
@@ -1088,12 +1187,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: loki-read
+  name: loki
   labels:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: read
 spec:
   selector:
     matchLabels:
@@ -1106,6 +1204,7 @@
           - "false"
   endpoints:
     - port: http-metrics
+      path: /metrics
       relabelings:
         - sourceLabels: [job]
           replacement: "default/$1"
@@ -1123,6 +1222,19 @@
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
+# Source: loki/templates/loki-canary/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: loki-canary
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+  annotations:
+    "helm.sh/hook": post-install
+---
 # Source: loki/charts/grafana-agent-operator/templates/tests/test-grafanaagent.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

@renovate renovate bot changed the title chore(deps): update helm release loki to v3.2.0 chore(deps): update helm release loki to v3.2.1 Oct 5, 2022
@renovate renovate bot force-pushed the renovate/loki-3.x branch from 14ee5c1 to 30ba629 Compare October 5, 2022 20:49
@github-actions
Copy link

github-actions bot commented Oct 5, 2022

Path: cluster/apps/monitoring/loki/helm-release.yaml
Version: 3.0.5 -> 3.2.1

@@ -83,6 +83,12 @@
           bucketnames: chunks
           insecure: false
           s3forcepathstyle: false
+    limits_config:
+      enforce_metric_name: false
+      max_cache_freshness_per_query: 10m
+      reject_old_samples: true
+      reject_old_samples_max_age: 168h
+      split_queries_by_interval: 15m
     memberlist:
       join_members:
       - loki-memberlist
@@ -174,6 +180,14 @@
           proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
         }
 
+        location ~ /prometheus/api/v1/alerts.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
+        location ~ /prometheus/api/v1/rules.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
         location = /loki/api/v1/push {
           proxy_pass       http://loki-write.default.svc.cluster.local:3100$request_uri;
         }
@@ -381,6 +395,28 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 ---
+# Source: loki/templates/loki-canary/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-canary
+  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
+---
 # Source: loki/templates/read/service-read-headless.yaml
 apiVersion: v1
 kind: Service
@@ -509,6 +545,67 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: write
 ---
+# Source: loki/templates/loki-canary/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: loki-canary
+  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
+  template:
+    metadata:
+      annotations:
+      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:latest
+          imagePullPolicy: IfNotPresent
+          args:
+            - -addr=loki-gateway.default.svc.cluster.local
+            - -labelname=pod
+            - -labelvalue=$(POD_NAME)
+            - -user=self-monitoring
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+          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
+---
 # Source: loki/charts/grafana-agent-operator/templates/operator-deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -562,7 +659,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 0cb9086dcc675b4532167108595944f77b051dbb65c95d1a57ac1ae8e8207e75
+        checksum/config: f3e09f445f336a7a5c9b7940e06ada596472a566840e8581fc3221bc770a68e3
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -651,7 +748,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 63fc3d26fa3b61d51411c8fe3b62c1a1d7635c4d6ace3f54983b21c79c44650a
       labels:
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/name: loki
@@ -659,6 +756,7 @@
         app.kubernetes.io/component: read
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -754,7 +852,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 63fc3d26fa3b61d51411c8fe3b62c1a1d7635c4d6ace3f54983b21c79c44650a
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -762,6 +860,7 @@
         app.kubernetes.io/part-of: memberlist
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -943,10 +1042,10 @@
     app.kubernetes.io/managed-by: Helm
 spec:
   clients:
-    #TODO: need to support auth here
     - url: http://loki-gateway.default.svc.cluster.local/loki/api/v1/push
       externalLabels:
         cluster: loki
+      tenantId: self-monitoring
   # Supply an empty namespace selector to look in all namespaces. Remove
   # this to only look in the same namespace as the LogsInstance CR
   podLogsNamespaceSelector: {}
@@ -1088,12 +1187,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: loki-read
+  name: loki
   labels:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: read
 spec:
   selector:
     matchLabels:
@@ -1106,6 +1204,7 @@
           - "false"
   endpoints:
     - port: http-metrics
+      path: /metrics
       relabelings:
         - sourceLabels: [job]
           replacement: "default/$1"
@@ -1123,6 +1222,19 @@
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
+# Source: loki/templates/loki-canary/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: loki-canary
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+  annotations:
+    "helm.sh/hook": post-install
+---
 # Source: loki/charts/grafana-agent-operator/templates/tests/test-grafanaagent.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

@renovate renovate bot changed the title chore(deps): update helm release loki to v3.2.1 chore(deps): update helm release loki to v3.2.2 Oct 21, 2022
@renovate renovate bot force-pushed the renovate/loki-3.x branch from 30ba629 to 469d165 Compare October 21, 2022 10:58
@github-actions
Copy link

github-actions bot commented Oct 21, 2022

Path: cluster/apps/monitoring/loki/helm-release.yaml
Version: 3.0.5 -> 3.2.2

@@ -83,6 +83,12 @@
           bucketnames: chunks
           insecure: false
           s3forcepathstyle: false
+    limits_config:
+      enforce_metric_name: false
+      max_cache_freshness_per_query: 10m
+      reject_old_samples: true
+      reject_old_samples_max_age: 168h
+      split_queries_by_interval: 15m
     memberlist:
       join_members:
       - loki-memberlist
@@ -174,6 +180,14 @@
           proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
         }
 
+        location ~ /prometheus/api/v1/alerts.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
+        location ~ /prometheus/api/v1/rules.* {
+          proxy_pass       http://loki-read.default.svc.cluster.local:3100$request_uri;
+        }
+
         location = /loki/api/v1/push {
           proxy_pass       http://loki-write.default.svc.cluster.local:3100$request_uri;
         }
@@ -381,6 +395,28 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 ---
+# Source: loki/templates/loki-canary/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-canary
+  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
+---
 # Source: loki/templates/read/service-read-headless.yaml
 apiVersion: v1
 kind: Service
@@ -509,6 +545,67 @@
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: write
 ---
+# Source: loki/templates/loki-canary/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: loki-canary
+  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
+  template:
+    metadata:
+      annotations:
+      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:latest
+          imagePullPolicy: IfNotPresent
+          args:
+            - -addr=loki-gateway.default.svc.cluster.local
+            - -labelname=pod
+            - -labelvalue=$(POD_NAME)
+            - -user=self-monitoring
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+          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
+---
 # Source: loki/charts/grafana-agent-operator/templates/operator-deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -562,7 +659,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 0cb9086dcc675b4532167108595944f77b051dbb65c95d1a57ac1ae8e8207e75
+        checksum/config: aec39a3f14b5a1de841dfc807992cf08d8f0e29c1c00c953dac1f48a5c5417c4
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -651,7 +748,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 25628ed1a864213c168622bf9c2ae8bd45ce78ec8faccf300b5da70dc4531f50
       labels:
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/name: loki
@@ -659,6 +756,7 @@
         app.kubernetes.io/component: read
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -754,7 +852,7 @@
   template:
     metadata:
       annotations:
-        checksum/config: 4c351517864fd4c08f237187052a35a6448bbbc58e179b1ac310cf3e4ad21e21
+        checksum/config: 25628ed1a864213c168622bf9c2ae8bd45ce78ec8faccf300b5da70dc4531f50
       labels:
         app.kubernetes.io/name: loki
         app.kubernetes.io/instance: loki
@@ -762,6 +860,7 @@
         app.kubernetes.io/part-of: memberlist
     spec:
       serviceAccountName: loki
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
@@ -943,10 +1042,10 @@
     app.kubernetes.io/managed-by: Helm
 spec:
   clients:
-    #TODO: need to support auth here
     - url: http://loki-gateway.default.svc.cluster.local/loki/api/v1/push
       externalLabels:
         cluster: loki
+      tenantId: self-monitoring
   # Supply an empty namespace selector to look in all namespaces. Remove
   # this to only look in the same namespace as the LogsInstance CR
   podLogsNamespaceSelector: {}
@@ -1043,57 +1142,16 @@
           record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate
         - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route)
           record: namespace_job_route:loki_request_duration_seconds_count:sum_rate
-    - name: loki_alerts
-      rules:
-        - alert: LokiRequestErrors
-          annotations:
-            message: |
-              {{ $labels.job }} {{ $labels.route }} is experiencing {{ printf "%.2f" $value }}% errors.
-          expr: |
-            100 * sum(rate(loki_request_duration_seconds_count{status_code=~"5.."}[1m])) by (namespace, job, route)
-              /
-            sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route)
-              > 10
-          for: 15m
-          labels:
-            severity: critical
-        - alert: LokiRequestPanics
-          annotations:
-            message: |
-              {{ $labels.job }} is experiencing {{ printf "%.2f" $value }}% increase of panics.
-          expr: |
-            sum(increase(loki_panic_total[10m])) by (namespace, job) > 0
-          labels:
-            severity: critical
-        - alert: LokiRequestLatency
-          annotations:
-            message: |
-              {{ $labels.job }} {{ $labels.route }} is experiencing {{ printf "%.2f" $value }}s 99th percentile latency.
-          expr: |
-            namespace_job_route:loki_request_duration_seconds:99quantile{route!~"(?i).*tail.*"} > 1
-          for: 15m
-          labels:
-            severity: critical
-        - alert: LokiTooManyCompactorsRunning
-          annotations:
-            message: |
-              {{ $labels.namespace }} has had {{ printf "%.0f" $value }} compactors running for more than 5m. Only one compactor should run at a time.
-          expr: |
-            sum(loki_boltdb_shipper_compactor_running) by (namespace) > 1
-          for: 5m
-          labels:
-            severity: warning
 ---
 # Source: loki/templates/monitoring/servicemonitor.yaml
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: loki-read
+  name: loki
   labels:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: read
 spec:
   selector:
     matchLabels:
@@ -1106,6 +1164,7 @@
           - "false"
   endpoints:
     - port: http-metrics
+      path: /metrics
       relabelings:
         - sourceLabels: [job]
           replacement: "default/$1"
@@ -1123,6 +1182,19 @@
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
+# Source: loki/templates/loki-canary/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: loki-canary
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: canary
+  annotations:
+    "helm.sh/hook": post-install
+---
 # Source: loki/charts/grafana-agent-operator/templates/tests/test-grafanaagent.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

@renovate renovate bot changed the title chore(deps): update helm release loki to v3.2.2 chore(deps): update helm release loki to v3.3.0 Oct 25, 2022
@renovate renovate bot force-pushed the renovate/loki-3.x branch from 469d165 to 1eb5da2 Compare October 25, 2022 16:23
@renovate renovate bot changed the title chore(deps): update helm release loki to v3.3.0 chore(deps): update helm release loki to v3.3.1 Oct 31, 2022
@renovate renovate bot force-pushed the renovate/loki-3.x branch from 1eb5da2 to 00a709c Compare October 31, 2022 15:15
@kashalls kashalls merged commit ec5d3b0 into main Nov 5, 2022
@renovate renovate bot deleted the renovate/loki-3.x branch November 5, 2022 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kashalls kashalls Awaiting requested review from kashalls kashalls is a code owner

Assignees

No one assigned

Labels

renovate/helm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@kashalls