merge 2.4/dev

This commit is contained in:
Jason Ertel
2023-10-11 13:35:16 -04:00
191 changed files with 4027 additions and 16541 deletions

View File

@@ -8,6 +8,7 @@
worker_processes auto;
error_log /var/log/nginx/error.log;
pid /run/nginx.pid;
user nobody;
include /usr/share/nginx/modules/*.conf;
@@ -230,7 +231,20 @@ http {
proxy_cookie_path /api/ /influxdb/api/;
}
location /kibana/ {
location /app/dashboards/ {
auth_request /auth/sessions/whoami;
rewrite /app/dashboards/(.*) /app/dashboards/$1 break;
proxy_pass http://{{ GLOBALS.manager }}:5601/app/;
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Proxy "";
proxy_set_header X-Forwarded-Proto $scheme;
}
location /kibana/ {
auth_request /auth/sessions/whoami;
rewrite /kibana/(.*) /$1 break;
proxy_pass http://{{ GLOBALS.manager }}:5601/;