Commit df984059 by Marcus Efraimsson

docs: fix order of datasources in menu/index and update alert support

parent 8e90899c
...@@ -27,9 +27,10 @@ and the conditions that need to be met for the alert to change state and trigger ...@@ -27,9 +27,10 @@ and the conditions that need to be met for the alert to change state and trigger
## Execution ## Execution
The alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part 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 ### Clustering
......
...@@ -5,9 +5,9 @@ keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights ...@@ -5,9 +5,9 @@ keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights
type = "docs" type = "docs"
aliases = ["/datasources/azuremonitor"] aliases = ["/datasources/azuremonitor"]
[menu.docs] [menu.docs]
name = "AzureMonitor" name = "Azure Monitor"
parent = "datasources" parent = "datasources"
weight = 11 weight = 5
+++ +++
# Using Azure Monitor in Grafana # Using Azure Monitor in Grafana
......
...@@ -8,7 +8,7 @@ aliases = ["/datasources/cloudwatch"] ...@@ -8,7 +8,7 @@ aliases = ["/datasources/cloudwatch"]
name = "AWS Cloudwatch" name = "AWS Cloudwatch"
identifier = "cloudwatch" identifier = "cloudwatch"
parent = "datasources" parent = "datasources"
weight = 10 weight = 5
+++ +++
# Using AWS CloudWatch in Grafana # Using AWS CloudWatch in Grafana
......
...@@ -22,15 +22,18 @@ The query language and capabilities of each Data Source are obviously very diffe ...@@ -22,15 +22,18 @@ The query language and capabilities of each Data Source are obviously very diffe
The following datasources are officially supported: The following datasources are officially supported:
* [Graphite]({{< relref "graphite.md" >}}) * [Graphite]({{< relref "graphite.md" >}})
* [Elasticsearch]({{< relref "elasticsearch.md" >}})
* [CloudWatch]({{< relref "cloudwatch.md" >}})
* [InfluxDB]({{< relref "influxdb.md" >}})
* [OpenTSDB]({{< relref "opentsdb.md" >}})
* [Prometheus]({{< relref "prometheus.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" >}}) * [Loki]({{< relref "loki.md" >}})
* [MySQL]({{< relref "mysql.md" >}}) * [MySQL]({{< relref "mysql.md" >}})
* [Postgres]({{< relref "postgres.md" >}}) * [PostgreSQL]({{< relref "postgres.md" >}})
* [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}}) * [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}})
* [OpenTSDB]({{< relref "opentsdb.md" >}})
* [Testdata]({{< relref "testdata.md" >}})
## Data source plugins ## Data source plugins
......
...@@ -7,7 +7,7 @@ aliases = ["/datasources/influxdb"] ...@@ -7,7 +7,7 @@ aliases = ["/datasources/influxdb"]
[menu.docs] [menu.docs]
name = "InfluxDB" name = "InfluxDB"
parent = "datasources" parent = "datasources"
weight = 3 weight = 2
+++ +++
# Using InfluxDB in Grafana # Using InfluxDB in Grafana
......
...@@ -7,7 +7,7 @@ aliases = ["/datasources/loki"] ...@@ -7,7 +7,7 @@ aliases = ["/datasources/loki"]
[menu.docs] [menu.docs]
name = "Loki" name = "Loki"
parent = "datasources" parent = "datasources"
weight = 11 weight = 6
+++ +++
# Using Loki in Grafana # Using Loki in Grafana
......
...@@ -7,7 +7,7 @@ aliases = ["/datasources/opentsdb", "docs/features/opentsdb"] ...@@ -7,7 +7,7 @@ aliases = ["/datasources/opentsdb", "docs/features/opentsdb"]
[menu.docs] [menu.docs]
name = "OpenTSDB" name = "OpenTSDB"
parent = "datasources" parent = "datasources"
weight = 5 weight = 19
+++ +++
# Using OpenTSDB in Grafana # Using OpenTSDB in Grafana
......
...@@ -7,7 +7,7 @@ aliases = ["/datasources/prometheus"] ...@@ -7,7 +7,7 @@ aliases = ["/datasources/prometheus"]
[menu.docs] [menu.docs]
name = "Prometheus" name = "Prometheus"
parent = "datasources" parent = "datasources"
weight = 2 weight = 1
+++ +++
# Using Prometheus in Grafana # Using Prometheus in Grafana
......
...@@ -5,9 +5,9 @@ keywords = ["grafana", "stackdriver", "google", "guide"] ...@@ -5,9 +5,9 @@ keywords = ["grafana", "stackdriver", "google", "guide"]
type = "docs" type = "docs"
aliases = ["/datasources/stackdriver"] aliases = ["/datasources/stackdriver"]
[menu.docs] [menu.docs]
name = "Stackdriver" name = "Google Stackdriver"
parent = "datasources" parent = "datasources"
weight = 11 weight = 4
+++ +++
# Using Google Stackdriver in Grafana # Using Google Stackdriver in Grafana
......
...@@ -94,7 +94,7 @@ aliases = ["v1.1", "guides/reference/admin"] ...@@ -94,7 +94,7 @@ aliases = ["v1.1", "guides/reference/admin"]
</a> </a>
<a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds"> <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
<img src="/img/docs/logos/icon_cloudwatch.svg"> <img src="/img/docs/logos/icon_cloudwatch.svg">
<h5>Cloudwatch</h5> <h5>AWS CloudWatch</h5>
</a> </a>
<a href="{{< relref "features/datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds"> <a href="{{< relref "features/datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
<img src="/img/docs/logos/icon_mysql.png" > <img src="/img/docs/logos/icon_mysql.png" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment