Skip to content

Commit 4429870

Browse files
genebeanpracucci
authored andcommitted
Release prep 0.3.0 (grafana#15)
* Ran pdk update for 1.15.0 * Update docs This resolves a couple of errors that were called out by the changelog gem. * Bump version to 0.3.0
1 parent aa6eb87 commit 4429870

File tree

6 files changed

+26
-24
lines changed

6 files changed

+26
-24
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
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+
## [0.3.0](https://github.com/grafana/puppet-promtail/tree/0.3.0) (2020-01-13)
6+
7+
[Full Changelog](https://github.com/grafana/puppet-promtail/compare/0.2.0...0.3.0)
8+
9+
### Added
10+
11+
- Bump default promtail version to v1.2.0 [\#14](https://github.com/grafana/puppet-promtail/pull/14) ([genebean](https://github.com/genebean))
12+
- Add example of merging scrape configs from Hiera [\#13](https://github.com/grafana/puppet-promtail/pull/13) ([genebean](https://github.com/genebean))
13+
14+
### Fixed
15+
16+
- Release file name changed from version v0.4.0 [\#12](https://github.com/grafana/puppet-promtail/pull/12) ([LDaneliukas](https://github.com/LDaneliukas))
17+
- Modify the type of archive depending on release version [\#11](https://github.com/grafana/puppet-promtail/pull/11) ([LDaneliukas](https://github.com/LDaneliukas))
18+
519
## [0.2.0](https://github.com/grafana/puppet-promtail/tree/0.2.0) (2019-12-12)
620

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

REFERENCE.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -176,32 +176,20 @@ for all parameters.
176176

177177
Default value: `undef`
178178

179-
##### `$password_file_path`
180-
181-
Data type: `Optional[Stdlib::Absolutepath]`
182-
183-
The fully qualified path to the file containing the password used for basic auth
184-
185-
##### `$password_file_content`
186-
187-
Data type: `Optional[Sensitive[String[1]]]`
188-
189-
The value to be placed in the password file. This value is cast to Sensitive via
190-
lookup_options defined in data/common.yaml
191-
192179
##### `password_file_path`
193180

194181
Data type: `Optional[Stdlib::Absolutepath]`
195182

196-
183+
The fully qualified path to the file containing the password used for basic auth
197184

198185
Default value: `undef`
199186

200187
##### `password_file_content`
201188

202189
Data type: `Optional[Sensitive[String[1]]]`
203190

204-
191+
The value to be placed in the password file. This value is cast to Sensitive via
192+
lookup_options defined in `data/common.yaml`
205193

206194
Default value: `undef`
207195

lib/puppet/functions/promtail/strip_yaml_header.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# A function to strip the --- from the beginning of a string
22
Puppet::Functions.create_function(:'promtail::strip_yaml_header') do
3-
# @param [String] yaml_string
3+
# @param yaml_string
44
# A string that may start with the ---'s used to denote a YAML file
55
# @return [String]
66
# Returns the string with the leading header stripped off

lib/puppet/functions/promtail/to_yaml.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# A function to convert a hash into yaml for the promtail config
44
Puppet::Functions.create_function(:'promtail::to_yaml') do
5-
# @param [Hash] config_hash
5+
# @param config_hash
66
# A Puppet hash to be converted into YAML
77
# @return [String]
88
# Returns the YAML version of the hash as a string

manifests/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@
4747
# See https://github.com/grafana/loki/blob/master/docs/clients/promtail/configuration.md
4848
# for all parameters.
4949
#
50-
# @param [Optional[Stdlib::Absolutepath]] $password_file_path
50+
# @param [Optional[Stdlib::Absolutepath]] password_file_path
5151
# The fully qualified path to the file containing the password used for basic auth
5252
#
53-
# @param [Optional[Sensitive[String[1]]]] $password_file_content
53+
# @param [Optional[Sensitive[String[1]]]] password_file_content
5454
# The value to be placed in the password file. This value is cast to Sensitive via
55-
# lookup_options defined in data/common.yaml
55+
# lookup_options defined in `data/common.yaml`
5656
#
5757
# @example
5858
# include promtail

metadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grafana-promtail",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"author": "grafana",
55
"summary": "Deploy and configure Grafana's Promtail",
66
"license": "Apache-2.0",
@@ -69,7 +69,7 @@
6969
"version_requirement": ">= 4.10.0 < 7.0.0"
7070
}
7171
],
72-
"pdk-version": "1.14.1",
73-
"template-url": "pdk-default#1.14.1",
74-
"template-ref": "1.14.1-0-g0b5b39b"
72+
"pdk-version": "1.15.0",
73+
"template-url": "pdk-default#1.15.0",
74+
"template-ref": "tags/1.15.0-0-g0bc522e"
7575
}

0 commit comments

Comments
 (0)