Skip to content

Commit b9d8313

Browse files
authored
Merge branch 'master' into feature/failed-response-retry
2 parents 9e775eb + 93f82b7 commit b9d8313

File tree

127 files changed

+2146
-1001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2146
-1001
lines changed

.github/ISSUE_TEMPLATE/minor-release.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ labels: "domain: releasing"
1111
Note the preparation steps are now automated. You can run:
1212

1313
```shell
14-
export NEW_VERSION=0.47.0 # replace this with the actual new version
14+
export NEW_VERSION=<new Vector version> # replace this with the actual new version
1515
export MINOR_VERSION=$(echo "$NEW_VERSION" | cut -d. -f2)
1616
export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
1717
export RELEASE_BRANCH=v0."${MINOR_VERSION}"
18-
export NEW_VRL_VERSION=0.42.0 # replace this with the actual new VRL version
18+
export NEW_VRL_VERSION=<new VRL version> # replace this with the actual new VRL version
19+
vdev release prepare --version "${NEW_VERSION}" --vrl-version "${NEW_VRL_VERSION}"
1920
```
2021

2122
# The week before the release

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
1-
<!--
2-
Your PR title must conform to the conventional commit spec:
3-
https://www.conventionalcommits.org/en/v1.0.0/
4-
5-
<type>(<scope>)!: <description>
6-
7-
* `type` = chore, enhancement, feat, fix, docs, revert
8-
* `!` = OPTIONAL: signals a breaking change
9-
* `scope` = Optional when `type` is "chore" or "docs", available scopes https://github.com/vectordotdev/vector/blob/master/.github/workflows/semantic.yml#L31
10-
* `description` = short description of the change
11-
12-
Examples:
13-
14-
* enhancement(file source): Add `sort` option to sort discovered files
15-
* feat(new source): Initial `statsd` source
16-
* fix(file source): Fix a bug discovering new files
17-
* chore(external docs): Clarify `batch_size` option
18-
-->
19-
201
## Summary
212
<!-- Please provide a brief summary about what this PR does.
223
This should help the reviewers give feedback faster and with higher quality. -->
234

5+
## Vector configuration
6+
<!-- Include Vector configuration(s) you used to test and debug your changes. -->
7+
8+
## How did you test this PR?
9+
<!-- Please describe how you tested your changes. Also include any information about your setup. -->
10+
2411
## Change Type
2512
- [ ] Bug fix
2613
- [ ] New feature
@@ -31,38 +18,50 @@ This should help the reviewers give feedback faster and with higher quality. -->
3118
- [ ] Yes
3219
- [ ] No
3320

34-
## How did you test this PR?
35-
<!-- Please describe your testing plan here.
36-
Sharing information about your setup and the Vector configuration(s) you used (when applicable) is highly recommended.
37-
Providing this information upfront will facilitate a smoother review process. -->
38-
3921
## Does this PR include user facing changes?
4022

4123
- [ ] Yes. Please add a changelog fragment based on our [guidelines](https://github.com/vectordotdev/vector/blob/master/changelog.d/README.md).
42-
- [ ] No. A maintainer will apply the "no-changelog" label to this PR.
24+
- [ ] No. A maintainer will apply the `no-changelog` label to this PR.
25+
26+
## References
27+
28+
<!--
29+
- Closes: #<issue number>
30+
- Related: #<issue number>
31+
- Related: #<PR number>
32+
-->
4333

4434
## Notes
4535
- Please read our [Vector contributor resources](https://github.com/vectordotdev/vector/tree/master/docs#getting-started).
4636
- Do not hesitate to use `@vectordotdev/vector` to reach out to us regarding this PR.
47-
- The CI checks run only after we manually approve them.
37+
- Some CI checks run only after we manually approve them.
4838
- We recommend adding a `pre-push` hook, please see [this template](https://github.com/vectordotdev/vector/blob/master/CONTRIBUTING.md#Pre-push).
4939
- Alternatively, we recommend running the following locally before pushing to the remote branch:
5040
- `cargo fmt --all`
5141
- `cargo clippy --workspace --all-targets -- -D warnings`
5242
- `cargo nextest run --workspace` (alternatively, you can run `cargo test --all`)
53-
- `./scripts/check_changelog_fragments.sh`
5443
- After a review is requested, please avoid force pushes to help us review incrementally.
5544
- Feel free to push as many commits as you want. They will be squashed into one before merging.
5645
- For example, you can run `git merge origin master` and `git push`.
5746
- If this PR introduces changes Vector dependencies (modifies `Cargo.lock`), please
5847
run `cargo vdev build licenses` to regenerate the [license inventory](https://github.com/vectordotdev/vrl/blob/main/LICENSE-3rdparty.csv) and commit the changes (if any). More details [here](https://crates.io/crates/dd-rust-license-tool).
5948

60-
## References
61-
62-
<!-- Please list any issues closed by this PR. -->
6349

6450
<!--
65-
- Closes: <issue link>
66-
-->
51+
Your PR title must conform to the conventional commit spec:
52+
https://www.conventionalcommits.org/en/v1.0.0/
53+
54+
<type>(<scope>)!: <description>
6755
68-
<!-- Any other issues or PRs relevant to this PR? Feel free to list them here. -->
56+
* `type` = chore, enhancement, feat, fix, docs, revert
57+
* `!` = OPTIONAL: signals a breaking change
58+
* `scope` = Optional when `type` is "chore" or "docs", available scopes https://github.com/vectordotdev/vector/blob/master/.github/workflows/semantic.yml#L31
59+
* `description` = short description of the change
60+
61+
Examples:
62+
63+
* enhancement(file source): Add `sort` option to sort discovered files
64+
* feat(new source): Initial `statsd` source
65+
* fix(file source): Fix a bug discovering new files
66+
* chore(external docs): Clarify `batch_size` option
67+
-->

0 commit comments

Comments
 (0)