From 82e8ad8a0f40df9cb2128fc0943a91ce0f2d14a9 Mon Sep 17 00:00:00 2001 From: Sarah Zinger Date: Fri, 27 Jan 2023 16:46:08 -0500 Subject: [PATCH] Cloudwatch: Set CloudwatchCrossAccountQuery feature to stable (#62348) * Cloudwatch: Set CloudwatchCrossAccountQuery feature to stable Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> --- docs/sources/datasources/aws-cloudwatch/_index.md | 8 +++++++- .../datasources/aws-cloudwatch/query-editor/index.md | 9 --------- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 5 +++-- pkg/services/featuremgmt/toggles_gen.go | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/sources/datasources/aws-cloudwatch/_index.md b/docs/sources/datasources/aws-cloudwatch/_index.md index 9fc5edc9bd3..2df89e86dc5 100644 --- a/docs/sources/datasources/aws-cloudwatch/_index.md +++ b/docs/sources/datasources/aws-cloudwatch/_index.md @@ -167,7 +167,7 @@ You can attach these permissions to the IAM role or IAM user you configured in [ } ``` -**Cross-account observability:** +**Cross-account observability: (see below) ** ```json { @@ -369,3 +369,9 @@ If you use multiple regions or configured more than one CloudWatch data source t To request a quota increase, visit the [AWS Service Quotas console](https://console.aws.amazon.com/servicequotas/home?r#!/services/monitoring/quotas/L-5E141212). For more information, refer to the AWS documentation for [Service Quotas](https://docs.aws.amazon.com/servicequotas/latest/userguide/intro.html) and [CloudWatch limits](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html). + +## Cross-account observability + +The CloudWatch plugin enables you to monitor and troubleshoot applications across multiple regional accounts. Using cross-account observability, you can seamlessly search, visualize and analyze metrics and logs without worrying about account boundaries. + +To use this feature, configure in the [AWS console under Cloudwatch Settings](https://aws.amazon.com/blogs/aws/new-amazon-cloudwatch-cross-account-observability/), a monitoring and source account, and then add the necessary IAM permissions as described above. diff --git a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md index fe91bc93cbc..37d85968eca 100644 --- a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md +++ b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md @@ -218,15 +218,6 @@ When making `stats` queries in [Explore]({{< relref "../../../explore/" >}}), ma {{< figure src="/static/img/docs/v70/explore-mode-switcher.png" max-width="500px" class="docs-image--right" caption="Explore mode switcher" >}} -## Cross-account observability - -The CloudWatch plugin provides the ability to monitor and troubleshoot applications that span across multiple accounts within a region. Using cross-account observability, you can seamlessly search, visualize and analyze metrics and logs, without having to worry about account boundaries. - -> **Note:** This feature is currently behind the `cloudWatchCrossAccountQuerying` feature toggle. - -> You can enable feature toggles through configuration file or environment variables. See configuration [docs]({{< relref "../../../setup-grafana/configure-grafana/#feature_toggles" >}}) for details. -> Grafana Cloud users can access this feature by [opening a support ticket in the Cloud Portal](https://grafana.com/profile/org#support). - ### Getting started To enable cross-account observability, first enable it in CloudWatch using the official [CloudWatch docs](http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html), then add [two new API actions]({{< relref "../#cross-account-observability" >}}) to the IAM policy attached to the role/user running the plugin. diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index bcec59423e3..a404c8b6f33 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -28,6 +28,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `commandPalette` | Enable command palette | Yes | | `cloudWatchDynamicLabels` | Use dynamic labels instead of alias patterns in CloudWatch datasource | Yes | | `internationalization` | Enables internationalization | Yes | +| `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes | | `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token | | | `disablePrometheusExemplarSampling` | Disable Prometheus examplar sampling | | | `logsSampleInExplore` | Enables access to the logs sample feature in Explore | Yes | @@ -84,7 +85,6 @@ Alpha features might be changed or removed without prior notice. | `dataConnectionsConsole` | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | | `topnav` | New top nav and page layouts | | `flameGraph` | Show the flame graph | -| `cloudWatchCrossAccountQuerying` | Use cross-account querying in CloudWatch datasource | | `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | | `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | | `increaseInMemDatabaseQueryCache` | Enable more in memory caching for database queries | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 6db9cb8d4bc..e27478fa809 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -305,8 +305,9 @@ var ( }, { Name: "cloudWatchCrossAccountQuerying", - Description: "Use cross-account querying in CloudWatch datasource", - State: FeatureStateAlpha, + Description: "Enables cross-account querying in CloudWatch datasources", + State: FeatureStateStable, + Expression: "true", //enabled by default }, { Name: "redshiftAsyncQueryDataSupport", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 617186f858d..737d8483c0e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -220,7 +220,7 @@ const ( FlagFlameGraph = "flameGraph" // FlagCloudWatchCrossAccountQuerying - // Use cross-account querying in CloudWatch datasource + // Enables cross-account querying in CloudWatch datasources FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying" // FlagRedshiftAsyncQueryDataSupport