From 03ad6873c960f1f052747a00cdda41bc786989e9 Mon Sep 17 00:00:00 2001 From: Jian Wang Date: Tue, 2 Jan 2024 16:54:23 +0100 Subject: [PATCH] Fix grafana login issue Signed-off-by: Jian Wang --- .../rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml b/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml index 98c0e4cc8..68b7f4678 100644 --- a/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml +++ b/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml @@ -91,9 +91,10 @@ data: } map $http_referer $final_appSubUrl { - ~.*/k8s/clusters/(c-m-.+)/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; + ~.*/k8s/clusters/(c-m-.+)/api/v1/namespaces/cattle-monitoring-system/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; ~.*/dashboard/harvester/c/(c-m-.+)/kubevirt.io.virtualmachine/.*/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; ~.*/dashboard/harvester/c/(c-m-.+)/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; + ~.*/api/v1/namespaces/cattle-monitoring-system/.* '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; default '"appSubUrl":"/k8s/clusters/local/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; }