Skip to content

Commit 02e52a3

Browse files
authored
Merge pull request #32 from grafana/release_prep
2.0.0 Release Prep
2 parents 776e615 + 67aea77 commit 02e52a3

File tree

3 files changed

+34
-15
lines changed

3 files changed

+34
-15
lines changed

CHANGELOG.md

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,45 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5-
## [1.0.0](https://github.com/grafana/puppet-promtail/tree/1.0.0) (2020-11-02)
6-
7-
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.3.1...1.0.0)
5+
## [2.0.0](https://github.com/grafana/puppet-promtail/tree/2.0.0) (2021-07-30)
86

9-
### Added
7+
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/1.0.0...2.0.0)
108

11-
- Enable service by default [\#22](https://github.com/grafana/puppet-promtail/pull/22) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
12-
- bump default promtail version to v2.0.0 [\#20](https://github.com/grafana/puppet-promtail/pull/20) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
13-
- allow custom source-url [\#19](https://github.com/grafana/puppet-promtail/pull/19) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
9+
### Changed
1410

15-
## [0.3.1](https://github.com/grafana/puppet-promtail/tree/0.3.1) (2020-01-13)
11+
- Add support for newer dependencies versions [\#29](https://github.com/grafana/puppet-promtail/pull/29) ([BDelacour](https://github.com/BDelacour))
12+
- Drop EoL Puppet, update supported OSs, fix example [\#26](https://github.com/grafana/puppet-promtail/pull/26) ([genebean](https://github.com/genebean))
1613

17-
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.3.0...0.3.1)
14+
### Added
1815

19-
### Fixed
16+
- Add support for arm and arm64 architectures [\#28](https://github.com/grafana/puppet-promtail/pull/28) ([dmaes](https://github.com/dmaes))
2017

21-
- Updated default checksum on Linux [\#16](https://github.com/grafana/puppet-promtail/pull/16) ([genebean](https://github.com/genebean))
22-
23-
## [0.3.0](https://github.com/grafana/puppet-promtail/tree/0.3.0) (2020-01-13)
18+
## [1.0.0](https://github.com/grafana/puppet-promtail/tree/1.0.0) (2020-11-02)
2419

25-
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.2.0...0.3.0)
20+
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.3.1...1.0.0)
2621

2722
### Added
2823

24+
- Enable service by default [\#22](https://github.com/grafana/puppet-promtail/pull/22) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
25+
- bump default promtail version to v2.0.0 [\#20](https://github.com/grafana/puppet-promtail/pull/20) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
26+
- allow custom source-url [\#19](https://github.com/grafana/puppet-promtail/pull/19) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
2927
- Bump default promtail version to v1.2.0 [\#14](https://github.com/grafana/puppet-promtail/pull/14) ([genebean](https://github.com/genebean))
3028
- Add example of merging scrape configs from Hiera [\#13](https://github.com/grafana/puppet-promtail/pull/13) ([genebean](https://github.com/genebean))
3129

3230
### Fixed
3331

32+
- Updated default checksum on Linux [\#16](https://github.com/grafana/puppet-promtail/pull/16) ([genebean](https://github.com/genebean))
3433
- Release file name changed from version v0.4.0 [\#12](https://github.com/grafana/puppet-promtail/pull/12) ([LDaneliukas](https://github.com/LDaneliukas))
3534
- Modify the type of archive depending on release version [\#11](https://github.com/grafana/puppet-promtail/pull/11) ([LDaneliukas](https://github.com/LDaneliukas))
3635

36+
## [0.3.1](https://github.com/grafana/puppet-promtail/tree/0.3.1) (2020-01-13)
37+
38+
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.3.0...0.3.1)
39+
40+
## [0.3.0](https://github.com/grafana/puppet-promtail/tree/0.3.0) (2020-01-13)
41+
42+
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.2.0...0.3.0)
43+
3744
## [0.2.0](https://github.com/grafana/puppet-promtail/tree/0.2.0) (2019-12-12)
3845

3946
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.1.0...0.2.0)

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Deploy and configure Grafana's Promtail on a node.
1414
- [Changelog](#changelog)
1515
- [Limitations](#limitations)
1616
- [Development](#development)
17+
- [Module Release](#module-release)
1718

1819
## Description
1920

@@ -49,3 +50,14 @@ At the moment, this module only supports Linux. Future versions will support add
4950
## Development
5051

5152
Pull requests are welcome! A Vagrantfile is also included in this repository that can be used during development.
53+
54+
## Module Release
55+
56+
Follow the steps below to tag a new release and push to The Forge using GitHub Actions.
57+
58+
1. Ensure that all closed PRs are labeled appropriately.
59+
2. Create a "Release Prep" PR with the label "maintenance" containing changes made by the following:
60+
1. Bump the module version (X.Y.Z) in `metadata.json` as appropriate based on closed PRs since the previous release. (i.e. "backwards-incomptible" is an X "release", "feature" is a Y release, and "bugfix" is a Z release)
61+
2. Run `pdk bundle exec puppet strings generate --format markdown`. Any missing documentation will result in a failed pipeline.
62+
3. Run `pdk bundle exec rake changelog`. Any unlabeled PRs will result in a failed pipeline.
63+
3. Once the PR is merged, navigate to Actions --> Publish Module --> Run workflow --> select the main branch, and Run workflow.

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grafana-promtail",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"author": "grafana",
55
"summary": "Deploy and configure Grafana's Promtail",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)