diff --git a/loki-server/data/user.file b/loki-server/data/user.file deleted file mode 100644 index 1c38de6..0000000 --- a/loki-server/data/user.file +++ /dev/null @@ -1 +0,0 @@ -loki:$$2y$$05$$UZwmFTrItdJngPd3eLTn5uw5SKU4fyB0d22aWA0sG1A/Cx9PONtM6 diff --git a/loki-server/docker-compose.yaml b/loki-server/docker-compose.yaml index 683124e..578cf0b 100644 --- a/loki-server/docker-compose.yaml +++ b/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: diff --git a/promtail-helm/values.yaml b/promtail-helm/values.yaml index 86f2bdb..0606403 100644 --- a/promtail-helm/values.yaml +++ b/promtail-helm/values.yaml @@ -294,6 +294,8 @@ config: pipelineStages: - cri: {} common: + - target_label: cluster + replacement: realmanual-nsk1 - action: replace source_labels: - __meta_kubernetes_pod_node_name