-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2babb8f
commit 10230a2
Showing
12 changed files
with
1,977 additions
and
1 deletion.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<!-- | ||
Thank you for sending a pull request! Here are some tips: | ||
1. If this is your first time, please read our contribution guide at https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md | ||
2. Ensure you include and run the appropriate tests as part of your Pull Request. | ||
3. In a new feature or configuration option, an update to the documentation is necessary. Everything related to the documentation is under the docs folder in the root of the repository. | ||
4. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such. | ||
5. If you can not merge your Pull Request due to a merge conflict, Rebase it. This gets it in sync with the main branch. | ||
6. Name your PR as "<FeatureArea>: Describe your change", e.g. Alerting: Prevent race condition. If it's a fix or feature relevant for the changelog describe the user impact in the title. The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label. | ||
7. If your PR content should be added to the What's New document for the next major or minor release, add the **add to what's new** label to your PR. Note that you should add this label to the main PR that introduces the feature; do not add this label to smaller PRs for the feature. | ||
--> | ||
|
||
**What is this feature?** | ||
|
||
[Add a brief description of what the feature or update does.] | ||
|
||
**Why do we need this feature?** | ||
|
||
[Add a description of the problem the feature is trying to solve.] | ||
|
||
**Who is this feature for?** | ||
|
||
[Add information on what kind of user the feature is for.] | ||
|
||
**Which issue(s) does this PR fix?**: | ||
|
||
<!-- | ||
- Automatically closes linked issue when the Pull Request is merged. | ||
Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)" | ||
--> | ||
|
||
Fixes # | ||
|
||
**Special notes for your reviewer:** | ||
|
||
Please check that: | ||
- [ ] It works as expected from a user's perspective. | ||
- [ ] If this is a pre-GA feature, it is behind a feature toggle. | ||
- [ ] The docs are updated, and if this is a [notable improvement](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/#how-to-determine-if-content-belongs-in-a-whats-new-document), it's added to our [What's New](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/) doc. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# GitHub & grafanabot automation | ||
|
||
The bot is configured via [commands.json](https://github.com/grafana/grafana/blob/main/.github/commands.json) and some other GitHub workflows [workflows](https://github.com/grafana/grafana/tree/main/.github/workflows). | ||
|
||
Comment commands: | ||
|
||
* Write the word `/duplicate #<number>` anywhere in a comment and the bot will add the correct label and standard message. | ||
* Write the word `/needsMoreInfo` anywhere in a comment and the bot will add the correct label and standard message. | ||
|
||
Label commands: | ||
|
||
* Add label `bot/question` the the bot will close with standard question message and add label `type/question` | ||
* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate` | ||
* Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above) | ||
* Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented` | ||
* Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days. | ||
|
||
## Metrics | ||
|
||
Metrics are configured in [metrics-collector.json](https://github.com/grafana/grafana/blob/main/.github/metrics-collector.json) and are also defined in the | ||
[metrics-collector](https://github.com/grafana/grafana-github-actions/blob/main/metrics-collector/index.ts) GitHub action. | ||
|
||
## Backport PR | ||
|
||
To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport <branch-name>`. Once merged grafanabot will automatically | ||
try to cherry-pick the PR merge commit into that branch and open a PR. You must then add the milestone to your backport PR. | ||
|
||
If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. | ||
|
||
The backport logic is written [here](https://github.com/grafana/grafana-github-actions/blob/main/backport/backport.ts) |
Oops, something went wrong.