Docs: Move files (#27983)

* moved datasources folder

* Update menu.yaml

* updated Azuremonitor

* Update azuremonitor.md

* Update cloudmonitoring.md

* Update cloudwatch.md

* updated content

* Update elasticsearch.md

* Update graphite.md

* Update elasticsearch.md

* Update azuremonitor.md

* Update cloudmonitoring.md

* Update influxdb.md

* Update jaeger.md

* Update loki.md

* Update mssql.md

* Update mysql.md

* Update opentsdb.md

* Update postgres.md

* Update prometheus.md

* Update postgres.md

* Update jaeger.md

* Update mysql.md

* Update mssql.md

* added aliases

* Update testdata.md

* Update zipkin.md

* link fixes

* link fixing

* moved files out of guides

* Delete archive.md

* updated links

* updated aliases

* updated aliases

* link updates

* Update _index.md

* deleted archive.md

* Update azuremonitor.md

* Update azuremonitor.md

docs/sources/_index.md

@@ -65,8 +65,8 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "guides/whats-new-in-v7-1.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v7.1</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v7-2.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v7.2</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
@@ -75,51 +75,51 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
 ## Data source guides
 
 <div class="nav-cards">
-    <a href="{{< relref "features/datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_graphite.svg" >
       <h5>Graphite</h5>
     </a>
-    <a href="{{< relref "features/datasources/elasticsearch.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/elasticsearch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_elasticsearch.svg" >
       <h5>Elasticsearch</h5>
     </a>
-    <a href="{{< relref "features/datasources/influxdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/influxdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_influxdb.svg" >
       <h5>InfluxDB</h5>
     </a>
-    <a href="{{< relref "features/datasources/prometheus.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/prometheus.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_prometheus.svg" >
       <h5>Prometheus</h5>
     </a>
-    <a href="{{< relref "features/datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudmonitoring.svg">
       <h5>Google Cloud Monitoring</h5>
     </a>
-    <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudwatch.svg">
       <h5>AWS CloudWatch</h5>
     </a>
-    <a href="{{< relref "features/datasources/azuremonitor.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/azuremonitor.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_azure_monitor.jpg">
       <h5>Azure Monitor</h5>
     </a>
-    <a href="{{< relref "features/datasources/loki.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/loki.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_loki.svg">
       <h5>Loki</h5>
     </a>
-    <a href="{{< relref "features/datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_mysql.png" >
       <h5>MySQL</h5>
     </a>
-    <a href="{{< relref "features/datasources/postgres.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/postgres.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_postgres.svg" >
       <h5>Postgres</h5>
     </a>
-    <a href="{{< relref "features/datasources/mssql.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/mssql.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/sql_server_logo.svg">
       <h5>Microsoft SQL Server</h5>
     </a>
-    <a href="{{< relref "features/datasources/opentsdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/opentsdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_opentsdb.png" >
       <h5>OpenTSDB</h5>
     </a>

docs/sources/archive.md

@@ -1,21 +0,0 @@
-+++
-title = "Docs Archive"
-keywords = ["grafana", "archive", "documentation", "guide"]
-type = "docs"
-[menu.docs]
-name = "Docs Archive"
-weight = 200
-+++
-
-# Docs Archive
-
-Here you can find links to older versions of the documentation that might be better suited for your version
-of Grafana.
-
-- [Latest](/docs/grafana/latest/)
-- [Version 4.5](/docs/grafana/v4.5)
-- [Version 4.4](/docs/grafana/v4.4)
-- [Version 4.3](/docs/grafana/v4.3)
-- [Version 4.2](/docs/grafana/v4.2)
-- [Version 4.1](/docs/grafana/v4.1)
-- [Version 3.1](/docs/grafana/v3.1)

docs/sources/best-practices/best-practices-for-creating-dashboards.md

@@ -47,7 +47,7 @@ Once you have a strategy or design guidelines, write them down to help maintain
   - Consider including your name or initials in the dashboard name or as a tag so that people know who owns the dashboard.
   - Remove temporary experiment dashboards when you are done with them.
 - If you create many related dashboards, think about how to cross-reference them for easy navigation. Refer to [Best practices for managing dashboards]({{< relref "best-practices-for-managing-dashboards.md" >}}) for more information.
-- Grafana retrieves data from a data source. A basic understanding of [data sources]({{< relref "../features/datasources/data-sources.md" >}}) in general and your specific is important.
+- Grafana retrieves data from a data source. A basic understanding of [data sources]({{< relref "../datasources/_index.md" >}}) in general and your specific is important.
 - Avoid unnecessary dashboard refreshing to reduce the load on the network or backend. For example, if your data changes every hour, then you don't need to set the dashboard refresh rate to 30 seconds.
 - Use the left and right Y-axes when displaying time series with different units or ranges. 
 -  Add documentation to dashboards and panels.

docs/sources/dashboards/annotations.md

@@ -70,10 +70,10 @@ to show.
 
 The annotation query options are different for each data source.
 
-- [Graphite annotation queries]({{< relref "../features/datasources/graphite.md#annotations" >}})
-- [Elasticsearch annotation queries]({{< relref "../features/datasources/elasticsearch.md#annotations" >}})
-- [InfluxDB annotation queries]({{< relref "../features/datasources/influxdb.md#annotations" >}})
-- [Prometheus annotation queries]({{< relref "../features/datasources/prometheus.md#annotations" >}})
-- [MySQL annotation queries]({{< relref "../features/datasources/mysql.md#annotations" >}})
-- [Postgres annotation queries]({{< relref "../features/datasources/postgres.md#annotations" >}})
-- [Loki annotation queries]({{< relref "../features/datasources/loki.md#annotations" >}})
+- [Graphite annotation queries]({{< relref "../datasources/graphite.md#annotations" >}})
+- [Elasticsearch annotation queries]({{< relref "../datasources/elasticsearch.md#annotations" >}})
+- [InfluxDB annotation queries]({{< relref "../datasources/influxdb.md#annotations" >}})
+- [Prometheus annotation queries]({{< relref "../datasources/prometheus.md#annotations" >}})
+- [MySQL annotation queries]({{< relref "../datasources/mysql.md#annotations" >}})
+- [Postgres annotation queries]({{< relref "../datasources/postgres.md#annotations" >}})
+- [Loki annotation queries]({{< relref "../datasources/loki.md#annotations" >}})

docs/sources/datasources/_index.md

@@ -1,15 +1,15 @@
 +++
-title = "Data Sources"
+title = "Data sources"
 type = "docs"
 aliases = ["/docs/grafana/latest/datasources/overview/"]
 [menu.docs]
-name = "Data Sources"
+name = "Data sources"
 identifier = "datasources"
 parent = "features"
-weight = 5
+weight = 50
 +++
 
-# Data Source Overview
+# Data sources
 
 Grafana supports many different storage backends for your time series data (data source). Each data source has a specific Query Editor that is customized for the features and capabilities that the particular data source exposes.
 
@@ -39,9 +39,9 @@ In addition to the data sources that you have configured in your Grafana, there
 
 - **Grafana -** A built-in data source that generates random walk data. Useful for testing visualizations and running experiments.
 - **Mixed -** Select this to query multiple data sources in the same panel. When this data source is selected, Grafana allows you to select a data source for every new query that you add.
-  * The first query will use the data source that was selected before you selected **Mixed**.
-  * You cannot change an existing query to use the Mixed Data Source.
-  * Grafana Play example: [Mixed data sources](https://play.grafana.org/d/000000100/mixed-datasources?orgId=1)
+  - The first query will use the data source that was selected before you selected **Mixed**.
+  - You cannot change an existing query to use the Mixed Data Source.
+  - Grafana Play example: [Mixed data sources](https://play.grafana.org/d/000000100/mixed-datasources?orgId=1)
 - **Dashboard -** Select this to use a result set from another panel in the same dashboard.
 
 ## Data source plugins

docs/sources/datasources/add-a-data-source.md

@@ -1,11 +1,12 @@
 +++
-title = "Add a data source"
+title = "Add data source"
 type = "docs"
+aliases = ["/docs/grafana/latest/features/datasources/add-a-data-source/"]
 [menu.docs]
 name = "Add a data source"
 identifier = "add_data_source"
 parent = "features"
-weight = 2
+weight = 100
 +++
 
 # Add a data source
@@ -26,6 +27,6 @@ Before you create your first dashboard, you need to add your data source. Follow
 
     {{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
 
-1. In the **Type**, select the type of data source. See [Supported data sources]({{< relref "../../features/datasources/#supported-data-sources/" >}}) for more information and how to configure your data source settings.
+1. In the **Type**, select the type of data source. See [Supported data sources]({{< relref "_index.md#supported-data-sources" >}}) for more information and how to configure your data source settings.
 
 1. Click **Save & Test**.

docs/sources/datasources/azuremonitor.md

@@ -1,13 +1,13 @@
 +++
-title = "Using Azure Monitor in Grafana"
+title = "Azure Monitor"
 description = "Guide for using Azure Monitor in Grafana"
 keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/azuremonitor"]
+aliases = ["/docs/grafana/latest/features/datasources/azuremonitor"]
 [menu.docs]
 name = "Azure Monitor"
 parent = "datasources"
-weight = 5
+weight = 300
 +++
 
 # Using Azure Monitor in Grafana
@@ -154,7 +154,7 @@ Examples:
 
 {{< docs-imagebox img="/img/docs/v60/azuremonitor-service-variables.png" class="docs-image--no-shadow" caption="Nested Azure Monitor Template Variables" >}}
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### List of supported Azure Monitor metrics
@@ -163,7 +163,7 @@ Not all metrics returned by the Azure Monitor API have values. To make it easier
 
 ### Azure Monitor alerting
 
-Grafana alerting is supported for the Azure Monitor service. This is not Azure Alerts support. For more information about Grafana alerting, refer to [how alerting in Grafana works]({{< relref "../../alerting/alerts-overview.md" >}}).
+Grafana alerting is supported for the Azure Monitor service. This is not Azure Alerts support. For more information about Grafana alerting, refer to [how alerting in Grafana works]({{< relref "../alerting/alerts-overview.md" >}}).
 
 {{< docs-imagebox img="/img/docs/v60/azuremonitor-alerting.png" class="docs-image--no-shadow" caption="Azure Monitor Alerting" >}}
 
@@ -208,8 +208,7 @@ Examples:
 
 Use the one of the following queries in the `Query` field in the Variable edit view.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
-types of template variables.
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 | Name                               | Description                                                  |
 | ---------------------------------- | ------------------------------------------------------------ |
@@ -226,7 +225,7 @@ Examples:
 
 ### Application Insights alerting
 
-Grafana alerting is supported for Application Insights. This is not Azure Alerts support. For more information about Grafana alerting, refer to [alerts overview]({{< relref "../../alerting/alerts-overview.md" >}}).
+Grafana alerting is supported for Application Insights. This is not Azure Alerts support. For more information about Grafana alerting, refer to [Alerts overview]({{< relref "../alerting/alerts-overview.md" >}}).
 
 {{< docs-imagebox img="/img/docs/v60/azuremonitor-alerting.png" class="docs-image--no-shadow" caption="Azure Monitor Alerting" >}}
 
@@ -289,7 +288,7 @@ The default display name format is:
 
 `metricName{dimensionName=dimensionValue,dimensionTwoName=DimensionTwoValue}`
 
-This can be customized by using the [display name field option]({{< relref "../../panels/field-options/_index.md#display-name" >}}).
+This can be customized by using the [display name field option]({{< relref "../panels/field-options/_index.md#display-name" >}}).
 
 ### Azure Log Analytics macros
 
@@ -317,13 +316,13 @@ To make writing queries easier there are several Grafana macros that can be used
 
 There are also some Grafana variables that can be used in Azure Log Analytics queries:
 
-- `$__interval` - Grafana calculates the minimum time grain that can be used to group by time in queries. For more information about `$__interval`, refer to [interval variables]({{< relref "../../variables/variable-types/_index.md#interval-variables" >}}). It returns a time grain like `5m` or `1h` that can be used in the bin function. E.g. `summarize count() by bin(TimeGenerated, $__interval)`
+- `$__interval` - Grafana calculates the minimum time grain that can be used to group by time in queries. For more information about `$__interval`, refer to [interval variables]({{< relref "../variables/variable-types/_index.md#interval-variables" >}}). It returns a time grain like `5m` or `1h` that can be used in the bin function. E.g. `summarize count() by bin(TimeGenerated, $__interval)`
 
 ### Templating with variables for Azure Log Analytics
 
 Any Log Analytics query that returns a list of values can be used in the `Query` field in the Variable edit view. There is also one Grafana function for Log Analytics that returns a list of workspaces.
 
-Refer to the [Variables]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Refer to the [Variables]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 | Name                                               | Description                                                                                            |
@@ -374,7 +373,7 @@ If you're not currently logged in to the Azure Portal, then the link opens the l
 
 > Only available in Grafana v7.0+.
 
-Grafana alerting is supported for Application Insights. This is not Azure Alerts support. Read more about how alerting in Grafana works in [Alerting rules]({{< relref "../../alerting/alerts-overview.md" >}}).
+Grafana alerting is supported for Application Insights. This is not Azure Alerts support. Read more about how alerting in Grafana works in [Alerting rules]({{< relref "../alerting/alerts-overview.md" >}}).
 
 ## Query the Application Insights Analytics service
 
@@ -384,7 +383,7 @@ If you change the service type to **Insights Analytics**, then a similar editor
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/cloudmonitoring.md

@@ -1,13 +1,13 @@
 +++
-title = "Using Google Cloud Monitoring in Grafana"
+title = "Cloud Monitoring"
 description = "Guide for using Google Cloud Monitoring in Grafana"
 keywords = ["grafana", "stackdriver", "google", "guide", "cloud", "monitoring"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/stackdriver", "/docs/grafana/latest/features/datasources/stackdriver/"]
+aliases = ["/docs/grafana/latest/features/datasources/stackdriver", "/docs/grafana/latest/features/datasources/cloudmonitoring/"]
 [menu.docs]
 name = "Google Cloud Monitoring"
 parent = "datasources"
-weight = 4
+weight = 200
 +++
 
 # Using Google Cloud Monitoring in Grafana
@@ -232,7 +232,7 @@ Instead of hard-coding things like server, application and sensor name in your m
 Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### Query Variable
@@ -265,7 +265,7 @@ Why two ways? The first syntax is easier to read and write but does not allow yo
 
 {{< docs-imagebox img="/img/docs/v71/cloudmonitoring_annotations_query_editor.png" max-width= "400px" class="docs-image--right" >}}
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Annotation rendering is expensive so it is important to limit the number of rows returned. There is no support for showing Google Cloud Monitoring annotations and events yet but it works well with [custom metrics](https://cloud.google.com/monitoring/custom-metrics/) in Google Cloud Monitoring.
 
 With the query editor for annotations, you can select a metric and filters. The `Title` and `Text` fields support templating and can use data returned from the query. For example, the Title field could have the following text:
@@ -287,7 +287,7 @@ Example Result: `monitoring.googleapis.com/uptime_check/http_status has this val
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here is a provisioning example using the JWT (Service Account key file) authentication type.
 

docs/sources/datasources/cloudwatch.md

@@ -8,7 +8,7 @@ aliases = ["/docs/grafana/latest/datasources/cloudwatch"]
 name = "AWS Cloudwatch"
 identifier = "cloudwatch"
 parent = "datasources"
-weight = 5
+weight = 200
 +++
 
 # Using AWS CloudWatch in Grafana
@@ -203,7 +203,7 @@ To the right of the query input field is a CloudWatch Logs Insights link that op
 ### Using template variables
 
 As with several other data sources, the CloudWatch data source supports the use of template variables in queries.
-See the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+See the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 ### Deep linking from Grafana panels to the CloudWatch console
 
@@ -214,7 +214,7 @@ If you're not currently logged in to the CloudWatch console, the link will forwa
 ### Alerting
 
 Since CloudWatch Logs queries can return numeric data, for example through the use of the `stats` command, alerts are supported.
-See the [Alerting]({{< relref "../../alerting/alerts-overview.md" >}}) documentation for more on Grafana alerts.
+See the [Alerting]({{< relref "../alerting/alerts-overview.md" >}}) documentation for more on Grafana alerts.
 
 ## Curated dashboards
 
@@ -236,7 +236,7 @@ To import the pre-configured dashboards, go to the configuration page of your Cl
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
 
-See the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+See the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 ### Query variable
 
@@ -368,7 +368,7 @@ Please see the AWS documentation for [Service Quotas](https://docs.aws.amazon.co
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/elasticsearch.md

@@ -1,13 +1,13 @@
 +++
-title = "Using Elasticsearch in Grafana"
+title = "Elasticsearch"
 description = "Guide for using Elasticsearch in Grafana"
 keywords = ["grafana", "elasticsearch", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/elasticsearch"]
+aliases = ["/docs/grafana/latest/features/datasources/elasticsearch"]
 [menu.docs]
 name = "Elasticsearch"
 parent = "datasources"
-weight = 3
+weight = 400
 +++
 
 # Using Elasticsearch in Grafana
@@ -84,7 +84,7 @@ number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 se
 > Only available in Grafana v6.3+.
 
 There are two parameters, `Message field name` and `Level field name`, that can optionally be configured from the data source settings page that determine
-which fields will be used for log messages and log levels when visualizing logs in [Explore]({{< relref "../../explore" >}}).
+which fields will be used for log messages and log levels when visualizing logs in [Explore]({{< relref "../explore" >}}).
 
 For example, if you're using a default setup of Filebeat for shipping logs to Elasticsearch the following configuration should work:
 
@@ -129,7 +129,7 @@ Instead of hard-coding things like server, application and sensor name in your m
 Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### Query variable
@@ -181,7 +181,7 @@ Example dashboard:
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Grafana can query any Elasticsearch index
 for annotation events.
 
@@ -197,7 +197,7 @@ for annotation events.
 
 > Only available in Grafana v6.3+.
 
-Querying and displaying log data from Elasticsearch is available in [Explore]({{< relref "../../explore" >}}), and in the [logs panel]({{< relref "../../panels/visualizations/logs-panel.md" >}}) in dashboards. 
+Querying and displaying log data from Elasticsearch is available in [Explore]({{< relref "../explore" >}}), and in the [logs panel]({{< relref "../panels/visualizations/logs-panel.md" >}}) in dashboards.
 Select the Elasticsearch data source, and then optionally enter a lucene query to display your logs.
 
 ### Log Queries
@@ -212,7 +212,7 @@ Optionally enter a lucene query into the query field to filter the log messages.
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/graphite.md

@@ -1,14 +1,14 @@
 +++
-title = "Using Graphite in Grafana"
+title = "Graphite"
 description = "Guide for using graphite in Grafana"
 keywords = ["grafana", "graphite", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/graphite"]
+aliases = ["/docs/grafana/latest/features/datasources/graphite"]
 [menu.docs]
 name = "Graphite"
 identifier = "graphite"
 parent = "datasources"
-weight = 1
+weight = 600
 +++
 
 # Using Graphite in Grafana
@@ -29,7 +29,7 @@ Name | The data source name. This is how you refer to the data source in panels
 Default | Default data source means that it will be pre-selected for new panels.
 URL | The HTTP protocol, IP, and port of your graphite-web or graphite-api install.
 Access | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
-Auth | Refer to [Authentication]({{< relref "../../auth/_index.md" >}}) for more information.
+Auth | Refer to [Authentication]({{< relref "../auth/_index.md" >}}) for more information.
 Basic Auth  | Enable basic authentication to the data source.
 User | User name for basic authentication.
 Password | Password for basic authentication.
@@ -125,7 +125,7 @@ Instead of hard-coding things like server, application, and sensor name in your
 Variables are shown as drop-down select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-For more information, refer to [Variables and templates]({{< relref "../../variables/_index.md" >}}).
+For more information, refer to [Variables and templates]({{< relref "../variables/_index.md" >}}).
 
 Graphite 1.1 introduced tags and Grafana added support for Graphite queries with tags in version 5.0. To create a variable using tag values, use the Grafana functions `tags` and `tag_values`.
 
@@ -191,11 +191,11 @@ Example of a tag expression with regex formatting and using the Equal Tilde oper
 server=~${servers:regex}
 ```
 
-For more information, refer to [Advanced variable format options]({{< relref "../../variables/advanced-variable-format-options.md" >}}).
+For more information, refer to [Advanced variable format options]({{< relref "../variables/advanced-variable-format-options.md" >}}).
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view.
 
 Graphite supports two ways to query annotations. A regular metric query, for this you use the `Graphite query` textbox. A Graphite events query, use the `Graphite event tags` textbox,
@@ -203,11 +203,11 @@ specify a tag or wildcard (leave empty should also work)
 
 ## Get Grafana metrics into Graphite
 
-Grafana exposes metrics for Graphite on the `/metrics` endpoint. For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../../administration/metrics.md">}}).
+Grafana exposes metrics for Graphite on the `/metrics` endpoint. For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../administration/metrics.md">}}).
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/influxdb.md

@@ -1,13 +1,13 @@
 +++
-title = "Using InfluxDB in Grafana"
+title = "InfluxDB"
 description = "Guide for using InfluxDB in Grafana"
 keywords = ["grafana", "influxdb", "guide", "flux"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/influxdb"]
+aliases = ["/docs/grafana/latest/features/datasources/influxdb"]
 [menu.docs]
 name = "InfluxDB"
 parent = "datasources"
-weight = 2
+weight = 700
 +++
 
 # Using InfluxDB in Grafana
@@ -180,7 +180,7 @@ You can view the interpolated version of a query with the Query Inspector.
 
 > Only available in Grafana v6.3+.
 
-Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../../explore" >}}), and in the [logs panel]({{< relref "../../panels/visualizations/logs-panel.md" >}}) in dashboards. 
+Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../explore" >}}), and in the [logs panel]({{< relref "../panels/visualizations/logs-panel.md" >}}) in dashboards. 
 Select the InfluxDB data source, and then enter a query to display your logs.
 
 ### Log Queries
@@ -199,7 +199,7 @@ Instead of hard-coding things like server, application and sensor name in your m
 Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### Query variable
@@ -258,7 +258,7 @@ be applied to all your InfluxDB queries.
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allows you to overlay rich event information on top of graphs. Add annotation queries using the Annotations view in the Dashboard menu.
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allows you to overlay rich event information on top of graphs. Add annotation queries using the Annotations view in the Dashboard menu.
 
 An example query:
 
@@ -270,7 +270,7 @@ For InfluxDB, you need to enter a query like the one in the example above. The `
 
 ## Configure the data source with provisioning
 
-You can now configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}}).
+You can now configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}}).
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/jaeger.md

@@ -1,19 +1,19 @@
 +++
-title = "Using Jaeger in Grafana"
+title = "Jaeger"
 description = "Guide for using Jaeger in Grafana"
 keywords = ["grafana", "jaeger", "guide", "tracing"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/jeager"]
+aliases = ["/docs/grafana/latest/features/datasources/jaeger"]
 [menu.docs]
 name = "Jaeger"
 parent = "datasources"
-weight = 2
+weight = 800
 +++
 
 # Jaeger data source
 
 Grafana ships with built-in support for Jaeger, which provides open source, end-to-end distributed tracing.
-Just add it as a data source and you are ready to query your traces in [Explore]({{< relref "../../explore/index.md" >}}).
+Just add it as a data source and you are ready to query your traces in [Explore]({{< relref "../explore/index.md" >}}).
 
 ## Adding the data source
 To access Jaeger settings, click the **Configuration** (gear) icon, then click **Data Sources**, and then click **Jaeger**.
@@ -30,7 +30,7 @@ To access Jaeger settings, click the **Configuration** (gear) icon, then click *
 
 ## Query traces
 
-You can query and display traces from Jaeger via [Explore]({{< relref "../../explore/index.md" >}}).
+You can query and display traces from Jaeger via [Explore]({{< relref "../explore/index.md" >}}).
 
 {{< docs-imagebox img="/img/docs/v70/jaeger-query-editor.png" class="docs-image--no-shadow" caption="Screenshot of the Jaeger query editor" >}}
 
@@ -40,7 +40,7 @@ The Jaeger query editor allows you to query by trace ID directly or selecting a
 
 Use the trace selector to pick particular trace from all traces logged in the time range you have selected in Explore. The trace selector has three levels of nesting:
 1. The service you are interested in.
-1. Particular operation is part of the selected service
+1. Particular operation is part of the selected service.
 1. Specific trace in which the selected operation occurred, represented by the root operation name and trace duration.
 
 ## Linking Trace ID from logs

docs/sources/datasources/loki.md

@@ -1,13 +1,13 @@
 +++
-title = "Using Loki in Grafana"
+title = "Loki"
 description = "Guide for using Loki in Grafana"
 keywords = ["grafana", "loki", "logging", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/loki"]
+aliases = ["/docs/grafana/latest/features/datasources/loki"]
 [menu.docs]
 name = "Loki"
 parent = "datasources"
-weight = 6
+weight = 800
 +++
 
 # Using Loki in Grafana
@@ -18,7 +18,7 @@ weight = 6
 > Viewing Loki data in dashboard panels is supported in Grafana v6.4+.
 
 Grafana ships with built-in support for Loki, Grafana's log aggregation system.
-Just add it as a data source and you are ready to query your log data in [Explore]({{< relref "../../explore" >}}).
+Just add it as a data source and you are ready to query your log data in [Explore]({{< relref "../explore" >}}).
 
 ## Adding the data source
 
@@ -60,7 +60,7 @@ The new field with the link shown in log details:
 
 ## Querying Logs
 
-Querying and displaying log data from Loki is available via [Explore]({{< relref "../../explore" >}}), and with the [logs panel]({{< relref "../../panels/visualizations/logs-panel.md" >}}) in dashboards. Select the Loki data source, and then enter a [LogQL](https://grafana.com/docs/loki/latest/logql/) query to display your logs.
+Querying and displaying log data from Loki is available via [Explore]({{< relref "../explore" >}}), and with the [logs panel]({{< relref "../panels/visualizations/logs-panel.md" >}}) in dashboards. Select the Loki data source, and then enter a [LogQL](https://grafana.com/docs/loki/latest/logql/) query to display your logs.
 
 ### Log Queries
 
@@ -128,7 +128,7 @@ The following filter types are currently supported:
 
 ## Live tailing
 
-Loki supports Live tailing which displays logs in real-time. This feature is supported in [Explore]({{< relref "../../explore/#loki-specific-features" >}}).
+Loki supports Live tailing which displays logs in real-time. This feature is supported in [Explore]({{< relref "../explore/#loki-specific-features" >}}).
 
 Note that Live Tailing relies on two Websocket connections: one between the browser and the Grafana server, and another between the Grafana server and the Loki server. If you run any reverse proxies, please configure them accordingly. The following example for Apache2 can be used for proxying between the browser and the Grafana server:
 ```
@@ -149,7 +149,7 @@ log message you're interested in.
 
 Instead of hard-coding things like server, application and sensor name in your metric queries, you can use variables in their place. Variables are shown as drop-down select boxes at the top of the dashboard. These drop-down boxes make it easy to change the data being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 ## Annotations
 
@@ -160,7 +160,7 @@ You can use any non-metric Loki query as a source for annotations. Log content w
 ## Configure the data source with provisioning
 
 You can set up the data source via config files with Grafana's provisioning system.
-You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here is an example:
 

docs/sources/datasources/mssql.md

@@ -1,12 +1,13 @@
 +++
-title = "Using Microsoft SQL Server in Grafana"
+title = "Microsoft SQL Server"
 description = "Guide for using Microsoft SQL Server in Grafana"
 keywords = ["grafana", "MSSQL", "Microsoft", "SQL", "guide", "Azure SQL Database"]
 type = "docs"
+aliases = ["/docs/grafana/latest/features/datasources/mssql/"]
 [menu.docs]
 name = "Microsoft SQL Server"
 parent = "datasources"
-weight = 8
+weight = 900
 +++
 
 # Using Microsoft SQL Server in Grafana
@@ -39,7 +40,7 @@ Name | Description
 
 ### Min time interval
 
-A lower limit for the [$__interval]({{< relref "../../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
+A lower limit for the [$__interval]({{< relref "../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
 Recommended to be set to write frequency, for example `1m` if your data is written every minute.
 This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formatted as a
 number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 seconds). The following time identifiers are supported:
@@ -300,7 +301,7 @@ Any series lacking a value in a 3 minute window will have a value of zero which
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 ### Query Variable
 
@@ -370,11 +371,11 @@ Grafana automatically creates a quoted, comma-separated string for multi-value v
 
 `${servers:csv}`
 
-Read more about variable formatting options in the [Variables]({{< relref "../../variables/variable-types/_index.md#advanced-formatting-options" >}}) documentation.
+Read more about variable formatting options in the [Variables]({{< relref "../variables/variable-types/_index.md#advanced-formatting-options" >}}) documentation.
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Columns:**
 
@@ -597,7 +598,7 @@ conditions.
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/mysql.md

@@ -1,22 +1,20 @@
 +++
-title = "Using MySQL in Grafana"
+title = "MySQL"
 description = "Guide for using MySQL in Grafana"
 keywords = ["grafana", "mysql", "guide"]
 type = "docs"
+aliases = ["/docs/grafana/latest/features/datasources/mysql/"]
 [menu.docs]
 name = "MySQL"
 parent = "datasources"
-weight = 7
+weight = 1000
 +++
 
 # Using MySQL in Grafana
 
-> Only available in Grafana v4.3+.
->
 > Starting from Grafana v5.1 you can name the time column *time* in addition to earlier supported *time_sec*. Usage of *time_sec*  will eventually be deprecated.
 
-Grafana ships with a built-in MySQL data source plugin that allows you to query and visualize
-data from a MySQL compatible database.
+Grafana ships with a built-in MySQL data source plugin that allows you to query and visualize data from a MySQL compatible database.
 
 ## Adding the data source
 
@@ -41,7 +39,7 @@ Name | Description
 
 ### Min time interval
 
-A lower limit for the [$__interval]({{< relref "../../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
+A lower limit for the [$__interval]({{< relref "../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
 Recommended to be set to write frequency, for example `1m` if your data is written every minute.
 This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formatted as a
 number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 seconds). The following time identifiers are supported:
@@ -238,7 +236,7 @@ This feature is currently available in the nightly builds and will be included i
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
 ### Query Variable
 
@@ -331,11 +329,11 @@ Grafana automatically creates a quoted, comma-separated string for multi-value v
 
 `${servers:csv}`
 
-Read more about variable formatting options in the [Variables]({{< relref "../../variables/_index.md#advanced-formatting-options" >}}) documentation.
+Read more about variable formatting options in the [Variables]({{< relref "../variables/_index.md#advanced-formatting-options" >}}) documentation.
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Example query using time column with epoch values:**
 
@@ -392,7 +390,7 @@ Time series queries should work in alerting conditions. Table formatted queries
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/opentsdb.md

@@ -1,13 +1,13 @@
 +++
-title = "Using OpenTSDB in Grafana"
+title = "OpenTSDB"
 description = "Guide for using OpenTSDB in Grafana"
 keywords = ["grafana", "opentsdb", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/opentsdb",	"/docs/grafana/latest/features/opentsdb"]
+aliases = ["/docs/grafana/latest/features/opentsdb", "/docs/grafana/latest/features/datasources/opentsdb/"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"
-weight = 19
+weight = 1100
 +++
 
 # Using OpenTSDB in Grafana
@@ -53,7 +53,7 @@ Instead of hard-coding things like server, application and sensor name in your m
 Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### Query variable
@@ -90,7 +90,7 @@ For details on OpenTSDB metric queries, check out the official [OpenTSDB documen
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/postgres.md

@@ -1,12 +1,13 @@
 +++
-title = "Using PostgreSQL in Grafana"
+title = "PostgreSQL"
 description = "Guide for using PostgreSQL in Grafana"
 keywords = ["grafana", "postgresql", "guide"]
 type = "docs"
+aliases = ["/docs/grafana/latest/features/datasources/postgres/"]
 [menu.docs]
 name = "PostgreSQL"
 parent = "datasources"
-weight = 7
+weight = 1200
 +++
 
 # Using PostgreSQL in Grafana
@@ -39,7 +40,7 @@ Name | Description
 
 ### Min time interval
 
-A lower limit for the [$__interval]({{< relref "../../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
+A lower limit for the [$__interval]({{< relref "../variables/variable-types/_index.md#the-interval-variable" >}}) and [$__interval_ms]({{< relref "../variables/variable-types/_index.md#the-interval-ms-variable" >}}) variables.
 Recommended to be set to write frequency, for example `1m` if your data is written every minute.
 This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formatted as a
 number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 seconds). The following time identifiers are supported:
@@ -240,7 +241,7 @@ ORDER BY time
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
 
-Refer to [Templates and variables]({{< relref "../../variables/_index.md" >}}) for an introduction to the templating feature and the different types of template variables.
+Refer to [Templates and variables]({{< relref "../variables/_index.md" >}}) for an introduction to the templating feature and the different types of template variables.
 
 ### Query variable
 
@@ -331,11 +332,11 @@ Grafana automatically creates a quoted, comma-separated string for multi-value v
 
 `${servers:csv}`
 
-Read more about variable formatting options in the [Variables]({{< relref "../../variables/_index.md#advanced-formatting-options" >}}) documentation.
+Read more about variable formatting options in the [Variables]({{< relref "../variables/_index.md#advanced-formatting-options" >}}) documentation.
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Example query using time column with epoch values:**
 
@@ -393,7 +394,7 @@ conditions.
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source.
 

docs/sources/datasources/prometheus.md

@@ -1,13 +1,13 @@
 +++
-title = "Using Prometheus in Grafana"
+title = "Prometheus"
 description = "Guide for using Prometheus in Grafana"
 keywords = ["grafana", "prometheus", "guide"]
 type = "docs"
-aliases = ["/docs/grafana/latest/datasources/prometheus"]
+aliases = ["/docs/grafana/latest/features/datasources/prometheus"]
 [menu.docs]
 name = "Prometheus"
 parent = "datasources"
-weight = 1
+weight = 1300
 +++
 
 # Prometheus data source
@@ -60,7 +60,7 @@ Open a graph in edit mode by clicking the title > Edit (or by pressing `e` key w
 The Prometheus data source allows you to run "instant" queries, which query only the latest value.
 You can visualize the results in a table panel to see all available labels of a timeseries.
 
-Instant query results are made up only of one data point per series but can be shown in the graph panel with the help of [series overrides]({{< relref "../../panels/visualizations/graph-panel.md#series-overrides" >}}).
+Instant query results are made up only of one data point per series but can be shown in the graph panel with the help of [series overrides]({{< relref "../panels/visualizations/graph-panel.md#series-overrides" >}}).
 To show them in the graph as a latest value point, add a series override and select `Points > true`.
 To show a horizontal line across the whole graph, add a series override and select `Transform > constant`.
 
@@ -80,7 +80,7 @@ Instead of hard-coding things like server, application and sensor name in your m
 Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data
 being displayed in your dashboard.
 
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
 types of template variables.
 
 ### Query variable
@@ -102,7 +102,7 @@ For details of what _metric names_, _label names_ and _label values_ are please
 
 > Support for `$__range`, `$__range_s` and `$__range_ms` only available from Grafana v5.3
 
-You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`, see [Global built-in variables]({{< relref "../../variables/variable-types/global-variables.md" >}}) for more information. These can be convenient to use in conjunction with the `query_result` function when you need to filter variable queries since
+You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`, see [Global built-in variables]({{< relref "../variables/variable-types/global-variables.md" >}}) for more information. These can be convenient to use in conjunction with the `query_result` function when you need to filter variable queries since
 
 `label_values` function doesn't support queries.
 
@@ -142,7 +142,7 @@ options are enabled, Grafana converts the labels from plain text to a regex comp
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view.
 
 Prometheus supports two ways to query annotations.
@@ -156,11 +156,11 @@ The step option is useful to limit the number of events returned from your query
 
 Grafana exposes metrics for Prometheus on the `/metrics` endpoint. We also bundle a dashboard within Grafana so you can get started viewing your metrics faster. You can import the bundled dashboard by going to the data source edit page and click the dashboard tab. There you can find a dashboard for Grafana and one for Prometheus. Import and start viewing all the metrics!
 
-For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../../administration/metrics.md">}}).
+For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../administration/metrics.md">}}).
 
 ## Provision the Prometheus data source
 
-You can configure data sources using config files with Grafana's provisioning system. Read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+You can configure data sources using config files with Grafana's provisioning system. Read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
 
 Here are some provisioning examples for this data source:
 

docs/sources/datasources/testdata.md

@@ -2,13 +2,13 @@
 title = "TestData"
 keywords = ["grafana", "dashboard", "documentation", "panels", "testdata"]
 type = "docs"
+aliases = ["/docs/grafana/latest/features/datasources/testdata"]
 [menu.docs]
 name = "TestData"
 parent = "datasources"
-weight = 20
+weight = 1400
 +++
 
-
 # Grafana TestData DB
 
 The purpose of this data source is to make it easier to create fake data for any panel.

docs/sources/datasources/zipkin.md

@@ -1,5 +1,5 @@
 +++
-title = "Using Zipkin in Grafana"
+title = "Zipkin"
 description = "Guide for using Zipkin in Grafana"
 keywords = ["grafana", "zipkin", "guide", "tracing"]
 type = "docs"
@@ -7,13 +7,13 @@ aliases = ["/docs/grafana/latest/datasources/zipkin"]
 [menu.docs]
 name = "Zipkin"
 parent = "datasources"
-weight = 2
+weight = 1500
 +++
 
 # Zipkin data source
 
 Grafana ships with built-in support for Zipkin, an open source, distributed tracing system.
-Just add it as a data source and you are ready to query your traces in [Explore]({{< relref "../../explore" >}}).
+Just add it as a data source and you are ready to query your traces in [Explore]({{< relref "../explore" >}}).
 
 ## Adding the data source
 To access Zipkin settings, click the **Configuration** (gear) icon, then click **Data Sources**, and then click **Zipkin**.
@@ -30,7 +30,7 @@ To access Zipkin settings, click the **Configuration** (gear) icon, then click *
 
 ## Query traces
 
-Querying and displaying traces from Zipkin is available via [Explore]({{< relref "../../explore" >}}).
+Querying and displaying traces from Zipkin is available via [Explore]({{< relref "../explore" >}}).
 
 {{< docs-imagebox img="/img/docs/v70/zipkin-query-editor.png" class="docs-image--no-shadow" caption="Screenshot of the Zipkin query editor" >}}
 

docs/sources/explore/index.md

@@ -145,9 +145,9 @@ Click on the filter button <span title="Filter for label" class="logs-label__ico
 
 Along with metrics, Explore allows you to investigate your logs with the following data sources:
 
-- [Loki](../features/datasources/loki)
-- [InfluxDB](../features/datasources/influxdb)
-- [Elasticsearch](../features/datasources/elasticsearch)
+- [Loki](../datasources/loki)
+- [InfluxDB](../datasources/influxdb)
+- [Elasticsearch](../datasources/elasticsearch)
 
 ### Visualization options
 
@@ -193,7 +193,7 @@ If your logs are structured in `json` or `logfmt`, then you can show or hide par
 
 As mentioned, one of the log integrations is for the new open source log aggregation system from Grafana Labs - [Loki](https://github.com/grafana/loki). Loki is designed to be very cost effective, as it does not index the contents of the logs, but rather a set of labels for each log stream. The logs from Loki are queried in a similar way to querying with label selectors in Prometheus. It uses labels to group log streams which can be made to match up with your Prometheus labels. For more information about Grafana Loki, refer to [Grafana Loki](https://github.com/grafana/loki) or the Grafana Labs hosted variant: [Grafana Cloud Logs](https://grafana.com/loki).
 
-See [Loki's data source documentation](../features/datasources/loki) on how to query for log data.
+See [Loki's data source documentation](../datasources/loki) on how to query for log data.
 
 #### Switch from metrics to logs
 
@@ -223,8 +223,8 @@ While in Live tail view new logs will come from the bottom of the screen and wil
 
 You can visualize traces from tracing data sources in explore. Data sources currently supported:
 
-- [Jaeger]({{< relref "../features/datasources/jaeger.md" >}})
-- [Zipkin]({{< relref "../features/datasources/zipkin.md" >}})
+- [Jaeger]({{< relref "../datasources/jaeger.md" >}})
+- [Zipkin]({{< relref "../datasources/zipkin.md" >}})
 
 For information about how to use the query editor see documentation for specific data source.
 

docs/sources/features/_index.md

@@ -1,13 +0,0 @@
-+++
-title = "Features"
-description = "List of features"
-type = "docs"
-[menu.docs]
-name = "Features"
-identifier = "features"
-weight = 4
-+++
-
-# Grafana features
-
-This section contains pages that describe Grafana features.

docs/sources/features/datasources/data-sources.md

@@ -1,22 +0,0 @@
-+++
-title = "Data sources overview"
-description = "Overview of data sources in Grafana"
-keywords = ["grafana", "data sources"]
-type = "docs"
-[menu.docs]
-name = "Data sources overview"
-parent = "datasources"
-weight = 1
-+++
-
-# Data sources
-
-Grafana can visualize, explore, and alert on data from many different databases and cloud services. Each database or service type is accessed from a *data source*. Before you can create visualizations in Grafana, you must [add a data source]({{< relref "add-a-data-source.md" >}}).
-
-Each data source has a specific query editor that is customized for the features and capabilities that the particular data source exposes. The query language and capabilities of each data source are obviously very different. You can combine data from multiple data sources into a single dashboard, but each panel is connected to a specific data source that belongs to a particular organization.
-
-Use the query editor to build one or more queries in your time series database. The panel instantly updates, allowing you to effectively explore your data in real time and build a perfect query for that particular panel.
-
-You can use [template variables]({{< relref "../../variables/_index.md" >}}) in the query editor within the queries themselves. This provides a powerful way to explore data dynamically based on the templating variables selected on the dashboard.
-
-Grafana allows you to reference queries in the query editor by the row that they’re on. If you add a second query to graph, you can reference the first query by typing in #A. This provides an easy and convenient way to build compound queries.

docs/sources/getting-started/getting-started.md

@@ -43,12 +43,12 @@ Different user types will have different interests. Some suggestions are listed
 
 All users might want to learn about:
 
-- [Panels]({{< relref "../panels/panels-overview.md" >}})
-- [Dashboards]({{< relref "../dashboards/_index.md" >}})
-- [Data sources]({{< relref "../features/datasources/data-sources.md" >}}) and [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}})
-- [Keyboard shortcuts]({{< relref "../dashboards/shortcuts.md" >}})
-- [Explore workflow]({{< relref "../explore/index.md" >}})
-- [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)
+* [Panels]({{< relref "../panels/panels-overview.md" >}})
+* [Dashboards]({{< relref "../dashboards/_index.md" >}})
+* [Data sources]({{< relref "../datasources/_index.md" >}}) and [Add a data source]({{< relref "../datasources/add-a-data-source.md" >}})
+* [Keyboard shortcuts]({{< relref "../dashboards/shortcuts.md" >}})
+* [Explore workflow]({{< relref "../explore/index.md" >}})
+* [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)
 
 ### Admins
 

docs/sources/guides/_index.md

@@ -1,12 +0,0 @@
-+++
-title = "Guides"
-type = "docs"
-[menu.docs]
-name = "Getting Started"
-identifier = "guides"
-weight = 3
-+++
-
-# Guides
-
-This section contains guides to help you use Grafana.

docs/sources/installation/upgrading.md

@@ -240,7 +240,7 @@ change the `[security]` setting `cookie_secure` to `true` and use HTTPS when `co
 
 ### PhantomJS removed
 
-PhantomJS was deprecated in [Grafana v6.4]({{< relref "../guides/whats-new-in-v6-4.md#phantomjs-deprecation" >}}) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
+PhantomJS was deprecated in [Grafana v6.4]({{< relref "../whatsnew/whats-new-in-v6-4.md#phantomjs-deprecation" >}}) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
 ### Dashboard minimum refresh interval enforced
 

docs/sources/menu.yaml

@@ -126,39 +126,39 @@
     - link: /manage-users/add-or-remove-user-from-team/
       name: Add or remove user from team
 - name: Data sources
-  link: /features/datasources/
+  link: /datasources/
   children:
-    - link: /features/datasources/add-a-data-source/
+    - link: /datasources/add-a-data-source/
       name: Add data source
-    - link: /features/datasources/cloudwatch/
+    - link: /datasources/cloudwatch/
       name: AWS Cloudwatch
-    - link: /features/datasources/azuremonitor/
+    - link: /datasources/azuremonitor/
       name: Azure Monitor
-    - link: /features/datasources/elasticsearch/
+    - link: /datasources/elasticsearch/
       name: Elasticsearch
-    - link: /features/datasources/cloudmonitoring/
+    - link: /datasources/cloudmonitoring/
       name: Google Cloud Monitoring
-    - link: /features/datasources/graphite/
+    - link: /datasources/graphite/
       name: Graphite
-    - link: /features/datasources/influxdb/
+    - link: /datasources/influxdb/
       name: InfluxDB
-    - link: /features/datasources/jaeger/
+    - link: /datasources/jaeger/
       name: Jaeger
-    - link: /features/datasources/loki/
+    - link: /datasources/loki/
       name: Loki
-    - link: /features/datasources/mssql/
+    - link: /datasources/mssql/
       name: Microsoft SQL Server
-    - link: /features/datasources/mysql/
+    - link: /datasources/mysql/
       name: MySQL
-    - link: /features/datasources/opentsdb/
+    - link: /datasources/opentsdb/
       name: OpenTSDB
-    - link: /features/datasources/postgres/
+    - link: /datasources/postgres/
       name: PostgreSQL
-    - link: /features/datasources/prometheus/
+    - link: /datasources/prometheus/
       name: Prometheus
-    - link: /features/datasources/testdata/
+    - link: /datasources/testdata/
       name: TestData DB
-    - link: /features/datasources/zipkin/
+    - link: /datasources/zipkin/
       name: Zipkin
 - name: Panels
   link: /panels/
@@ -338,58 +338,58 @@
   link: /whatsnew/
   children:
     - name: Version 7.2
-      link: /guides/whats-new-in-v7-2/
+      link: /whatsnew/whats-new-in-v7-2/
     - name: Version 7.1
-      link: /guides/whats-new-in-v7-1/
+      link: /whatsnew/whats-new-in-v7-1/
     - name: Version 7.0
-      link: /guides/whats-new-in-v7-0/
+      link: /whatsnew/whats-new-in-v7-0/
     - name: Version 6.7
-      link: /guides/whats-new-in-v6-7/
+      link: /whatsnew/whats-new-in-v6-7/
     - name: Version 6.6
-      link: /guides/whats-new-in-v6-6/
+      link: /whatsnew/whats-new-in-v6-6/
     - name: Version 6.5
-      link: /guides/whats-new-in-v6-5/
+      link: /whatsnew/whats-new-in-v6-5/
     - name: Version 6.4
-      link: /guides/whats-new-in-v6-4/
+      link: /whatsnew/whats-new-in-v6-4/
     - name: Version 6.3
-      link: /guides/whats-new-in-v6-3/
+      link: /whatsnew/whats-new-in-v6-3/
     - name: Version 6.2
-      link: /guides/whats-new-in-v6-2/
+      link: /whatsnew/whats-new-in-v6-2/
     - name: Version 6.1
-      link: /guides/whats-new-in-v6-1/
+      link: /whatsnew/whats-new-in-v6-1/
     - name: Version 6.0
-      link: /guides/whats-new-in-v6-0/
+      link: /whatsnew/whats-new-in-v6-0/
     - name: Old versions
       link: /whatsnew/
       children:
         - name: Version 5.4
-          link: /guides/whats-new-in-v5-4/
+          link: /whatsnew/whats-new-in-v5-4/
         - name: Version 5.3
-          link: /guides/whats-new-in-v5-3/
+          link: /whatsnew/whats-new-in-v5-3/
         - name: Version 5.2
-          link: /guides/whats-new-in-v5-2/
+          link: /whatsnew/whats-new-in-v5-2/
         - name: Version 5.1
-          link: /guides/whats-new-in-v5-1/
+          link: /whatsnew/whats-new-in-v5-1/
         - name: Version 5.0
-          link: /guides/whats-new-in-v5/
+          link: /whatsnew/whats-new-in-v5/
         - name: Version 4.6
-          link: /guides/whats-new-in-v4-6/
+          link: /whatsnew/whats-new-in-v4-6/
         - name: Version 4.5
-          link: /guides/whats-new-in-v4-5/
+          link: /whatsnew/whats-new-in-v4-5/
         - name: Version 4.4
-          link: /guides/whats-new-in-v4-4/
+          link: /whatsnew/whats-new-in-v4-4/
         - name: Version 4.3
-          link: /guides/whats-new-in-v4-3/
+          link: /whatsnew/whats-new-in-v4-3/
         - name: Version 4.2
-          link: /guides/whats-new-in-v4-2/
+          link: /whatsnew/whats-new-in-v4-2/
         - name: Version 4.1
-          link: /guides/whats-new-in-v4-1/
+          link: /whatsnew/whats-new-in-v4-1/
         - name: Version 4.0
-          link: /guides/whats-new-in-v4/
+          link: /whatsnew/whats-new-in-v4/
         - name: Version 3.1
-          link: /guides/whats-new-in-v3-1/
+          link: /whatsnew/whats-new-in-v3-1/
         - name: Version 3.0
-          link: /guides/whats-new-in-v3/
+          link: /whatsnew/whats-new-in-v3/
 - name: Grafana Enterprise
   link: /enterprise/
   children:
@@ -551,5 +551,3 @@
       link: /developers/contribute/
     - name: Contributor License Agreement (CLA)
       link: /developers/cla/
-- name: Docs Archive
-  link: /archive/

docs/sources/panels/add-a-panel.md

@@ -37,8 +37,8 @@ While not required, we recommend that you add a helpful title and description to
 
 Each panel needs at least one query to display a visualization. You write queries in the Query tab of the panel editor. For more information about the Query tab, refer to [Queries]({{< relref "queries.md" >}}).
 
-1. Choose a data source. In the first line of the Query tab, click the drop-down list to see all available data sources. This list includes all data sources you added. Refer to [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}}) if you need instructions.
-1. Write or construct a query in the query language of your data source. Options will vary. Refer to your specific [data source documentation]({{< relref "../features/datasources/_index.md" >}}) for specific guidelines.
+1. Choose a data source. In the first line of the Query tab, click the drop-down list to see all available data sources. This list includes all data sources you added. Refer to [Add a data source]({{< relref "../datasources/add-a-data-source.md" >}}) if you need instructions.
+1. Write or construct a query in the query language of your data source. Options will vary. Refer to your specific [data source documentation]({{< relref "../datasources/_index.md" >}}) for specific guidelines.
 
 ## 4. Choose a visualization type
 

docs/sources/panels/panels-overview.md

@@ -14,7 +14,7 @@ The *panel* is the basic visualization building block in Grafana. Each panel has
 
 With the exception of a few special use panels, a panel is a visual representation of one or more queries. The queries display data over time. This can range from temperature fluctuations to current server status to a list of logs or alerts.
 
-In order to display data, you need to have at least one data source added to Grafana. Refer to [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}}) for instructions, or see our [Getting started]({{< relref "../getting-started/getting-started.md" >}}) guide if you want to make your first dashboard and panel using our TestData DB data source.
+In order to display data, you need to have at least one data source added to Grafana. Refer to [Add a data source]({{< relref "../datasources/add-a-data-source.md" >}}) for instructions, or see our [Getting started]({{< relref "../getting-started/getting-started.md" >}}) guide if you want to make your first dashboard and panel using our TestData DB data source.
 
 There are a wide variety of styling and formatting options for each panel. Panels can be dragged and dropped and rearranged on the dashboard. They can also be resized.
 

docs/sources/panels/queries.md

@@ -43,7 +43,7 @@ SELECT hostname FROM host  WHERE region IN($region)
 query_result(max_over_time(<metric>[${__range_s}s]) != <state>)
 ```
 
-For more information about writing a query for your data source, refer to the specific [Grafana data source]({{< relref "../features/datasources/_index.md" >}}) documentation.
+For more information about writing a query for your data source, refer to the specific [Grafana data source]({{< relref "../datasources/_index.md" >}}) documentation.
 
 ## Query tab UI
 
@@ -58,7 +58,7 @@ The Query tab consists of the following elements:
 
 ### Data source selector
 
-The data source selector is a drop-down list. Click it to select a data source you have added. When you create a panel, Grafana automatically selects your default data source. For more information about adding data sources, refer to [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}}).
+The data source selector is a drop-down list. Click it to select a data source you have added. When you create a panel, Grafana automatically selects your default data source. For more information about adding data sources, refer to [Add a data source]({{< relref "../datasources/add-a-data-source.md" >}}).
 
 {{< docs-imagebox img="/img/docs/queries/data-source-selector-7-0.png" class="docs-image--no-shadow" max-width="250px" >}}
 

docs/sources/variables/variable-types/add-ad-hoc-filters.md

@@ -28,7 +28,7 @@ _Ad hoc filters_ allow you to add key/value filters that are automatically added
 
 ## Enter Options
 
-1. In the **Data source** list, select the target data source. For more information about data sources, refer to [Add a data source]({{< relref "../../features/datasources/add-a-data-source.md" >}}).
+1. In the **Data source** list, select the target data source. For more information about data sources, refer to [Add a data source]({{< relref "../../datasources/add-a-data-source.md" >}}).
 1. Click **Add** to add the variable to the dashboard.
 
 ## Create ad hoc filters

docs/sources/variables/variable-types/add-data-source-variable.md

@@ -26,7 +26,7 @@ _Data source_ variables allow you to quickly change the data source for an entir
 
 ## Enter Data source options
 
-1. In the **Type** list, select the target data source for the variable. For more information about data sources, refer to [Add a data source]({{< relref "../../features/datasources/add-a-data-source.md" >}}).
+1. In the **Type** list, select the target data source for the variable. For more information about data sources, refer to [Add a data source]({{< relref "../../datasources/add-a-data-source.md" >}}).
 1. (optional) In **Instance name filter**, enter a regex filter for which data source instances to choose from in the variable value drop-down list. Leave this field empty to display all instances.
 1. (optional) Enter [Selection Options]({{< relref "../variable-selection-options.md" >}}).
 1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect.

docs/sources/variables/variable-types/add-query-variable.md

@@ -16,7 +16,7 @@ Query expressions can contain references to other variables and in effect create
 
 ## Query expressions
 
-Query expressions are different for each data source. For more information, refer to the documentation for your [data source]({{< relref "../../features/datasources/_index.md" >}}).
+Query expressions are different for each data source. For more information, refer to the documentation for your [data source]({{< relref "../../datasources/_index.md" >}}).
 
 ## Enter General options
 
@@ -32,7 +32,7 @@ Query expressions are different for each data source. For more information, refe
 
 ## Enter Query Options
 
-1. In the **Data source** list, select the target data source for the query. For more information about data sources, refer to [Add a data source]({{< relref "../../features/datasources/add-a-data-source.md" >}}).
+1. In the **Data source** list, select the target data source for the query. For more information about data sources, refer to [Add a data source]({{< relref "../../datasources/add-a-data-source.md" >}}).
 1. In the **Refresh** list, select when the variable should update options.
    - **Never -** Variables queries are cached and values are not updated. This is fine if the values never change, but problematic if they are dynamic and change a lot.
    - **On Dashboard Load -** Queries the data source every time the dashboard loads. This slows down dashboard loading, because the variable query needs to be completed before dashboard can be initialized. 

docs/sources/whatsnew/_index.md

@@ -1,11 +1,12 @@
 +++
-title = "What's New in Grafana"
+title = "What's new in Grafana"
+aliases = ["/docs/grafana/latest/guides/"]
 [menu.docs]
 name = "What's New In Grafana"
 identifier = "whatsnew"
-weight = 5
+weight = 140
 +++
 
-# What's New
+# What's new
 
 This section contains pages with Grafana release notes.

docs/sources/whatsnew/whats-new-in-v2-1.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v2.1"
 description = "Feature and improvement highlights for Grafana v2.1"
 keywords = ["grafana", "new", "documentation", "2.1", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-1/"]
 +++
 
 # What's new in Grafana v2.1

docs/sources/whatsnew/whats-new-in-v2-5.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v2.5"
 description = "Feature and improvement highlights for Grafana v2.5"
 keywords = ["grafana", "new", "documentation", "2.5", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-5/"]
 +++
 
 # What's new in Grafana v2.5

docs/sources/whatsnew/whats-new-in-v2-6.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v2.6"
 description = "Feature and improvement highlights for Grafana v2.6"
 keywords = ["grafana", "new", "documentation", "2.6", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-6/"]
 +++
 
 # What's new in Grafana v2.6

docs/sources/whatsnew/whats-new-in-v2.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v2.0"
 description = "Feature and improvement highlights for Grafana v2.0"
 keywords = ["grafana", "new", "documentation", "2.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v2/"]
 +++
 
 # What's new in Grafana v2.0

docs/sources/whatsnew/whats-new-in-v3-1.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v3.1"
 description = "Feature and improvement highlights for Grafana v3.1"
 keywords = ["grafana", "new", "documentation", "3.1", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v3-1/"]
 [menu.docs]
 name = "Version 3.1"
 identifier = "v3.1"

docs/sources/whatsnew/whats-new-in-v3.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v3.0"
 description = "Feature and improvement highlights for Grafana v3.0"
 keywords = ["grafana", "new", "documentation", "3.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v3/"]
 [menu.docs]
 name = "Version 3.0"
 identifier = "v3.0"

docs/sources/whatsnew/whats-new-in-v4-1.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.1"
 description = "Feature and improvement highlights for Grafana v4.1"
 keywords = ["grafana", "new", "documentation", "4.1.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-1/"]
 [menu.docs]
 name = "Version 4.1"
 identifier = "v4.1"

docs/sources/whatsnew/whats-new-in-v4-2.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.2"
 description = "Feature and improvement highlights for Grafana v4.2"
 keywords = ["grafana", "new", "documentation", "4.2.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-2/"]
 [menu.docs]
 name = "Version 4.2"
 identifier = "v4.2"

docs/sources/whatsnew/whats-new-in-v4-3.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.3"
 description = "Feature and improvement highlights for Grafana v4.3"
 keywords = ["grafana", "new", "documentation", "4.3.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-3/"]
 [menu.docs]
 name = "Version 4.3"
 identifier = "v4.3"

docs/sources/whatsnew/whats-new-in-v4-4.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.4"
 description = "Feature and improvement highlights for Grafana v4.4"
 keywords = ["grafana", "new", "documentation", "4.4.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-4/"]
 [menu.docs]
 name = "Version 4.4"
 identifier = "v4.4"

docs/sources/whatsnew/whats-new-in-v4-5.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.5"
 description = "Feature and improvement highlights for Grafana v4.5"
 keywords = ["grafana", "new", "documentation", "4.5", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-5/"]
 [menu.docs]
 name = "Version 4.5"
 identifier = "v4.5"

docs/sources/whatsnew/whats-new-in-v4-6.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.6"
 description = "Feature and improvement highlights for Grafana v4.6"
 keywords = ["grafana", "new", "documentation", "4.6", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-6/"]
 [menu.docs]
 name = "Version 4.6"
 identifier = "v4.6"

docs/sources/whatsnew/whats-new-in-v4.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v4.0"
 description = "Feature and improvement highlights for Grafana v4.0"
 keywords = ["grafana", "new", "documentation", "4.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v4/"]
 [menu.docs]
 name = "Version 4.0"
 identifier = "v4.0"

docs/sources/whatsnew/whats-new-in-v5-1.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v5.1"
 description = "Feature and improvement highlights for Grafana v5.1"
 keywords = ["grafana", "new", "documentation", "5.1", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-1/"]
 [menu.docs]
 name = "Version 5.1"
 identifier = "v5.1"
@@ -51,7 +52,7 @@ The Prometheus data source now support transforming Prometheus histograms to the
 really happy to finally allow our users to render those as heatmaps. Please read [Heatmap panel documentation](/features/panels/heatmap/#pre-bucketed-data)
 for more information on how to use it.
 
-Prometheus query editor also got support for autocomplete of template variables. More information in the [Prometheus data source documentation]({{< relref "../features/datasources/prometheus/" >}}).
+Prometheus query editor also got support for autocomplete of template variables. More information in the [Prometheus data source documentation]({{< relref "../datasources/prometheus/" >}}).
 
 <div class="clearfix"></div>
 
@@ -63,7 +64,7 @@ Grafana v5.1 now ships with a built-in Microsoft SQL Server (MSSQL) data source
 Microsoft SQL Server 2005 or newer, including Microsoft Azure SQL Database. Do you have metric or log data in MSSQL? You can now visualize
 that data and define alert rules on it like with any of Grafana's other core data sources.
 
-Please read [Using Microsoft SQL Server in Grafana documentation]({{< relref "../features/datasources/mssql/" >}}) for more detailed information on how to get started and use it.
+Please read [Using Microsoft SQL Server in Grafana documentation]({{< relref "../datasources/mssql/" >}}) for more detailed information on how to get started and use it.
 
 <div class="clearfix"></div>
 

docs/sources/whatsnew/whats-new-in-v5-2.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v5.2"
 description = "Feature and improvement highlights for Grafana v5.2"
 keywords = ["grafana", "new", "documentation", "5.2", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-2/"]
 [menu.docs]
 name = "Version 5.2"
 identifier = "v5.2"

docs/sources/whatsnew/whats-new-in-v5-3.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v5.3"
 description = "Feature and improvement highlights for Grafana v5.3"
 keywords = ["grafana", "new", "documentation", "5.3", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-3/"]
 [menu.docs]
 name = "Version 5.3"
 identifier = "v5.3"
@@ -39,7 +40,7 @@ The Grafana Stackdriver plugin comes with support for automatic unit detection.
 The data source is still in the `beta` phase, meaning it's currently in active development and is still missing one important feature - templating queries.
 Please try it out, but be aware of that it might be subject to changes and possible bugs. We would love to hear your feedback.
 
-Please read [Using Google Stackdriver in Grafana]({{< relref "../features/datasources/cloudmonitoring/" >}}) for more detailed information on how to get started and use it.
+Please read [Using Google Stackdriver in Grafana]({{< relref "../datasources/cloudmonitoring/" >}}) for more detailed information on how to get started and use it.
 
 ## TV and Kiosk Mode
 
@@ -65,7 +66,7 @@ For more information about how to enable and configure reminders, refer to [aler
 
 ## Postgres Query Builder
 
-Grafana 5.3 comes with a new graphical query builder for Postgres. This brings Postgres integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in Postgres. For more information about Postgres graphical query builder, refer to [query editor]({{< relref "../features/datasources/postgres/#query-editor" >}}).
+Grafana 5.3 comes with a new graphical query builder for Postgres. This brings Postgres integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in Postgres. For more information about Postgres graphical query builder, refer to [query editor]({{< relref "../datasources/postgres/#query-editor" >}}).
 
 {{< docs-imagebox img="/img/docs/v53/postgres_query_still.png" class="docs-image--no-shadow" animated-gif="/img/docs/v53/postgres_query.gif" >}}
 

docs/sources/whatsnew/whats-new-in-v5-4.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v5.4"
 description = "Feature and improvement highlights for Grafana v5.4"
 keywords = ["grafana", "new", "documentation", "5.4", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-4/"]
 [menu.docs]
 name = "Version 5.4"
 identifier = "v5.4"
@@ -47,15 +48,15 @@ Stackdriver is the first data source which has support for a custom templating q
 create their very own templating query editor.
 
 Additionally, if Grafana is running on a Google Compute Engine (GCE) virtual machine, it is now possible for Grafana to automatically retrieve default credentials from the metadata server.
-This has the advantage of not needing to generate a private key file for the service account and also not having to upload the file to Grafana. [Learn more]({{< relref "../features/datasources/cloudmonitoring/#using-gce-default-service-account" >}}).
+This has the advantage of not needing to generate a private key file for the service account and also not having to upload the file to Grafana. [Learn more]({{< relref "../datasources/cloudmonitoring/#using-gce-default-service-account" >}}).
 
-Please read [Using Google Stackdriver in Grafana]({{< relref "../features/datasources/cloudmonitoring/" >}}) for more detailed information on how to get started and use it.
+Please read [Using Google Stackdriver in Grafana]({{< relref "../datasources/cloudmonitoring/" >}}) for more detailed information on how to get started and use it.
 
 <div class="clearfix"></div>
 
 ## MySQL Query Builder
 
-Grafana v5.4 comes with a new graphical query builder for MySQL. This brings MySQL integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in MySQL. For more information about MySQL graphical query builder, refer to [query editor]({{< relref "../features/datasources/mysql/#query-editor" >}}).
+Grafana v5.4 comes with a new graphical query builder for MySQL. This brings MySQL integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in MySQL. For more information about MySQL graphical query builder, refer to [query editor]({{< relref "../datasources/mysql/#query-editor" >}}).
 
 {{< docs-imagebox img="/img/docs/v54/mysql_query_still.png" animated-gif="/img/docs/v54/mysql_query.gif" >}}
 

docs/sources/whatsnew/whats-new-in-v5.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v5.0"
 description = "Feature and improvement highlights for Grafana v5.0"
 keywords = ["grafana", "new", "documentation", "5.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v5/"]
 [menu.docs]
 name = "Version 5.0"
 identifier = "v5.0"

docs/sources/whatsnew/whats-new-in-v6-0.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.0"
 description = "Feature and improvement highlights for Grafana v6.0"
 keywords = ["grafana", "new", "documentation", "6.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-0/"]
 [menu.docs]
 name = "Version 6.0"
 identifier = "v6.0"
@@ -116,7 +117,7 @@ will be shared soon.
 
 Built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) is officially released in Grafana 6.0. Beta support was added in Grafana 5.3 and we have added lots of improvements since then.
 
-To get started read the guide: [Using Google Stackdriver in Grafana]({{< relref "../features/datasources/cloudmonitoring/" >}}).
+To get started read the guide: [Using Google Stackdriver in Grafana]({{< relref "../datasources/cloudmonitoring/" >}}).
 
 ## Azure Monitor data source
 
@@ -124,7 +125,7 @@ One of the goals of the Grafana v6.0 release is to add support for the three maj
 
 The Azure Monitor data source integrates four Azure services with Grafana - Azure Monitor, Azure Log Analytics, Azure Application Insights and Azure Application Insights Analytics.
 
-Please read [Using Azure Monitor in Grafana documentation]({{< relref "../features/datasources/azuremonitor/" >}}) for more detailed information on how to get started and use it.
+Please read [Using Azure Monitor in Grafana documentation]({{< relref "../datasources/azuremonitor/" >}}) for more detailed information on how to get started and use it.
 
 ## Provisioning support for alert notifiers
 

docs/sources/whatsnew/whats-new-in-v6-1.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.1"
 description = "Feature and improvement highlights for Grafana v6.1"
 keywords = ["grafana", "new", "documentation", "6.1", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-1/"]
 [menu.docs]
 name = "Version 6.1"
 identifier = "v6.1"

docs/sources/whatsnew/whats-new-in-v6-2.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.2"
 description = "Feature and improvement highlights for Grafana v6.2"
 keywords = ["grafana", "new", "documentation", "6.2", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-2/"]
 [menu.docs]
 name = "Version 6.2"
 identifier = "v6.2"
@@ -37,7 +38,7 @@ To mitigate the risk of sensitive information being cached in browser after a us
 
 ## Official support for Elasticsearch 7
 
-Grafana v6.2 ships with official support for Elasticsearch v7, see [Using Elasticsearch in Grafana]({{< relref "../features/datasources/elasticsearch/#elasticsearch-version" >}}) for more information.
+Grafana v6.2 ships with official support for Elasticsearch v7, see [Using Elasticsearch in Grafana]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more information.
 
 ## Bar Gauge Panel
 

docs/sources/whatsnew/whats-new-in-v6-3.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.3"
 description = "Feature and improvement highlights for Grafana v6.3"
 keywords = ["grafana", "new", "documentation", "6.3", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-3/"]
 [menu.docs]
 name = "Version 6.3"
 identifier = "v6.3"
@@ -50,7 +51,7 @@ simplified query interface specifically designed for logs search.
 
 {{< docs-imagebox img="/img/docs/v63/elasticsearch_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
 
-Please read [Using Elasticsearch in Grafana]({{< relref "../features/datasources/elasticsearch/#elasticsearch-version" >}}) for more detailed information on how to get started and use it.
+Please read [Using Elasticsearch in Grafana]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more detailed information on how to get started and use it.
 
 ### InfluxDB logs support
 
@@ -59,7 +60,7 @@ simplified query interface specifically designed for logs search.
 
 {{< docs-imagebox img="/img/docs/v63/influxdb_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
 
-Please read [Using InfluxDB in Grafana]({{< relref "../features/datasources/influxdb/#querying-logs-beta" >}}) for more detailed information on how to get started and use it.
+Please read [Using InfluxDB in Grafana]({{< relref "../datasources/influxdb/#querying-logs-beta" >}}) for more detailed information on how to get started and use it.
 
 ## Data Links
 

docs/sources/whatsnew/whats-new-in-v6-4.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.4"
 description = "Feature and improvement highlights for Grafana v6.4"
 keywords = ["grafana", "new", "documentation", "6.4", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-4/"]
 [menu.docs]
 name = "Version 6.4"
 identifier = "v6.4"

docs/sources/whatsnew/whats-new-in-v6-5.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.5"
 description = "Feature and improvement highlights for Grafana v6.5"
 keywords = ["grafana", "new", "documentation", "6.5", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-5/"]
 [menu.docs]
 name = "Version 6.5"
 identifier = "v6.5"
@@ -120,7 +121,7 @@ TagValues
 tag_values(server, server=~${__searchFilter:regex})
 ```
 
-This feature is currently only supported by [Graphite]({{< relref "../features/datasources/graphite/#using-searchfilter-to-filter-results-in-query-variable" >}}), [MySQL]({{< relref "../features/datasources/mysql/#using-searchfilter-to-filter-results-in-query-variable" >}}) and [Postgres]({{< relref "../features/datasources/postgres/#using-searchfilter-to-filter-results-in-query-variable" >}}) data sources.
+This feature is currently only supported by [Graphite]({{< relref "../datasources/graphite/#using-searchfilter-to-filter-results-in-query-variable" >}}), [MySQL]({{< relref "../datasources/mysql/#using-searchfilter-to-filter-results-in-query-variable" >}}) and [Postgres]({{< relref "../datasources/postgres/#using-searchfilter-to-filter-results-in-query-variable" >}}) data sources.
 
 ### Graphite: Support for additional Metrictank functionality
 
@@ -174,7 +175,7 @@ In the Explore split view, you can now link the two timepickers so that if you c
 
 ### Alerting support for Azure Application Insights
 
-The [Azure Monitor]({{< relref "../features/datasources/azuremonitor/" >}}) data source supports multiple services in the Azure cloud. Before Grafana v6.5, only the Azure Monitor service had support for [Grafana Alerting]({{< relref "../alerting/alerts-overview" >}}). In Grafana 6.5, alerting support has been implemented for the [Application Insights service]({{< relref "../features/datasources/azuremonitor/#querying-the-application-insights-service" >}}).
+The [Azure Monitor]({{< relref "../datasources/azuremonitor/" >}}) data source supports multiple services in the Azure cloud. Before Grafana v6.5, only the Azure Monitor service had support for [Grafana Alerting]({{< relref "../alerting/alerts-overview" >}}). In Grafana 6.5, alerting support has been implemented for the [Application Insights service]({{< relref "../datasources/azuremonitor/#querying-the-application-insights-service" >}}).
 
 ### Allow saving of provisioned dashboards from UI
 
@@ -196,7 +197,7 @@ Read more about this new feature in [Generic OAuth Authentication]({{< relref ".
 
 ### Image renderer plugin
 
-Since we announced the deprecation of PhantomJS and the new [Image Renderer Plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) in Grafana [6.4]({{< relref "../guides/whats-new-in-v6-4/#phantomjs-deprecation" >}}), we’ve received bug reports and valuable feedback.
+Since we announced the deprecation of PhantomJS and the new [Image Renderer Plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) in Grafana [6.4]({{< relref "whats-new-in-v6-4/#phantomjs-deprecation" >}}), we’ve received bug reports and valuable feedback.
 
 In Grafana 6.5 we’ve updated documentation to make it easier to understand how to install and troubleshoot possible problems. Read more about [Image Rendering]({{< relref "../administration/image_rendering/" >}}).
 

docs/sources/whatsnew/whats-new-in-v6-6.md

@@ -3,6 +3,7 @@ title = "What's new in Grafana v6.6"
 description = "Feature and improvement highlights for Grafana v6.6"
 keywords = ["grafana", "new", "documentation", "6.6", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-6/"]
 [menu.docs]
 name = "Version 6.6"
 identifier = "v6.6"

docs/sources/whatsnew/whats-new-in-v6-7.md

@@ -3,6 +3,7 @@ title = "What's New in Grafana v6.7"
 description = "Feature and improvement highlights for Grafana v6.7"
 keywords = ["grafana", "new", "documentation", "6.7", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-7/"]
 [menu.docs]
 name = "Version 6.7"
 identifier = "v6.7"

docs/sources/whatsnew/whats-new-in-v7-0.md

@@ -3,6 +3,7 @@ title = "What's New in Grafana v7"
 description = "Feature and improvement highlights for Grafana v7"
 keywords = ["grafana", "new", "documentation", "7.0", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-0/"]
 [menu.docs]
 name = "Version 7.0"
 identifier = "v7.0"
@@ -181,7 +182,7 @@ It was released as a beta feature in Grafana 6.7. The feedback has been really p
 
 ## Stackdriver data source supports Service Monitoring
 
-[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Grafana. Read more about it in the [Stackdriver data source documentation]({{< relref "../features/datasources/cloudmonitoring/#slo-service-level-objective-queries" >}}).
+[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Grafana. Read more about it in the [Stackdriver data source documentation]({{< relref "../datasources/cloudmonitoring/#slo-service-level-objective-queries" >}}).
 
 ## Time zone support
 
@@ -191,7 +192,7 @@ You can now override the [time zone]({{< relref "../dashboards/time-range-contro
 
 The Azure Monitor data source supports multiple Azure services. Log Analytics queries in the data source now have alerting support too (Azure Monitor and Application Insights already had alerting support).
 
-A new feature is [deep linking from the graph panel to the Log Analytics query editor in the Azure Portal]({{< relref "../features/datasources/azuremonitor/#deep-linking-from-grafana-panels-to-the-log-analytics-query-editor-in-azure-portal" >}}). Click on a time series in the panel to see a context menu with a link to View in Azure Portal. Clicking that link opens the Azure Log Analytics query editor in the Azure Portal and runs the query from the Grafana panel.
+A new feature is [deep linking from the graph panel to the Log Analytics query editor in the Azure Portal]({{< relref "../datasources/azuremonitor/#deep-linking-from-grafana-panels-to-the-log-analytics-query-editor-in-azure-portal" >}}). Click on a time series in the panel to see a context menu with a link to View in Azure Portal. Clicking that link opens the Azure Log Analytics query editor in the Azure Portal and runs the query from the Grafana panel.
 
 ## Grafana Enterprise
 

docs/sources/whatsnew/whats-new-in-v7-1.md

@@ -3,6 +3,7 @@ title = "What's New in Grafana v7.1"
 description = "Feature and improvement highlights for Grafana v7.1"
 keywords = ["grafana", "new", "documentation", "7.1", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-1/"]
 [menu.docs]
 name = "Version 7.1"
 identifier = "v7.1"
@@ -36,7 +37,7 @@ Support for Flux and Influx v2 has been added. The InfluxData blog post, [How to
 
 ## Query history search
 
-In Grafana v 7.1 we are introducing search functionality in Query history. You can search across queries and your comments. It is especially useful in combination with a time filter and data source filter. Read more about [Query history here]({{<relref "../explore/index.md#query-history" >}}).
+In Grafana v 7.1 we are introducing search functionality in Query history. You can search across queries and your comments. It is especially useful in combination with a time filter and data source filter. Read more about [Query history here]({{< relref "../explore/index.md#query-history" >}}).
 
 {{< docs-imagebox img="/img/docs/v71/query_history_search.gif" max-width="800px" caption="Query history search" >}}
 
@@ -85,7 +86,7 @@ Additionally, the Raw Edit mode for Application Insights Analytics has been repl
 
 ## Deep linking for Google Cloud Monitoring (formerly named Google Stackdriver) data source
 
-A new feature in Grafana 7.1 is [deep linking from Grafana panels to the Metrics Explorer in Google Cloud Console]({{<relref "../features/datasources/cloudmonitoring.md#deep-linking-from-grafana-panels-to-the-metrics-explorer-in-google-cloud-console">}}). Click on a time series in the panel to see a context menu with a link to View in Metrics explorer in Google Cloud Console. Clicking that link opens the Metrics explorer in the Monitoring Google Cloud Console and runs the query from the Grafana panel there.
+A new feature in Grafana 7.1 is [deep linking from Grafana panels to the Metrics Explorer in Google Cloud Console]({{<relref "../datasources/cloudmonitoring.md#deep-linking-from-grafana-panels-to-the-metrics-explorer-in-google-cloud-console">}}). Click on a time series in the panel to see a context menu with a link to View in Metrics explorer in Google Cloud Console. Clicking that link opens the Metrics explorer in the Monitoring Google Cloud Console and runs the query from the Grafana panel there.
 
 ## Time range picker update
 

docs/sources/whatsnew/whats-new-in-v7-2.md

@@ -3,11 +3,12 @@ title = "What's New in Grafana v7.2"
 description = "Feature and improvement highlights for Grafana v7.2"
 keywords = ["grafana", "new", "documentation", "7.2", "release notes"]
 type = "docs"
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-2/"]
 [menu.docs]
 name = "Version 7.2"
 identifier = "v7.2"
 parent = "whatsnew"
-weight = -16
+weight = -15
 +++
 
 # What's new in Grafana v7.2
@@ -102,7 +103,7 @@ You can enjoy all the details query inspector gave you in dashboards now in Expl
 
 ## \$\_\_rate_interval for Prometheus
 
-You can now use the new variable `$__rate_interval` in Prometheus for rate functions mainly. `$__rate_interval` in general is one scrape interval larger than `$__interval` but is never smaller than four times the scrape interval (which is 15s by default). See the [Prometheus data source]({{< relref "../features/datasources/prometheus.md#using-__rate_interval-variable" >}}) for more details.
+You can now use the new variable `$__rate_interval` in Prometheus for rate functions mainly. `$__rate_interval` in general is one scrape interval larger than `$__interval` but is never smaller than four times the scrape interval (which is 15s by default). See the [Prometheus data source]({{< relref "../datasources/prometheus.md#using-__rate_interval-variable" >}}) for more details.
 
 ## Toggle parsed log fields