Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 18 additions & 102 deletions docs/sources/_index.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
aliases:
- ../data-sources/aws-cloudwatch/
- /docs/grafana/latest/datasources/aws-cloudwatch/
- ../data-sources/aws-cloudwatch/preconfig-cloudwatch-dashboards/
- /docs/grafana/latest/datasources/preconfig-cloudwatch-dashboards/
- ../data-sources/aws-cloudwatch/provision-cloudwatch/
- cloudwatch/
- ../../data-sources/aws-cloudwatch/
- ../../datasources/aws-cloudwatch/
- ../../data-sources/aws-cloudwatch/preconfig-cloudwatch-dashboards/
- ../../datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards/
- ../../data-sources/aws-cloudwatch/provision-cloudwatch/
- ../../datasources/aws-cloudwatch/provision-cloudwatch/
- cloudwatch/ // not sure what to do with these three
- preconfig-cloudwatch-dashboards/
- provision-cloudwatch/
description: Guide for using Amazon CloudWatch in Grafana
Expand All @@ -21,92 +22,7 @@ labels:
menuTitle: Amazon CloudWatch
title: Amazon CloudWatch data source
weight: 200
refs:
logs:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/panels-visualizations/visualizations/logs/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/panels-visualizations/visualizations/logs/
explore:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/explore/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/explore/
provisioning-data-sources:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/administration/provisioning/#data-sources
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/administration/provisioning/#data-sources
configure-grafana-aws:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#aws
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#aws
alerting:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/alerting/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana-cloud/alerting-and-irm/alerting/
build-dashboards:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/dashboards/build-dashboards/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/dashboards/build-dashboards/
data-source-management:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/administration/data-source-management/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/administration/data-source-management/
configure-cloudwatch:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/configure/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/configure/
cloudwatch-query-editor:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/query-editor/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/query-editor/
cloudwatch-template-variables:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/template-variables/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/template-variables/
cloudwatch-aws-authentication:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/
query-caching:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/administration/data-source-management/#query-and-resource-caching
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/administration/data-source-management/#query-and-resource-caching
variables:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/dashboards/variables/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana-cloud/visualizations/dashboards/variables/
annotate-visualizations:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/dashboards/build-dashboards/annotate-visualizations/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/annotate-visualizations/
set-up-grafana-monitoring:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/setup-grafana/set-up-grafana-monitoring/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/setup-grafana/set-up-grafana-monitoring/
transformations:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/panels-visualizations/query-transform-data/transform-data/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data/
visualizations:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/panels-visualizations/visualizations/
- pattern: /docs/grafana-cloud/
destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/

---

# Amazon CloudWatch data source
Expand All @@ -117,10 +33,10 @@ Grafana includes native support for the Amazon CloudWatch plugin, so there's no

The following documents will help you get started working with the CloudWatch data source:

- [Configure the CloudWatch data source](ref:configure-cloudwatch)
- [CloudWatch query editor](ref:cloudwatch-query-editor)
- [Templates and variables](ref:cloudwatch-template-variables)
- [Configure AWS authentication](ref:cloudwatch-aws-authentication)
- [Configure the CloudWatch data source](/docs/plugins/cloudwatch/latest/configure/)
- [CloudWatch query editor](/docs/plugins/cloudwatch/latest/query-editor/)
- [Templates and variables](/docs/plugins/cloudwatch/latest/template-variables/)
- [Configure AWS authentication](/docs/plugins/cloudwatch/latest/aws-authentication/)

## Import pre-configured dashboards

Expand Down Expand Up @@ -149,12 +65,12 @@ To customize one of these dashboards, Grafana recommends saving it under a diffe

After installing and configuring the Amazon CloudWatch data source, you can:

- Create a wide variety of [visualizations](ref:visualizations)
- Configure and use [templates and variables](ref:variables)
- Add [transformations](ref:transformations)
- Add [annotations](ref:annotate-visualizations)
- Set up [alerting](ref:alerting)
- Optimize performance with [query caching](ref:query-caching)
- Create a wide variety of [visualizations](docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/)
- Configure and use [templates and variables](/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/)
- Add [transformations](/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data/)
- Add [annotations](/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/annotate-visualizations/)
- Set up [alerting](/docs/grafana/<GRAFANA_VERSION>/alerting/)
- Optimize performance with [query caching](/docs/grafana/<GRAFANA_VERSION>/administration/data-source-management/#query-and-resource-caching)

## Control pricing

Expand Down
24 changes: 7 additions & 17 deletions docs/sources/aws-authentication/index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
aliases:
- ../../data-sources/aws-cloudwatch/aws-authentication/
- ../../data-sources/elasticsearch/aws-authentication/
- /docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/
- ../cloudwatch/
- ../../../data-sources/aws-cloudwatch/aws-authentication/
- ../../../datasources/aws-cloudwatch/aws-authentication/
- ../../../data-sources/elasticsearch/aws-authentication/
- ../../../datasources/elasticsearch/aws-authentication/
- ../../cloudwatch/
description: Guide to configuring AWS authentication in Grafana
keywords:
- grafana
Expand All @@ -17,17 +18,6 @@ labels:
menuTitle: AWS authentication
title: Configure AWS authentication
weight: 400
refs:
configure-grafana-assume-role-enabled:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#assume_role_enabled
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#assume_role_enabled
configure-grafana-allowed-auth-providers:
- pattern: /docs/grafana/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#allowed_auth_providers
- pattern: /docs/grafana-cloud/
destination: /docs/grafana/latest/setup-grafana/configure-grafana/#allowed_auth_providers
---

# Configure AWS authentication
Expand All @@ -50,7 +40,7 @@ This document explores the following topics:

Available authentication methods depend on your configuration and the environment where Grafana runs.

Open source Grafana enables the `AWS SDK Default`, `Credentials file`, and `Access and secret key` methods by default. Cloud Grafana enables `Access and secret key` and `Grafana Assume Role` by default. Users with server configuration access can enable or disable specific auth providers as needed. For more information, refer to the [`allowed_auth_providers` documentation](ref:configure-grafana-allowed-auth-providers).
Open source Grafana enables the `AWS SDK Default`, `Credentials file`, and `Access and secret key` methods by default. Cloud Grafana enables `Access and secret key` and `Grafana Assume Role` by default. Users with server configuration access can enable or disable specific auth providers as needed. For more information, refer to the [`allowed_auth_providers` documentation](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#allowed_auth_providers).

- `AWS SDK Default` uses the [default provider](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html) from the [AWS SDK for Go](https://github.com/aws/aws-sdk-go) without custom configuration.
This method requires configuring AWS credentials outside Grafana through [the CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html), or by [attaching credentials directly to an EC2 instance](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html), [in an ECS task](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html), or for a [Service Account in a Kubernetes cluster](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html). You can attach permissions directly to the data source with AWS SDK Default or combine it with the optional [`Assume Role ARN`](#assume-a-role) field.
Expand Down Expand Up @@ -81,7 +71,7 @@ Instead, assume role functionality lets you use one set of AWS credentials acros

If the **Assume Role ARN** field is left empty, Grafana uses the provided credentials from the selected authentication method directly, and permissions to AWS data must be attached directly to those credentials. The **Assume Role ARN** field is optional for all authentication methods except for Grafana Assume Role.

To disable this feature in open source Grafana or Grafana Enterprise, refer to [`assume_role_enabled`](ref:configure-grafana-assume-role-enabled).
To disable this feature in open source Grafana or Grafana Enterprise, refer to [`assume_role_enabled`](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#assume_role_enabled).

### Use an external ID

Expand Down
Loading
Loading