From 024df6b915350b56c8b3fe1be2cd896b125c2f13 Mon Sep 17 00:00:00 2001 From: Micah Anderson <micah@riseup.net> Date: Tue, 7 Jul 2020 17:50:31 -0400 Subject: [PATCH] move the websock nginx config to the grafana endpoint --- services.yml.loki | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services.yml.loki b/services.yml.loki index 65ffd08a..86e5ce59 100644 --- a/services.yml.loki +++ b/services.yml.loki @@ -128,18 +128,18 @@ prometheus: - name: loki port: 3100 scheme: http + - name: grafana + port: 2929 + scheme: https + enable_sso_proxy: true extra_nginx_config: | - location ^~ /api/datasources/proxy/\d+/loki/api/v1/tail { + location ^~ /api/datasources/proxy/2/loki/api/v1/tail { proxy_pass http://be_loki_3100_prometheus; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header Host $host; - } - - name: grafana - port: 2929 - scheme: https - enable_sso_proxy: true + } - name: thanos port: 10904 scheme: http -- GitLab