Docs: Backport 32916 to v7.5x (#33008)
* fixing things * Update add-authentication-for-data-source-plugins.md * Docs: Sync release branch with latest docs (#32986) * Docs: Sync release branch with latest docs * Fixed what branch to update * Elasticsearch: Force re-rendering of each editor row type change (#32993) (#32996) (cherry picked from commit136460d369) Co-authored-by: Giordano Ricci <me@giordanoricci.com> * ReleaseNotes: Updated changelog and release notes for 7.5.4 (#32973) (#32998) * ReleaseNotes: Updated changelog and release notes for 7.5.4 (#32973) * ReleaseNotes: Updated changelog and release notes for 7.5.4 * Update index link * Fix boldness * Update CHANGELOG.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update codespell words * Update docs/sources/release-notes/release-notes-7-5-4.md * Update CHANGELOG.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/release-notes/release-notes-7-5-4.md * Change bold markers * Fix escaping * Update drone yaml Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> (cherry picked from commita516ff00db) * Add old release notes Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> * fixing things * Merge branch 'v7.5.x' of https://github.com/grafana/grafana into backport-32916-to-v7.5.x * Update add-authentication-for-data-source-plugins.md * Update license-restrictions.md Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: Giordano Ricci <me@giordanoricci.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
This commit is contained in:
co-authored by
Grot
Diana Payton
Giordano Ricci
Andrej Ocenas
parent
f6268bc37a
commit
8011ff4f79
@@ -186,8 +186,6 @@ If the period field is left blank or set to `auto`, then it calculates automatic
|
||||
|
||||
### Deep linking from Grafana panels to the CloudWatch console
|
||||
|
||||
> Only available in Grafana v6.5+.
|
||||
|
||||
{{< docs-imagebox img="/img/docs/v65/cloudwatch-deep-linking.png" max-width="500px" class="docs-image--right" caption="CloudWatch deep linking" >}}
|
||||
|
||||
Left clicking a time series in the panel shows a context menu with a link to `View in CloudWatch console`. Clicking that link will open a new tab that will take you to the CloudWatch console and display all the metrics for that query. If you're not currently logged in to the CloudWatch console, the link will forward you to the login page. The provided link is valid for any account but will only display the right metrics if you're logged in to the account that corresponds to the selected data source in Grafana.
|
||||
@@ -196,7 +194,7 @@ This feature is not available for metrics that are based on metric math expressi
|
||||
|
||||
## Using the Logs Query Editor
|
||||
|
||||
> Only available in Grafana v7.0+.
|
||||
> **Note:** Available in Grafana v7.0+.
|
||||
|
||||
To query CloudWatch Logs, select the region and up to 20 log groups which you want to query. Use the main input area to write your query in [CloudWatch Logs Query Language](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_QuerySyntax.html)
|
||||
|
||||
@@ -226,8 +224,6 @@ See the [Alerting]({{< relref "../alerting/_index.md" >}}) documentation for mor
|
||||
|
||||
## Curated dashboards
|
||||
|
||||
> Only available in Grafana v6.5+.
|
||||
|
||||
The updated CloudWatch data source ships with pre-configured dashboards for five of the most popular AWS services:
|
||||
|
||||
- Amazon Elastic Compute Cloud `Amazon EC2`,
|
||||
@@ -346,7 +342,7 @@ Example `ec2_instance_attribute()` query
|
||||
ec2_instance_attribute(us-east-1, Tags.Name, { "tag:Team": ["sysops"] });
|
||||
```
|
||||
|
||||
## Using json format template variables
|
||||
## Using JSON format template variables
|
||||
|
||||
Some queries accept filters in JSON format and Grafana supports the conversion of template variables to JSON.
|
||||
|
||||
@@ -377,7 +373,7 @@ Please see the AWS documentation for [Service Quotas](https://docs.aws.amazon.co
|
||||
|
||||
## Configure the data source with grafana.ini
|
||||
|
||||
In the [Grafana configuration](https://grafana.com/docs/grafana/latest/administration/configuration/#aws) there's an `AWS` section that allows you to customize the data source.
|
||||
In the Grafana [configuration]({{< relref "../administration/configuration.md#aws" >}}) file, there's an `AWS` section that allows you to customize the data source.
|
||||
|
||||
### allowed_auth_providers
|
||||
|
||||
|
||||
Reference in New Issue
Block a user