Pārlūkot izejas kodu

Add logsys Helm chart: Vector+Loki stack with environment-specific configurations

demo-user 2 mēneši atpakaļ
vecāks
revīzija
123d043090

+ 21 - 21
k8s/helm/logsys/templates/configmap-vector.yaml

@@ -65,12 +65,12 @@ data:
     endpoint = "{{ .Values.vector.loki.endpoint }}"
     encoding.codec = "json"
     [sinks.loki.labels]
-    env = "{{ env }}"
-    app = "{{ app }}"
-    level = "{{ level }}"
-    event_class = "{{ event_class }}"
-    uri_group = "{{ uri_group }}"
-    status = "{{ status }}"
+    env = ".env"
+    app = ".app"
+    level = ".level"
+    event_class = ".event_class"
+    uri_group = ".uri_group"
+    status = ".status"
 
     [transforms.to_metrics]
     type = "log_to_metric"
@@ -81,9 +81,9 @@ data:
     type = "counter"
     field = "message"
     name = "requests_total"
-    tags.app = "{{ app }}"
-    tags.env = "{{ env }}"
-    tags.uri_group = "{{ uri_group }}"
+    tags.app = ".app"
+    tags.env = ".env"
+    tags.uri_group = ".uri_group"
 
     # Counter: HTTP request errors
     [[transforms.to_metrics.metrics]]
@@ -91,18 +91,18 @@ data:
     field = "message"
     name = "requests_errors_total"
     filter.condition = '.status == "server_error" || .status == "client_error"'
-    tags.app = "{{ app }}"
-    tags.env = "{{ env }}"
-    tags.status = "{{ status }}"
+    tags.app = ".app"
+    tags.env = ".env"
+    tags.status = ".status"
 
     # Histogram: Request duration (latency)
     [[transforms.to_metrics.metrics]]
     type = "histogram"
     field = "duration_ms"
     name = "request_duration_ms"
-    tags.app = "{{ app }}"
-    tags.uri_group = "{{ uri_group }}"
-    tags.env = "{{ env }}"
+    tags.app = ".app"
+    tags.uri_group = ".uri_group"
+    tags.env = ".env"
 
     # Counter: Total orders
     [[transforms.to_metrics.metrics]]
@@ -110,8 +110,8 @@ data:
     field = "message"
     name = "orders_total"
     filter.condition = '.event_class == "order"'
-    tags.app = "{{ app }}"
-    tags.env = "{{ env }}"
+    tags.app = ".app"
+    tags.env = ".env"
 
     # Counter: Failed orders
     [[transforms.to_metrics.metrics]]
@@ -119,8 +119,8 @@ data:
     field = "message"
     name = "orders_failed_total"
     filter.condition = '.event_class == "order" && (.status == "server_error" || .status == "client_error")'
-    tags.app = "{{ app }}"
-    tags.env = "{{ env }}"
+    tags.app = ".app"
+    tags.env = ".env"
 
     # Counter: Payment events
     [[transforms.to_metrics.metrics]]
@@ -128,8 +128,8 @@ data:
     field = "message"
     name = "payment_events_total"
     filter.condition = '.event_class == "payment"'
-    tags.app = "{{ app }}"
-    tags.env = "{{ env }}"
+    tags.app = ".app"
+    tags.env = ".env"
 
     [sinks.prometheus]
     type = "prometheus_exporter"

+ 3 - 4
k8s/helm/logsys/values.yaml

@@ -2,8 +2,8 @@ loki:
   enabled: true
   namespace: shoprecycle
   image:
-    repository: grafana/loki
-    tag: 2.9.3
+    repository: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/grafana/loki
+    tag: 2.9.3-linuxarm64
   replicas: 1
   storage:
     type: filesystem
@@ -12,7 +12,7 @@ loki:
   persistence:
     enabled: true
     size: 10Gi
-    storageClassName: standard
+    storageClassName: managed-nfs-storage
   resources:
     limits:
       cpu: 500m
@@ -39,7 +39,6 @@ vector:
     - shop-recycle-gateway
     - shop-recycle-order-service
     - shop-recycle-payment-service
-    - shop-recycle-web
   resources:
     limits:
       cpu: 500m