From f4af26f81173a8a4eaf331f7c1d366056bf4477d Mon Sep 17 00:00:00 2001 From: Jian Wang Date: Mon, 25 Mar 2024 15:09:02 +0100 Subject: [PATCH] Keep nginx-config values same as v1.3.0 to fix grafana 404 Signed-off-by: Jian Wang --- .../103.0.3+up45.31.1/nginx-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml b/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml index 17827dccb..bec218047 100644 --- a/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml +++ b/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml @@ -91,13 +91,13 @@ data: } map $http_referer $final_appSubUrl { - ~.*/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-.+)/harvesterhci.io.addon/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-.+)/.* '"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/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/services/.* '"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"'; + ~.*/dashboard/harvester/c/(c-m-.+)/harvesterhci.io.addon/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":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; } }