Merge branch 'master' of https://github.com/grafana/grafana

Author: sunlinyao

contribute/developer-guide.md

@@ -72,6 +72,10 @@ Log in using the default credentials:
 
 When you log in for the first time, Grafana asks you to change your password.
 
+#### Building on Windows
+
+The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download).
+
 ## Test Grafana
 
 The test suite consists of three types of tests: _Frontend tests_, _backend tests_, and _end-to-end tests_.

docs/README.md

@@ -19,7 +19,7 @@ Edit content in the `sources` directory.
 
 ### Using `relref` for internal links
 
-Use the Hugo shortcode [relref](https://gohugo.io/content-management/cross-references/#use-ref-and-relref) anytime you are linking to other internal docs pages.
+Use the Hugo shortcode [relref](https://gohugo.io/content-management/cross-references/#use-ref-and-relref) any time you are linking to other internal docs pages.
 
 ### Edit the side menu
 

docs/sources/_index.md

@@ -3,7 +3,7 @@ title = "Grafana documentation"
 description = "Guides, Installation and Feature Documentation"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
-aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
+aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
 +++
 
 # Grafana Documentation
@@ -64,7 +64,7 @@ aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
         <h4>What's new in v6.5</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
-  
+
 </div>
 
 <h2>Data Source Guides</h2>

docs/sources/administration/image_rendering.md

@@ -3,7 +3,7 @@ title = "Image Rendering"
 description = ""
 keywords = ["grafana", "image", "rendering", "phantomjs"]
 type = "docs"
-aliases = ["/installation/image-rendering"]
+aliases = ["/docs/grafana/latest/installation/image-rendering"]
 [menu.docs]
 parent = "admin"
 weight = 8

docs/sources/administration/provisioning.md

@@ -3,7 +3,7 @@ title = "Provisioning"
 description = ""
 keywords = ["grafana", "provisioning"]
 type = "docs"
-aliases = ["/installation/provisioning"]
+aliases = ["/docs/grafana/latest/installation/provisioning"]
 [menu.docs]
 parent = "admin"
 weight = 8
@@ -437,6 +437,7 @@ The following sections detail the supported settings for each alert notification
 | ---- |
 | bottoken |
 | chatid |
+| uploadImage |
 
 #### Alert notification `threema`
 

docs/sources/auth/auth-proxy.md

@@ -3,7 +3,7 @@ title = "Auth Proxy"
 description = "Grafana Auth Proxy Guide "
 keywords = ["grafana", "configuration", "documentation", "proxy"]
 type = "docs"
-aliases = ["/tutorials/authproxy/"]
+aliases = ["/docs/grafana/latest/tutorials/authproxy/"]
 [menu.docs]
 name = "Auth Proxy"
 identifier = "auth-proxy"

docs/sources/auth/ldap.md

@@ -3,7 +3,7 @@ title = "LDAP Authentication"
 description = "Grafana LDAP Authentication Guide "
 keywords = ["grafana", "configuration", "documentation", "ldap", "active directory"]
 type = "docs"
-aliases = ["/installation/ldap/"]
+aliases = ["/docs/grafana/latest/installation/ldap/"]
 [menu.docs]
 name = "LDAP"
 identifier = "ldap"

docs/sources/auth/saml.md

@@ -2,7 +2,7 @@
 title = "SAML Authentication"
 description = "Grafana SAML Authentication"
 keywords = ["grafana", "saml", "documentation", "saml-auth"]
-aliases = ["/auth/saml/"]
+aliases = ["/docs/grafana/latest/auth/saml/"]
 type = "docs"
 [menu.docs]
 name = "SAML"

docs/sources/auth/team-sync.md

@@ -2,7 +2,7 @@
 title = "Team Sync"
 description = "Grafana Team Sync"
 keywords = ["grafana", "auth", "documentation"]
-aliases = ["/auth/saml/"]
+aliases = ["/docs/grafana/latest/auth/saml/"]
 type = "docs"
 [menu.docs]
 name = "Team Sync"

docs/sources/contribute/cla.md

@@ -2,7 +2,7 @@
 title = "Contributor License Agreement (CLA)"
 description = "Contributor License Agreement (CLA)"
 type = "docs"
-aliases = ["/project/cla", "docs/contributing/cla.html"]
+aliases = ["/docs/grafana/latest/project/cla", "docs/contributing/cla.html"]
 [menu.docs]
 parent = "contribute"
 weight = 1

docs/sources/features/datasources/_index.md

@@ -1,7 +1,7 @@
 +++
 title = "Data Sources"
 type = "docs"
-aliases = ["/datasources/overview/"]
+aliases = ["/docs/grafana/latest/datasources/overview/"]
 [menu.docs]
 name = "Data Sources"
 identifier = "datasources"
@@ -38,4 +38,4 @@ The following data sources are officially supported:
 
 ## Data source plugins
 
-Since grafana 3.0 you can install data sources as plugins. Check out [Grafana.net](https://grafana.com/plugins) for more data sources.
+Since Grafana 3.0 you can install data sources as plugins. Check out [Grafana.net](https://grafana.com/plugins) for more data sources.

docs/sources/features/datasources/azuremonitor.md

@@ -3,7 +3,7 @@ title = "Using Azure Monitor in Grafana"
 description = "Guide for using Azure Monitor in Grafana"
 keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
 type = "docs"
-aliases = ["/datasources/azuremonitor"]
+aliases = ["/docs/grafana/latest/datasources/azuremonitor"]
 [menu.docs]
 name = "Azure Monitor"
 parent = "datasources"

docs/sources/features/datasources/cloudwatch.md

@@ -3,7 +3,7 @@ title = "AWS CloudWatch"
 description = "Guide for using CloudWatch in Grafana"
 keywords = ["grafana", "cloudwatch", "guide"]
 type = "docs"
-aliases = ["/datasources/cloudwatch"]
+aliases = ["/docs/grafana/latest/datasources/cloudwatch"]
 [menu.docs]
 name = "AWS Cloudwatch"
 identifier = "cloudwatch"

docs/sources/features/datasources/elasticsearch.md

@@ -3,7 +3,7 @@ title = "Using Elasticsearch in Grafana"
 description = "Guide for using Elasticsearch in Grafana"
 keywords = ["grafana", "elasticsearch", "guide"]
 type = "docs"
-aliases = ["/datasources/elasticsearch"]
+aliases = ["/docs/grafana/latest/datasources/elasticsearch"]
 [menu.docs]
 name = "Elasticsearch"
 parent = "datasources"

docs/sources/features/datasources/graphite.md

@@ -3,7 +3,7 @@ title = "Using Graphite in Grafana"
 description = "Guide for using graphite in Grafana"
 keywords = ["grafana", "graphite", "guide"]
 type = "docs"
-aliases = ["/datasources/graphite"]
+aliases = ["/docs/grafana/latest/datasources/graphite"]
 [menu.docs]
 name = "Graphite"
 identifier = "graphite"

docs/sources/features/datasources/influxdb.md

@@ -3,7 +3,7 @@ title = "Using InfluxDB in Grafana"
 description = "Guide for using InfluxDB in Grafana"
 keywords = ["grafana", "influxdb", "guide"]
 type = "docs"
-aliases = ["/datasources/influxdb"]
+aliases = ["/docs/grafana/latest/datasources/influxdb"]
 [menu.docs]
 name = "InfluxDB"
 parent = "datasources"

docs/sources/features/datasources/loki.md

@@ -3,7 +3,7 @@ title = "Using Loki in Grafana"
 description = "Guide for using Loki in Grafana"
 keywords = ["grafana", "loki", "logging", "guide"]
 type = "docs"
-aliases = ["/datasources/loki"]
+aliases = ["/docs/grafana/latest/datasources/loki"]
 [menu.docs]
 name = "Loki"
 parent = "datasources"

docs/sources/features/datasources/opentsdb.md

@@ -3,7 +3,7 @@ title = "Using OpenTSDB in Grafana"
 description = "Guide for using OpenTSDB in Grafana"
 keywords = ["grafana", "opentsdb", "guide"]
 type = "docs"
-aliases = ["/datasources/opentsdb",	"docs/features/opentsdb"]
+aliases = ["/docs/grafana/latest/datasources/opentsdb",	"/docs/grafana/latest/features/opentsdb"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"

docs/sources/features/datasources/prometheus.md

@@ -3,7 +3,7 @@ title = "Using Prometheus in Grafana"
 description = "Guide for using Prometheus in Grafana"
 keywords = ["grafana", "prometheus", "guide"]
 type = "docs"
-aliases = ["/datasources/prometheus"]
+aliases = ["/docs/grafana/latest/datasources/prometheus"]
 [menu.docs]
 name = "Prometheus"
 parent = "datasources"

docs/sources/features/datasources/stackdriver.md

@@ -3,7 +3,7 @@ title = "Using Stackdriver in Grafana"
 description = "Guide for using Stackdriver in Grafana"
 keywords = ["grafana", "stackdriver", "google", "guide"]
 type = "docs"
-aliases = ["/datasources/stackdriver"]
+aliases = ["/docs/grafana/latest/datasources/stackdriver"]
 [menu.docs]
 name = "Google Stackdriver"
 parent = "datasources"

docs/sources/features/panels/alertlist.md

@@ -2,7 +2,7 @@
 title = "Alert List"
 keywords = ["grafana", "alert list", "documentation", "panel", "alertlist"]
 type = "docs"
-aliases = ["/reference/alertlist/"]
+aliases = ["/docs/grafana/latest/reference/alertlist/"]
 [menu.docs]
 name = "Alert list"
 parent = "panels"

docs/sources/features/panels/dashlist.md

@@ -2,7 +2,7 @@
 title = "Dashboard List"
 keywords = ["grafana", "dashboard list", "documentation", "panel", "dashlist"]
 type = "docs"
-aliases = ["/reference/dashlist/"]
+aliases = ["/docs/grafana/latest/reference/dashlist/"]
 [menu.docs]
 name = "Dashboard list"
 parent = "panels"

docs/sources/features/panels/graph.md

@@ -2,7 +2,7 @@
 title = "Graph Panel"
 keywords = ["grafana", "graph panel", "documentation", "guide", "graph"]
 type = "docs"
-aliases = ["/reference/graph/"]
+aliases = ["/docs/grafana/latest/reference/graph/"]
 [menu.docs]
 name = "Graph"
 parent = "panels"

docs/sources/features/panels/logs.md

@@ -2,7 +2,7 @@
 title = "Logs Panel"
 keywords = ["grafana", "dashboard", "documentation", "panels", "logs panel"]
 type = "docs"
-aliases = ["/reference/logs/"]
+aliases = ["/docs/grafana/latest/reference/logs/"]
 [menu.docs]
 name = "Logs"
 parent = "panels"

docs/sources/features/panels/singlestat.md

@@ -2,7 +2,7 @@
 title = "Singlestat Panel"
 keywords = ["grafana", "dashboard", "documentation", "panels", "singlestat"]
 type = "docs"
-aliases = ["/reference/singlestat/"]
+aliases = ["/docs/grafana/latest/reference/singlestat/"]
 [menu.docs]
 name = "Singlestat"
 parent = "panels"

docs/sources/features/panels/table_panel.md

@@ -2,7 +2,7 @@
 title = "Table Panel"
 keywords = ["grafana", "dashboard", "documentation", "panels", "table panel"]
 type = "docs"
-aliases = ["/reference/table/"]
+aliases = ["/docs/grafana/latest/reference/table/"]
 [menu.docs]
 name = "Table"
 parent = "panels"

docs/sources/features/panels/text.md

@@ -2,7 +2,7 @@
 title = "Text"
 keywords = ["grafana", "text", "documentation", "panel"]
 type = "docs"
-aliases = ["/reference/alertlist/"]
+aliases = ["/docs/grafana/latest/reference/alertlist/"]
 [menu.docs]
 name = "Text"
 parent = "panels"

docs/sources/features/reporting.md

@@ -3,7 +3,7 @@ title = "Reporting"
 description = ""
 keywords = ["grafana", "reporting"]
 type = "docs"
-aliases = ["/administration/reports"]
+aliases = ["/docs/grafana/latest/administration/reports"]
 [menu.docs]
 parent = "features"
 weight = 8