diff --git a/docs/sources/alerting/rules.md b/docs/sources/alerting/rules.md
index 036ff97056d..510f466c3eb 100644
--- a/docs/sources/alerting/rules.md
+++ b/docs/sources/alerting/rules.md
@@ -27,9 +27,10 @@ and the conditions that need to be met for the alert to change state and trigger
 ## Execution
 
 The alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
-of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `Elasticsearch`, `InfluxDB`, `OpenTSDB`, `MySQL`, `Postgres` and `Cloudwatch`.
+of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
+`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL` and `OpenTSDB`.
 
-> Alerting support for Elasticsearch is only available in Grafana v5.2 and above.
+> Alerting support for Azure Monitor is only available in Grafana v6.0 and above.
 
 ### Clustering
 
@@ -52,9 +53,9 @@ Here you can specify the name of the alert rule and how often the scheduler shou
 
 > This setting is available in Grafana 5.4 and above.
 
-If an alert rule has a configured `For` and the query violates the configured threshold it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Grafana will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications. 
+If an alert rule has a configured `For` and the query violates the configured threshold it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Grafana will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications.
 
-Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state. 
+Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state.
 
 Below you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`.
 {{< imgbox img="/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}
diff --git a/docs/sources/features/datasources/azuremonitor.md b/docs/sources/features/datasources/azuremonitor.md
index ee8ca62ef0b..1e628e8f2a8 100644
--- a/docs/sources/features/datasources/azuremonitor.md
+++ b/docs/sources/features/datasources/azuremonitor.md
@@ -5,9 +5,9 @@ keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights
 type = "docs"
 aliases = ["/datasources/azuremonitor"]
 [menu.docs]
-name = "AzureMonitor"
+name = "Azure Monitor"
 parent = "datasources"
-weight = 11
+weight = 5
 +++
 
 # Using Azure Monitor in Grafana
@@ -216,7 +216,7 @@ AzureActivity
 Table queries are mainly used in the Table panel and row a list of columns and rows. This example query returns rows with the 6 specified columns:
 
 ```
-AzureActivity 
+AzureActivity
 | where $__timeFilter()
 | project TimeGenerated, ResourceGroup, Category, OperationName, ActivityStatus, Caller
 | order by TimeGenerated desc
@@ -232,7 +232,7 @@ To make writing queries easier there are several Grafana macros that can be used
     `TimeGenerated ≥ datetime(2018-06-05T18:09:58.907Z) and`
     `TimeGenerated ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
 
-- `$__timeFilter(datetimeColumn)` - Expands to 
+- `$__timeFilter(datetimeColumn)` - Expands to
     `datetimeColumn  ≥ datetime(2018-06-05T18:09:58.907Z) and`
     `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
 
diff --git a/docs/sources/features/datasources/cloudwatch.md b/docs/sources/features/datasources/cloudwatch.md
index 6ca10b2f8e8..ed88fcfc509 100644
--- a/docs/sources/features/datasources/cloudwatch.md
+++ b/docs/sources/features/datasources/cloudwatch.md
@@ -8,7 +8,7 @@ aliases = ["/datasources/cloudwatch"]
 name = "AWS Cloudwatch"
 identifier = "cloudwatch"
 parent = "datasources"
-weight = 10
+weight = 5
 +++
 
 # Using AWS CloudWatch in Grafana
@@ -77,9 +77,9 @@ Here is a minimal policy example:
         },
         {
             "Sid": "AllowReadingResourcesForTags",
-            "Effect" : "Allow",      
-            "Action" : "tag:GetResources",      
-            "Resource" : "*"      
+            "Effect" : "Allow",
+            "Action" : "tag:GetResources",
+            "Resource" : "*"
         }
     ]
 }
diff --git a/docs/sources/features/datasources/index.md b/docs/sources/features/datasources/index.md
index 42ce3f84819..9046c986f98 100644
--- a/docs/sources/features/datasources/index.md
+++ b/docs/sources/features/datasources/index.md
@@ -22,15 +22,18 @@ The query language and capabilities of each Data Source are obviously very diffe
 The following datasources are officially supported:
 
 * [Graphite]({{< relref "graphite.md" >}})
-* [Elasticsearch]({{< relref "elasticsearch.md" >}})
-* [CloudWatch]({{< relref "cloudwatch.md" >}})
-* [InfluxDB]({{< relref "influxdb.md" >}})
-* [OpenTSDB]({{< relref "opentsdb.md" >}})
 * [Prometheus]({{< relref "prometheus.md" >}})
+* [InfluxDB]({{< relref "influxdb.md" >}})
+* [Elasticsearch]({{< relref "elasticsearch.md" >}})
+* [Google Stackdriver]({{< relref "stackdriver.md" >}})
+* [AWS CloudWatch]({{< relref "cloudwatch.md" >}})
+* [Azure Monitor]({{< relref "azuremonitor.md" >}})
 * [Loki]({{< relref "loki.md" >}})
 * [MySQL]({{< relref "mysql.md" >}})
-* [Postgres]({{< relref "postgres.md" >}})
+* [PostgreSQL]({{< relref "postgres.md" >}})
 * [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}})
+* [OpenTSDB]({{< relref "opentsdb.md" >}})
+* [Testdata]({{< relref "testdata.md" >}})
 
 ## Data source plugins
 
diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md
index bc96190e9b1..94ae448f16d 100644
--- a/docs/sources/features/datasources/influxdb.md
+++ b/docs/sources/features/datasources/influxdb.md
@@ -7,7 +7,7 @@ aliases = ["/datasources/influxdb"]
 [menu.docs]
 name = "InfluxDB"
 parent = "datasources"
-weight = 3
+weight = 2
 +++
 
 # Using InfluxDB in Grafana
diff --git a/docs/sources/features/datasources/loki.md b/docs/sources/features/datasources/loki.md
index d43ef982b4b..8dc4eaeaf4c 100644
--- a/docs/sources/features/datasources/loki.md
+++ b/docs/sources/features/datasources/loki.md
@@ -7,7 +7,7 @@ aliases = ["/datasources/loki"]
 [menu.docs]
 name = "Loki"
 parent = "datasources"
-weight = 11
+weight = 6
 +++
 
 # Using Loki in Grafana
diff --git a/docs/sources/features/datasources/opentsdb.md b/docs/sources/features/datasources/opentsdb.md
index d2cd0b1dc0e..866619d380c 100644
--- a/docs/sources/features/datasources/opentsdb.md
+++ b/docs/sources/features/datasources/opentsdb.md
@@ -7,7 +7,7 @@ aliases = ["/datasources/opentsdb",	"docs/features/opentsdb"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"
-weight = 5
+weight = 19
 +++
 
 # Using OpenTSDB in Grafana
diff --git a/docs/sources/features/datasources/prometheus.md b/docs/sources/features/datasources/prometheus.md
index 611a3b4d9e2..2b2704e0d81 100644
--- a/docs/sources/features/datasources/prometheus.md
+++ b/docs/sources/features/datasources/prometheus.md
@@ -7,7 +7,7 @@ aliases = ["/datasources/prometheus"]
 [menu.docs]
 name = "Prometheus"
 parent = "datasources"
-weight = 2
+weight = 1
 +++
 
 # Using Prometheus in Grafana
diff --git a/docs/sources/features/datasources/stackdriver.md b/docs/sources/features/datasources/stackdriver.md
index d1cc1088276..e0f0e576b8b 100644
--- a/docs/sources/features/datasources/stackdriver.md
+++ b/docs/sources/features/datasources/stackdriver.md
@@ -5,9 +5,9 @@ keywords = ["grafana", "stackdriver", "google", "guide"]
 type = "docs"
 aliases = ["/datasources/stackdriver"]
 [menu.docs]
-name = "Stackdriver"
+name = "Google Stackdriver"
 parent = "datasources"
-weight = 11
+weight = 4
 +++
 
 # Using Google Stackdriver in Grafana
@@ -66,7 +66,7 @@ Click on the links above and click the `Enable` button:
 4. Some new fields will appear. Fill in a name for the service account in the `Service account name` field and then choose the `Monitoring Viewer` role from the `Role` dropdown:
 
     {{< docs-imagebox img="/img/docs/v53/stackdriver_service_account_choose_role.png" class="docs-image--no-shadow" caption="Choose role" >}}
-  
+
 5. Click the Create button. A JSON key file will be created and downloaded to your computer. Store this file in a secure place as it allows access to your Stackdriver data.
 6. Upload it to Grafana on the datasource Configuration page. You can either upload the file or paste in the contents of the file.
 
@@ -156,7 +156,7 @@ Example Alias By: `{{metric.type}} - {{metric.labels.instance_name}}`
 
 Example Result: `compute.googleapis.com/instance/cpu/usage_time - server1-prod`
 
-It is also possible to resolve the name of the Monitored Resource Type. 
+It is also possible to resolve the name of the Monitored Resource Type.
 
 | Alias Pattern Format | Description                                     | Example Result |
 | -------------------- | ----------------------------------------------- | -------------- |
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 3e8e014e606..7b8bfacd6f7 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -94,7 +94,7 @@ aliases = ["v1.1", "guides/reference/admin"]
     </a>
     <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudwatch.svg">
-      <h5>Cloudwatch</h5>
+      <h5>AWS CloudWatch</h5>
     </a>
     <a href="{{< relref "features/datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_mysql.png" >