.travis.yml

@@ -1,11 +1,15 @@
 ---
+os: linux
 dist: xenial
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system $RUBYGEMS_VERSION
+  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
+  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
+  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
@@ -20,7 +24,7 @@ stages:
   -
     if: tag =~ ^v\d
     name: deploy
-matrix:
+jobs:
   fast_finish: true
   include:
     -

CHANGELOG.md

@@ -1,3 +1,38 @@
+# Major Release 6.0.0
+
+This is a major release as it drops support for Puppet 4.x and versions of PE
+based upon Puppet 4.x. If you are using those unsupported versions of PE, 
+continue to use version 5.3.0.
+
+Refer to the README for limitations regarding the collection of remote 
+PuppetDB metrics, and a workaround.
+
+If using this module with the Puppet Metrics Dashboard,
+upgrade to version 2.2.0 or later of that module.
+
+## Improvements
+ - Switch from the v1 to v2 Metrics API for additional metrics (for PuppetDB)
+ - Collect ACE and Bolt service metrics
+ - Reorganize into service and system classes
+ - Move duplicate code from service classes to defined types
+ - Move templated per-service tidy scripts to one common 'metrics_tidy' script
+ - Simplify the 'create-metrics-archive' script, removing the one constant parameter
+ - Do not symlink the 'create-metrics-archive' script to '/opt/puppetlabs/bin/'
+ - Store configuration and code in separate 'config' and 'scripts' directories
+ - Eliminate the '/opt/puppetlabs/puppet_metrics_collector/bin' directory
+ - Add puppet code to delete the resulting legacy directories and files
+ - Resolve various puppet-lint and rubocop issues
+ - Refactor the shell scripts
+ - Merge json2graphite.rb and json2timeseriesdb scripts
+ - Update measurement tagging
+ - Update to PDK 1.16
+ - Update documentation
+
+## Changes
+ - Drop support for Puppet 4.x and versions of PE based upon Puppet 4.x
+ - Use v2 Metrics API for additional metrics for PuppetDB
+ - Change tags to system metrics
+
 # Minor Release 5.3.0
 
 ## Improvements

Gemfile

@@ -24,10 +24,10 @@ group :development do
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']