Ref #32619: update promtail

Author: LEDfan

bases/promtail/base.yaml

@@ -6,9 +6,9 @@ metadata:
   name: promtail
   namespace: default
   labels:
-    helm.sh/chart: promtail-6.0.2
+    helm.sh/chart: promtail-6.15.5
     app.kubernetes.io/name: promtail
-    app.kubernetes.io/version: "2.5.0"
+    app.kubernetes.io/version: "2.9.3"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: promtail/templates/secret.yaml
@@ -18,15 +18,17 @@ metadata:
   name: promtail
   namespace: default
   labels:
-    helm.sh/chart: promtail-6.0.2
+    helm.sh/chart: promtail-6.15.5
     app.kubernetes.io/name: promtail
-    app.kubernetes.io/version: "2.5.0"
+    app.kubernetes.io/version: "2.9.3"
     app.kubernetes.io/managed-by: Helm
 stringData:
   promtail.yaml: |
     server:
       log_level: info
+      log_format: logfmt
       http_listen_port: 3101
+      
     
     clients:
       - url: http://loki-gateway/loki/api/v1/push
@@ -57,7 +59,7 @@ stringData:
             target_label: app
           - source_labels:
               - __meta_kubernetes_pod_label_app_kubernetes_io_instance
-              - __meta_kubernetes_pod_label_release
+              - __meta_kubernetes_pod_label_instance
             regex: ^;*([^;]+)(;.*)?$
             action: replace
             target_label: instance
@@ -106,16 +108,24 @@ stringData:
             - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash
             - __meta_kubernetes_pod_container_name
             target_label: __path__
+      
+      
+    
+    limits_config:
+      
+    
+    tracing:
+      enabled: false
 ---
 # Source: promtail/templates/clusterrole.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: promtail
   labels:
-    helm.sh/chart: promtail-6.0.2
+    helm.sh/chart: promtail-6.15.5
     app.kubernetes.io/name: promtail
-    app.kubernetes.io/version: "2.5.0"
+    app.kubernetes.io/version: "2.9.3"
     app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups:
@@ -137,9 +147,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: promtail
   labels:
-    helm.sh/chart: promtail-6.0.2
+    helm.sh/chart: promtail-6.15.5
     app.kubernetes.io/name: promtail
-    app.kubernetes.io/version: "2.5.0"
+    app.kubernetes.io/version: "2.9.3"
     app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
@@ -157,9 +167,9 @@ metadata:
   name: promtail
   namespace: default
   labels:
-    helm.sh/chart: promtail-6.0.2
+    helm.sh/chart: promtail-6.15.5
     app.kubernetes.io/name: promtail
-    app.kubernetes.io/version: "2.5.0"
+    app.kubernetes.io/version: "2.9.3"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -172,15 +182,16 @@ spec:
       labels:
         app.kubernetes.io/name: promtail
       annotations:
-        checksum/config: c0f25de52725463683e5c88022b3d9351b18f7cf8fb0c51605748d015366fb09
+        checksum/config: 2ef0f14afc8ed4b72495a244ef20e42a4bc14afd488033fe94e04c341b97529a
     spec:
       serviceAccountName: promtail
+      enableServiceLinks: true
       securityContext:
         runAsGroup: 0
         runAsUser: 0
       containers:
         - name: promtail
-          image: "docker.io/grafana/promtail:2.5.0"
+          image: "docker.io/grafana/promtail:2.9.3"
           imagePullPolicy: IfNotPresent
           args:
             - "-config.file=/etc/promtail/promtail.yaml"
@@ -213,7 +224,7 @@ spec:
           readinessProbe:
             failureThreshold: 5
             httpGet:
-              path: /ready
+              path: '/ready'
               port: http-metrics
             initialDelaySeconds: 10
             periodSeconds: 10

bases/promtail/scripts/Makefile

@@ -1,4 +1,4 @@
-manifest_version=6.0.2
+manifest_version=6.15.5
 component=promtail
 
 outfile=../base.yaml

overlays/loki/kustomization.yaml

@@ -16,3 +16,8 @@ configMapGenerator:
 
 patches:
 - path: patches/loki.statefulset.yaml
+
+images:
+  - name: docker.io/grafana/loki:2.9.4
+    newName: docker.io/grafana/loki
+    newTag: 2.9.5

overlays/promtail/configs/promtail.yaml

@@ -1,5 +1,6 @@
 server:
   log_level: info
+  log_format: logfmt
   http_listen_port: 3101
 
 clients:
@@ -14,7 +15,7 @@ scrape_configs:
   - job_name: kubernetes-pods
     pipeline_stages:
       - docker: { }
-      - cri: {}
+      - cri: { }
     kubernetes_sd_configs:
       - role: pod
     relabel_configs:
@@ -37,7 +38,7 @@ scrape_configs:
           - app
       - source_labels:
           - __meta_kubernetes_pod_label_app_kubernetes_io_instance
-          - __meta_kubernetes_pod_label_release
+          - __meta_kubernetes_pod_label_instance
         regex: ^;*([^;]+)(;.*)?$
         action: replace
         target_label: instance
@@ -110,7 +111,7 @@ scrape_configs:
   - job_name: shinyproxy-and-operator-pods
     pipeline_stages:
       - docker: { }
-      - cri: {}
+      - cri: { }
       - multiline:
           firstline: ".* (DEBUG)|(INFO)|(ERROR)|(WARN)"
     kubernetes_sd_configs:
@@ -135,7 +136,7 @@ scrape_configs:
           - app
       - source_labels:
           - __meta_kubernetes_pod_label_app_kubernetes_io_instance
-          - __meta_kubernetes_pod_label_release
+          - __meta_kubernetes_pod_label_instance
         regex: ^;*([^;]+)(;.*)?$
         action: replace
         target_label: instance
@@ -193,3 +194,8 @@ scrape_configs:
       - action: replace
         source_labels: [ __meta_kubernetes_pod_label_openanalytics_eu_sp_instance ]
         target_label: sp_instance
+
+limits_config:
+
+tracing:
+  enabled: false

overlays/promtail/kustomization.yaml

@@ -10,3 +10,8 @@ secretGenerator:
     behavior: replace
     files:
       - configs/promtail.yaml
+
+images:
+  - name: docker.io/grafana/promtail:2.9.3
+    newName: docker.io/grafana/promtail
+    newTag: 2.9.5