Skip to content

Commit 7677cce

Browse files
Merge pull request #33 from jarretlavallee/maint/master/release_pdk
5.3.0 Release
2 parents 4b2495b + 6430c08 commit 7677cce

File tree

4 files changed

+33
-10
lines changed

4 files changed

+33
-10
lines changed

.rubocop.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ Bundler/DuplicatedGem:
2222
Enabled: false
2323
Bundler/OrderedGems:
2424
Enabled: false
25+
GetText/DecorateFunctionMessage:
26+
Enabled: false
27+
GetText/DecorateString:
28+
Enabled: false
29+
GetText/DecorateStringFormattingUsingInterpolation:
30+
Enabled: false
31+
GetText/DecorateStringFormattingUsingPercent:
32+
Enabled: false
2533
Layout/AccessModifierIndentation:
2634
Enabled: false
2735
Layout/AlignArray:
@@ -694,6 +702,3 @@ Style/YodaCondition:
694702
Enabled: false
695703
Style/ZeroLengthPredicate:
696704
Enabled: false
697-
GetText/DecorateString:
698-
Exclude:
699-
- 'files/generate_system_metrics'

CHANGELOG.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1+
# Minor Release 5.3.0
2+
3+
## Improvements
4+
- Enable FOSS support with Puppetserver collection
5+
- [PR #23](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/23)
6+
- Remove `127.0.0.1` special case naming
7+
- [PR #26](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/26)
8+
- Add the ability to generate system metrics
9+
- [PR #28](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/28)
10+
- [PR #30](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/30)
11+
- Make the output files smaller by excluding metrics and not pretty printing
12+
- [PR #29](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/29)
13+
14+
## Changes
15+
- Add a newline to STDOUT of the processing script
16+
- [PR #27](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/27)
17+
118
# Minor Release 5.2.0
219

320
## Improvements
4-
- Add ability to send metrics data directly to influxdb, graphite,
5-
or splunk ( in combination with the splunk_hec module )
6-
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/19
21+
- Add ability to send metrics data directly to influxdb, graphite,
22+
or splunk ( in combination with the splunk_hec module )
23+
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/19
724

825
## Changes
926
- Update metadata dependency information to reflect support for
1027
puppetlabs/stdlib 6.x
11-
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/22
28+
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/22
1229

1330
# Patch Release 5.1.2
1431

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-puppet_metrics_collector",
3-
"version": "5.2.0",
3+
"version": "5.3.0",
44
"author": "npwalker",
55
"summary": "A Puppet module for gathering metrics from PE components",
66
"license": "Apache-2.0",
@@ -68,7 +68,7 @@
6868
"version_requirement": ">= 4.2.1"
6969
}
7070
],
71-
"pdk-version": "1.12.0",
71+
"pdk-version": "1.14.1",
7272
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
73-
"template-ref": "heads/master-0-g66e1443"
73+
"template-ref": "heads/master-0-g643529a"
7474
}

spec/default_facts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Facts specified here will override the values provided by rspec-puppet-facts.
44
---
55
ipaddress: "172.16.254.254"
6+
ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
67
is_pe: false
78
macaddress: "AA:AA:AA:AA:AA:AA"
89
pe_server_version: 2016.4.5

0 commit comments

Comments
 (0)