From 180ddacf614bf221ab8feec07250bd28876032e5 Mon Sep 17 00:00:00 2001
From: rohow <rohow@foxmail.com>
Date: Tue, 6 May 2025 09:27:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(loki):=20loki=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/infra/monitor/loki/helmchart-loki.yaml     | 4 +++-
 apps/infra/monitor/loki/helmchart-promtail.yaml | 1 -
 apps/infra/monitor/prometheus/helmchart.yaml    | 2 +-
 apps/infra/net/nginx/helmchart.yaml             | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/infra/monitor/loki/helmchart-loki.yaml b/apps/infra/monitor/loki/helmchart-loki.yaml
index 3003911..54f4bc6 100644
--- a/apps/infra/monitor/loki/helmchart-loki.yaml
+++ b/apps/infra/monitor/loki/helmchart-loki.yaml
@@ -7,7 +7,6 @@ spec:
   repo: https://grafana.github.io/helm-charts
   chart: loki
   targetNamespace: infra-monitor
-  version: 6.25.1
   valuesContent: |-
     deploymentMode: SingleBinary
     gateway:
@@ -18,6 +17,8 @@ spec:
       extraArgs:
         # 降低测试日志生成条数
         - -interval=30s
+        - -labelname=service_name
+        - -labelvalue=loki-canary
     resultsCache:
       nodeSelector:
         kubernetes.io/hostname: clawhk
@@ -33,6 +34,7 @@ spec:
       limits_config:
         reject_old_samples_max_age: 168h
         max_query_series: 10000
+        volume_enabled: true
       storage:
         type: 'filesystem'
       schemaConfig:
diff --git a/apps/infra/monitor/loki/helmchart-promtail.yaml b/apps/infra/monitor/loki/helmchart-promtail.yaml
index b0f8efa..37d2696 100644
--- a/apps/infra/monitor/loki/helmchart-promtail.yaml
+++ b/apps/infra/monitor/loki/helmchart-promtail.yaml
@@ -7,7 +7,6 @@ spec:
   repo: https://grafana.github.io/helm-charts
   chart: promtail
   targetNamespace: infra-monitor
-  version: 6.16.6
   valuesContent: |-
     nodeSelector:
       svccontroller.k3s.cattle.io/enablelb: "true"
diff --git a/apps/infra/monitor/prometheus/helmchart.yaml b/apps/infra/monitor/prometheus/helmchart.yaml
index f213338..f5700ba 100644
--- a/apps/infra/monitor/prometheus/helmchart.yaml
+++ b/apps/infra/monitor/prometheus/helmchart.yaml
@@ -7,7 +7,7 @@ spec:
   repo: https://prometheus-community.github.io/helm-charts
   chart: kube-prometheus-stack
   targetNamespace: infra-monitor
-  version: 69.2.0
+  version: 71.0.0
   valuesContent: |-
     kubeControllerManager:
       enabled: false
diff --git a/apps/infra/net/nginx/helmchart.yaml b/apps/infra/net/nginx/helmchart.yaml
index 3a38316..93e4e1f 100644
--- a/apps/infra/net/nginx/helmchart.yaml
+++ b/apps/infra/net/nginx/helmchart.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   repo: https://kubernetes.github.io/ingress-nginx
   chart: ingress-nginx
-  version: 4.11.5
+  version: 4.11.6
   targetNamespace: infra-net
   valuesContent: |-
     fullnameOverride: ingress-nginx
@@ -100,13 +100,14 @@ spec:
           "geoip_city": "$geoip2_city",
           "geoip_org": "$geoip2_org",
           "geoip_longitude": "$geoip2_longitude",
-          "geoip_latitude": "$geoip2_latitude"
+          "geoip_latitude": "$geoip2_latitude",
+          "level": "info"
         }'
         # crowdsec插件配置
         plugins: "crowdsec"
         lua-shared-dicts: "crowdsec_cache: 50m"
       # 启用geoip2模块
-      maxmindLicenseKey: "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"
+      maxmindLicenseKey: "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"
       extraArgs:
         default-ssl-certificate: "infra-net/dev-cm-crt"
       # crowdsec插件配置