Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CloudWatch: Cross-account querying support #59362

Merged
merged 45 commits into from Nov 28, 2022

Conversation

sunker
Copy link
Contributor

@sunker sunker commented Nov 28, 2022

What is this feature?

This PR adds cross-account querying support for logs and metrics.

Note: This feature is currently behind the cloudWatchCrossAccountQuerying feature toggle.

You can enable feature toggles through configuration file or environment variables. See configuration docs for details.
Grafana Cloud users can access this feature by opening a support ticket in the Cloud Portal.

You can read more about this feature in the CloudWatch plugin documentation and in the official CloudWatch docs.

Which issue(s) does this PR fix?:

Fixes #59361

All changes in the PR have already been reviewed in smaller PR's in a private repo.

@sunker sunker added datasource/CloudWatch add to changelog datasource/CloudWatch Logs Issues related to Cloudwatch Logs in the Cloudwatch data source. backport v9.3.x labels Nov 28, 2022
@sunker sunker added this to the 9.3.0 milestone Nov 28, 2022
@sunker sunker requested review from a team and joshhunt as code owners November 28, 2022 07:36
@sunker sunker requested a review from a team November 28, 2022 07:36
@sunker sunker requested review from a team, Eve832 and GrafanaWriter as code owners November 28, 2022 07:36
@sunker sunker requested review from asimpson, andresmgot, iwysiu, idastambuk, yaelleC, academo, codeincarnate, zoltanbedi and sakjur and removed request for a team November 28, 2022 07:36
sarahzinger and others added 4 commits November 28, 2022 08:45
* wip docs

* change wordings

* add sections about metrics and logs

* change from monitoring to observability

* Update docs/sources/datasources/aws-cloudwatch/_index.md

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

* Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md

Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>

* Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md

Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>

* Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

* Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md

Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>

* apply pr feedback

* fix file name

* more pr feedback

* pr feedback

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>
@sunker sunker force-pushed the cloudwatch/cross-account-observability branch from 74e6eb3 to c322054 Compare November 28, 2022 07:46
@github-actions
Copy link
Contributor

Backend code coverage report for PR #59362

Plugin Main PR Difference
cloudwatch 83.7% 83.6% -.1%

@github-actions
Copy link
Contributor

github-actions bot commented Nov 28, 2022

Frontend code coverage report for PR #59362

Plugin Main PR Difference
cloudwatch 88.86% 89.33% .47%

@sunker sunker changed the title Cloudwatch: Cross-account querying support CloudWatch: Cross-account querying support Nov 28, 2022
@fridgepoet fridgepoet self-requested a review November 28, 2022 11:33
@sunker
Copy link
Contributor Author

sunker commented Nov 28, 2022

Docs changed have already been reviewed in a separate PR so I'm gonna go ahead and merge this.

@sunker sunker merged commit 254577b into main Nov 28, 2022
@sunker sunker deleted the cloudwatch/cross-account-observability branch November 28, 2022 11:39
@sunker sunker added product-approved Pull requests that are approved by product/managers and are allowed to be backported and removed missing-labels labels Nov 28, 2022
@grafanabot
Copy link
Contributor

The backport to v9.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-59362-to-v9.3.x origin/v9.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 254577ba568d8010dcc96446e788866d618c96c8
# Push it to GitHub
git push --set-upstream origin backport-59362-to-v9.3.x
git switch main
# Remove the local backport branch
git branch -D backport-59362-to-v9.3.x

Then, create a pull request where the base branch is v9.3.x and the compare/head branch is backport-59362-to-v9.3.x.

@grafanabot grafanabot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Nov 28, 2022
@sunker
Copy link
Contributor Author

sunker commented Nov 28, 2022

Manual backport #59389

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend area/frontend backport v9.3.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. datasource/Azure Azure Monitor Datasource datasource/CloudWatch Logs Issues related to Cloudwatch Logs in the Cloudwatch data source. datasource/CloudWatch product-approved Pull requests that are approved by product/managers and are allowed to be backported type/docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CloudWatch: Add support for cross-account querying
4 participants