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

Docs: fix image, add nginx code type (#23387)

Browse Source
This commit is contained in:
Robby Milo 2020-04-07 12:08:05 +02:00 committed by GitHub
parent 6a5794aa7a
commit cf43709316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/sources/_index.md
View File

@ -8,7 +8,8 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
# Grafana documentation # Grafana documentation
<h2>Installing Grafana</h2> ## Installing Grafana
<div class="nav-cards"> <div class="nav-cards">
<a href="{{< relref "installation/debian.md" >}}" class="nav-cards__item nav-cards__item--install"> <a href="{{< relref "installation/debian.md" >}}" class="nav-cards__item nav-cards__item--install">
<div class="nav-cards__icon fa fa-linux"> <div class="nav-cards__icon fa fa-linux">
@ -26,7 +27,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
<h5>Install on Windows</h5> <h5>Install on Windows</h5>
</a> </a>
<a href="{{< relref "installation/docker.md" >}}" class="nav-cards__item nav-cards__item--install"> <a href="{{< relref "installation/docker.md" >}}" class="nav-cards__item nav-cards__item--install">
<img src="/img/docs/logos/icon_docker.png"> <img src="/static/img/logos/logo-docker.svg">
<h5>Run Docker image</h5> <h5>Run Docker image</h5>
</a> </a>
<a href="https://grafana.com/cloud/grafana" class="nav-cards__item nav-cards__item--install"> <a href="https://grafana.com/cloud/grafana" class="nav-cards__item nav-cards__item--install">
@ -41,7 +42,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
</a> </a>
</div> </div>
<h2>Guides</h2> ## Guides
<div class="nav-cards"> <div class="nav-cards">
<a href="{{< relref "guides/what-is-grafana.md" >}}" class="nav-cards__item nav-cards__item--guide"> <a href="{{< relref "guides/what-is-grafana.md" >}}" class="nav-cards__item nav-cards__item--guide">
@ -71,7 +72,8 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
</div> </div>
<h2>Data source guides</h2> ## Data source guides
<div class="nav-cards"> <div class="nav-cards">
<a href="{{< relref "features/datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds"> <a href="{{< relref "features/datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
<img src="/img/docs/logos/icon_graphite.svg" > <img src="/img/docs/logos/icon_graphite.svg" >

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

@ -38,7 +38,7 @@ domain = foo.bar
Nginx is a high performance load balancer, web server and reverse proxy: https://www.nginx.com/ Nginx is a high performance load balancer, web server and reverse proxy: https://www.nginx.com/
#### Nginx configuration with HTTP and Reverse Proxy enabled #### Nginx configuration with HTTP and Reverse Proxy enabled
```bash ```nginx
server { server {
listen 80; listen 80;
root /usr/share/nginx/html; root /usr/share/nginx/html;
@ -62,7 +62,7 @@ root_url = https://foo.bar
Instead of http://foo.bar:3000/?orgId=1, this configuration will redirect all HTTP requests to HTTPS and re-write the URL so that port 3000 isn't visible and will result in https://foo.bar/?orgId=1 Instead of http://foo.bar:3000/?orgId=1, this configuration will redirect all HTTP requests to HTTPS and re-write the URL so that port 3000 isn't visible and will result in https://foo.bar/?orgId=1
```bash ```nginx
server { server {
listen 80; listen 80;
server_name foo.bar; server_name foo.bar;
@ -98,7 +98,7 @@ root_url = %(protocol)s://%(domain)s/grafana/
``` ```
#### Nginx configuration with sub path #### Nginx configuration with sub path
```bash ```nginx
server { server {
listen 80; listen 80;
root /usr/share/nginx/www; root /usr/share/nginx/www;