grafana / grafana

The open and composable observability and data visualization platform. Visualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more.
https://grafana.com
GNU Affero General Public License v3.0
60.72k stars 11.61k forks source link

Cloudwatch: Update grafana-aws-sdk to fix sts endpoints #87326

Closed iwysiu closed 2 weeks ago

iwysiu commented 2 weeks ago

Updates the grafana-aws-sdk to get the fix for custom sts endpoints and fips endpoints.

Which issue(s) does this PR fix?:

Fixes #86496

Special notes for your reviewer:

Please check that:

grafana-delivery-bot[bot] commented 2 weeks ago

Hello @iwysiu! Backport pull requests need to be either:

Please, if the current pull request addresses a bug fix, label it with the type/bug label. If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label. If the pull request modifies CI behaviour, please add the type/ci label. If none of the above applies, please consider removing the backport label and target the next major/minor release. Thanks!

grafana-delivery-bot[bot] commented 2 weeks ago

Hello @iwysiu! Backport pull requests need to be either:

Please, if the current pull request addresses a bug fix, label it with the type/bug label. If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label. If the pull request modifies CI behaviour, please add the type/ci label. If none of the above applies, please consider removing the backport label and target the next major/minor release. Thanks!

grafana-delivery-bot[bot] commented 2 weeks ago

This PR must be merged before a backport PR will be created.

grafana-delivery-bot[bot] commented 2 weeks ago

The backport to v10.4.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-87326-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5aeaeb6e9003e530d5ffea648a851f951d24557c

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-87326-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87326 --json body --template 'Backport 5aeaeb6e9003e530d5ffea648a851f951d24557c from #87326{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.4.x] Cloudwatch: Update grafana-aws-sdk to fix sts endpoints" --body-file - --label "type/bug" --label "area/backend" --label "add to changelog" --label "backport" --base v10.4.x --milestone 10.4.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-87326-to-v10.4.x

# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87326-to-v10.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87326-to-v10.4.x
grafana-delivery-bot[bot] commented 2 weeks ago

The backport to v11.0.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-87326-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5aeaeb6e9003e530d5ffea648a851f951d24557c

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-87326-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87326 --json body --template 'Backport 5aeaeb6e9003e530d5ffea648a851f951d24557c from #87326{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] Cloudwatch: Update grafana-aws-sdk to fix sts endpoints" --body-file - --label "type/bug" --label "area/backend" --label "add to changelog" --label "backport" --base v11.0.x --milestone 11.0.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-87326-to-v11.0.x

# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-87326-to-v11.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87326-to-v11.0.x