IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix root_url in docs & comments (#11819)

Browse Source 
* fix root_url in docs & comments

* include ports in docker-compose config
This commit is contained in:
Dan Cech 2018-05-07 08:18:21 -04:00 committed by Torkel Ödegaard
parent b804f6d999
commit 29c9d3f74c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/blocks/apache_proxy/docker-compose.yaml
View File

@ -2,7 +2,7 @@
# http://localhost:3000 (Grafana running locally) # http://localhost:3000 (Grafana running locally)
# #
# Please note that you'll need to change the root_url in the Grafana configuration: # Please note that you'll need to change the root_url in the Grafana configuration:
# root_url = %(protocol)s://%(domain)s:/grafana/ # root_url = %(protocol)s://%(domain)s:10081/grafana/
apacheproxy: apacheproxy:
build: blocks/apache_proxy build: blocks/apache_proxy

2
docker/blocks/nginx_proxy/docker-compose.yaml
View File

@ -2,7 +2,7 @@
# http://localhost:3000 (Grafana running locally) # http://localhost:3000 (Grafana running locally)
# #
# Please note that you'll need to change the root_url in the Grafana configuration: # Please note that you'll need to change the root_url in the Grafana configuration:
# root_url = %(protocol)s://%(domain)s:/grafana/ # root_url = %(protocol)s://%(domain)s:10080/grafana/
nginxproxy: nginxproxy:
build: blocks/nginx_proxy build: blocks/nginx_proxy

4
docs/sources/installation/behind_proxy.md
View File

@ -53,7 +53,7 @@ server {
```bash ```bash
[server] [server]
domain = foo.bar domain = foo.bar
root_url = %(protocol)s://%(domain)s:/grafana root_url = %(protocol)s://%(domain)s/grafana/
``` ```
#### Nginx configuration with sub path #### Nginx configuration with sub path
@ -98,7 +98,7 @@ Given:
```bash ```bash
[server] [server]
domain = localhost:8080 domain = localhost:8080
root_url = %(protocol)s://%(domain)s:/grafana root_url = %(protocol)s://%(domain)s/grafana/
``` ```
Create an Inbound Rule for the parent website (localhost:8080 in this example) in IIS Manager with the following settings: Create an Inbound Rule for the parent website (localhost:8080 in this example) in IIS Manager with the following settings:

8
docs/sources/tutorials/iis.md
View File

@ -16,7 +16,7 @@ Example:
- Parent site: http://localhost:8080 - Parent site: http://localhost:8080
- Grafana: http://localhost:3000 - Grafana: http://localhost:3000
Grafana as a subpath: http://localhost:8080/grafana Grafana as a subpath: http://localhost:8080/grafana
## Setup ## Setup
@ -33,7 +33,7 @@ Given that the subpath should be `grafana` and the parent site is `localhost:808
```bash ```bash
[server] [server]
domain = localhost:8080 domain = localhost:8080
root_url = %(protocol)s://%(domain)s:/grafana root_url = %(protocol)s://%(domain)s/grafana/
``` ```
Restart the Grafana server after changing the config file. Restart the Grafana server after changing the config file.
@ -74,11 +74,11 @@ When navigating to the grafana url (`http://localhost:8080/grafana` in the examp
1. The `root_url` setting in the Grafana config file does not match the parent url with subpath. This could happen if the root_url is commented out by mistake (`;` is used for commenting out a line in .ini files): 1. The `root_url` setting in the Grafana config file does not match the parent url with subpath. This could happen if the root_url is commented out by mistake (`;` is used for commenting out a line in .ini files):
`; root_url = %(protocol)s://%(domain)s:/grafana` `; root_url = %(protocol)s://%(domain)s/grafana/`
2. or if the subpath in the `root_url` setting does not match the subpath used in the pattern in the Inbound Rule in IIS: 2. or if the subpath in the `root_url` setting does not match the subpath used in the pattern in the Inbound Rule in IIS:
`root_url = %(protocol)s://%(domain)s:/grafana` `root_url = %(protocol)s://%(domain)s/grafana/`
pattern in Inbound Rule: `wrongsubpath(/)?(.*)` pattern in Inbound Rule: `wrongsubpath(/)?(.*)`