Merge branch 'main' of ssh://git.realmanual.ru:10022/pub/courses/loki

loki-server/data/user.file

@@ -1 +0,0 @@
-loki:$$2y$$05$$UZwmFTrItdJngPd3eLTn5uw5SKU4fyB0d22aWA0sG1A/Cx9PONtM6

loki-server/docker-compose.yaml

@@ -43,13 +43,12 @@ services:
       - "traefik.http.routers.loki.tls.certresolver=letsEncrypt"
       - "traefik.http.routers.loki.middlewares=loki-auth"
       - "traefik.http.services.loki-service.loadbalancer.server.port=3100"
-      - "traefik.http.middlewares.loki-auth.basicauth.usersfile=/mnt/user.file" # loki\loki123
+      - "traefik.http.middlewares.loki-auth.basicauth.users=loki:$$2y$$05$$UZwmFTrItdJngPd3eLTn5uw5SKU4fyB0d22aWA0sG1A/Cx9PONtM6" # loki\loki123
       - "traefik.docker.network=webproxy"
     command: -config.file=/etc/loki/local-config.yaml
     volumes:
       - loki_storage:/loki
       - ./data/local-config.yaml:/etc/loki/local-config.yaml
-      - ./data/user.file:/mnt/user.file
     expose:
       - 3100
     networks:

promtail-helm/values.yaml

@@ -298,6 +298,8 @@ config:
     pipelineStages:
       - cri: {}
     common:
+      - target_label: cluster
+        replacement: realmanual-nsk1
       - action: replace
         source_labels:
           - __meta_kubernetes_pod_node_name