Showing with 27 additions and 20 deletions.
  1. +17 −9 CHANGELOG.md
  2. +7 −8 functions/hosts_with_pe_profile.pp
  3. +3 −3 metadata.json
26 changes: 17 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
# Z Release 5.1.1
# Patch Release 5.1.2

## Changes:
- Update metadata dependency information to reflect support for
puppetlabs/stdlib 5.x
- Update Changelog terminology to use [semver term](https://semver.org/)
"Patch", rather than "Z"

# Patch Release 5.1.1

## Changes:
- Ensure nightly compression of metrics works with a large amount of files
- https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/8
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/8

# Minor Release 5.1.0

## Improvements
- Auto configure puppetserver and puppetdb hosts
- https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/5
- https://github.com/puppetlabs/puppetlabs-puppet\_metrics\_collector/pull/5

# Z Release 5.0.1
# Patch Release 5.0.1

## Changes:
- Convert module to standard PDK format
Expand Down Expand Up @@ -46,7 +54,7 @@ and migration work is performed smoothly.
- Add a script to zip up metrics for sharing
- [PR #41](https://github.com/npwalker/pe_metric_curl_cron_jobs/pull/41)

# Z Release 4.4.2
# Patch Release 4.4.2

## Bug Fixes:
- Tidy script does not work without bzip (not installed on RHEL 7 by default)
Expand All @@ -57,7 +65,7 @@ and migration work is performed smoothly.
- Config file could change every run if you use puppetdb_query to find the hosts
- [PR #42](https://github.com/npwalker/pe_metric_curl_cron_jobs/pull/42)

# Z Release 4.4.1
# Patch Release 4.4.1

## Bug Fixes:
- PuppetDB metrics could not be gathered by default in PE < 2016.4.0
Expand All @@ -76,13 +84,13 @@ and migration work is performed smoothly.
- No longer pass certificates to connect to metrics endpoint
- [PR #34](https://github.com/npwalker/pe_metric_curl_cron_jobs/pull/34)

# Z Release 4.2.2
# Patch Release 4.2.2

## Bug Fixes:
- Tidy cron jobs would only delete metric files exactly retention_days away
- [PR #33](https://github.com/npwalker/pe_metric_curl_cron_jobs/pull/33)

# Z Release 4.2.1
# Patch Release 4.2.1

## Bug Fixes:
- PE versions < 2016.2 now GET each metric individually instead of using a POST
Expand Down Expand Up @@ -133,7 +141,7 @@ the output of the module then you may need to update to the new names of the met
- Each component now has its own class to allow customizing parameters per
component

# Z Release 3.0.1
# Patch Release 3.0.1

## Bug Fixes:
- Stagger compression of files between midnight and 3AM to prevent a CPU spike
Expand Down
15 changes: 7 additions & 8 deletions functions/hosts_with_pe_profile.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ function puppet_metrics_collector::hosts_with_pe_profile($profile) {
type = 'Class' and
title = 'Puppet_enterprise::Profile::${_profile}' and
nodes { deactivated is null and expired is null }
}").map |$nodes| {
if $nodes['certname'] == $settings::certname {
'127.0.0.1'
} else {
$nodes['certname']
}
}
}").map |$nodes| {
if $nodes['certname'] == $settings::certname {
'127.0.0.1'
} else {
$nodes['certname']
}
}
} else {
$hosts = []
}
Expand All @@ -37,4 +37,3 @@ function puppet_metrics_collector::hosts_with_pe_profile($profile) {
sort($hosts)
}
}

6 changes: 3 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-puppet_metrics_collector",
"version": "5.1.1",
"version": "5.1.2",
"author": "npwalker",
"summary": "A Puppet module for gathering metrics from PE components",
"license": "Apache-2.0",
Expand All @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs-stdlib",
"version_requirement": ">= 2.6.0 < 5.0.0"
"version_requirement": ">= 2.6.0 < 6.0.0"
}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -71,4 +71,4 @@
"pdk-version": "1.9.0.pre (heads/master-0-g7b2950b)",
"template-url": "https://github.com/puppetlabs/pdk-templates",
"template-ref": "heads/master-0-g7281db5"
}
}