Skip to content

Commit

Permalink
Fix grafana api auth (add comments)
Browse files Browse the repository at this point in the history
  • Loading branch information
nemchik committed Apr 20, 2023
1 parent aa9a292 commit 53f7be0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
5 changes: 4 additions & 1 deletion grafana.subdomain.conf.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Version 2023/04/14
## Version 2023/04/20
# make sure that your grafana container is named grafana
# make sure that your dns has a cname set for grafana

Expand Down Expand Up @@ -55,5 +55,8 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

# Clear Authorization Header if you are using http auth and normal Grafana auth
#proxy_set_header Authorization "";

}
}
10 changes: 5 additions & 5 deletions grafana.subfolder.conf.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Version 2023/04/14
## Version 2023/04/20
# make sure that your grafana container is named grafana
# make sure that grafana is set to work with the base url /grafana/
# grafana requires environment variables set thus:
Expand All @@ -22,10 +22,10 @@ location ^~ /grafana/ {

include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_grafana grafana;
set $upstream_app grafana;
set $upstream_port 3000;
set $upstream_proto http;
proxy_pass http://$upstream_grafana:$upstream_port ;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

# Clear Authorization Header if you are using http auth and normal Grafana auth
#proxy_set_header Authorization "";
Expand All @@ -37,10 +37,10 @@ location ^~ /grafana/ {
location ^~ /grafana/api {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_grafana grafana;
set $upstream_app grafana;
set $upstream_port 3000;
set $upstream_proto http;
proxy_pass http://$upstream_grafana:$upstream_port ;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

# Clear Authorization Header if you are using http auth and normal Grafana auth
#proxy_set_header Authorization "";
Expand Down

0 comments on commit 53f7be0

Please sign in to comment.