docs: fix order of datasources in menu/index and update alert support
This commit is contained in:
Marcus Efraimsson
@@ -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.
|
||||
|
||||
|
||||
@@ -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" : "*"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ aliases = ["/datasources/influxdb"]
|
||||
[menu.docs]
|
||||
name = "InfluxDB"
|
||||
parent = "datasources"
|
||||
weight = 3
|
||||
weight = 2
|
||||
+++
|
||||
|
||||
# Using InfluxDB in Grafana
|
||||
|
||||
@@ -7,7 +7,7 @@ aliases = ["/datasources/loki"]
|
||||
[menu.docs]
|
||||
name = "Loki"
|
||||
parent = "datasources"
|
||||
weight = 11
|
||||
weight = 6
|
||||
+++
|
||||
|
||||
# Using Loki in Grafana
|
||||
|
||||
@@ -7,7 +7,7 @@ aliases = ["/datasources/opentsdb", "docs/features/opentsdb"]
|
||||
[menu.docs]
|
||||
name = "OpenTSDB"
|
||||
parent = "datasources"
|
||||
weight = 5
|
||||
weight = 19
|
||||
+++
|
||||
|
||||
# Using OpenTSDB in Grafana
|
||||
|
||||
@@ -7,7 +7,7 @@ aliases = ["/datasources/prometheus"]
|
||||
[menu.docs]
|
||||
name = "Prometheus"
|
||||
parent = "datasources"
|
||||
weight = 2
|
||||
weight = 1
|
||||
+++
|
||||
|
||||
# Using Prometheus in Grafana
|
||||
|
||||
@@ -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 |
|
||||
| -------------------- | ----------------------------------------------- | -------------- |
|
||||
|
||||
Reference in New Issue
Block a user