-
Notifications
You must be signed in to change notification settings - Fork 11.7k
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
alerting: integrations > small update #87538
Merged
Merged
+12
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tonypowa
added
type/docs
no-changelog
Skip including change in changelog/release notes
backport v11.0.x
Mark PR for automatic backport to v11.0.x
labels
May 9, 2024
This PR must be merged before a backport PR will be created. |
1 similar comment
This PR must be merged before a backport PR will be created. |
brendamuir
approved these changes
May 9, 2024
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-87538-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 3a2c9f4898cee953f8b689ef3488583955a15a6c When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-87538-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87538 --json body --template 'Backport 3a2c9f4898cee953f8b689ef3488583955a15a6c from #87538{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] alerting: integrations > small update" --body-file - --label "type/docs" --label "no-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-87538-to-v11.0.x
# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-87538-to-v11.0.x`.
# Remove the local backport branch
git switch main
git branch -D backport-87538-to-v11.0.x |
grafana-delivery-bot
bot
added
the
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
label
May 9, 2024
obetomuniz
added a commit
that referenced
this pull request
May 9, 2024
…-tracker * gops-configuration-tracker: (51 commits) Reorganize hooks into separate folders/files for each app add aria and properties role for Progressbar Address pr review comments part1 Update dependency @opentelemetry/semantic-conventions to v1.24.1 (#87544) update test Update dependency @grafana/scenes to v4.17.2 fix logic behind default contact point check new yarn version Update Yarn to v4.2.2 remove unnecessary AlertmanagerProvider alerting: integrations > small update (#87538) RBAC: Adding action set resolver for RBAC evaluation (#86801) Frontend: Improve barrel file detection in codemod (#87389) Unified Storage: Add SQL template package (#87524) Sql Expressions: use display name for sql tables (#87530) Azure Monitor: Update grafana-azure-sdk-go to v2.0.3 (#87480) Timeseries: Fix incorrect threshold style (#87521) GRPC Server: Add README (#87442) Ephemeral instances: update go version (#87526) Scopes: Add a /find query endpoint (#87457) ...
tonypowa
added a commit
that referenced
this pull request
May 11, 2024
* added links to list * changed heading (cherry picked from commit 3a2c9f4)
tonypowa
added a commit
that referenced
this pull request
May 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport v11.0.x
Mark PR for automatic backport to v11.0.x
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
no-changelog
Skip including change in changelog/release notes
type/docs
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?