.rubocop.yml

@@ -464,6 +464,11 @@ Style/BlockComments:
   Enabled: false
 Style/BlockDelimiters:
   Enabled: false
+Style/BracesAroundHashParameters:
+  Description: |
+    Braces are actually required by Ruby 2.7 in order to disambiguate between
+    keword arguments and actual hash parameters. Removed in RuboCop v0.80.0.
+  Enabled: false
 Style/CaseEquality:
   Enabled: false
 Style/CharacterLiteral:

.sync.yml

@@ -8,6 +8,14 @@ appveyor.yml:
 .project:
   delete: true
 
+.rubocop.yml:
+  default_configs:
+    Style/BracesAroundHashParameters:
+      Description: |
+        Braces are actually required by Ruby 2.7 in order to disambiguate between
+        keword arguments and actual hash parameters. Removed in RuboCop v0.80.0.
+      Enabled: false
+
 spec/default_facts.yml:
   extra_facts:
     pe_server_version: '2016.4.5'

CHANGELOG.md

@@ -1,3 +1,15 @@
+# Minor Release 6.2.0
+
+## Improvements
+- Gather metrics from pe-postgresql [#71](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/71)
+- Add VMware metrics collection [#68](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/68)
+
+## Changes:
+- Mbeans that return a 404 will default to null instead of an error [#76](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/76)
+- A warning is no longer printed when shipping metrics to a remote database [#75](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/75)
+- Fix duplicate declaration of common files [#70](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/70)
+- Fix ensure => absent for metrics [#69](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/69)
+
 # Patch Release 6.1.1
 
 ## Changes:

files/metrics_tidy

@@ -32,7 +32,7 @@ done
 
 
 # Guard against deleting or archiving files outside of a Puppet service metrics directory.
-valid_paths=(puppetserver puppetdb orchestrator ace bolt activemq system_processes system_memory system_cpu)
+valid_paths=(puppetserver puppetdb orchestrator ace bolt activemq postgres system_processes system_memory system_cpu vmware)
 
 # Arguments and defaults.
 metrics_directory="${metrics_directory:-/opt/puppetlabs/puppet-metrics-collector/puppetserver}"

files/pe_metrics.rb

@@ -133,6 +133,8 @@ def retrieve_additional_metrics(host, port, use_ssl, metrics_type, metrics)
     metric_data = metrics_output[index]
     if metric_data['status'] == 200
       metrics_array << { 'name' => metric_name, 'data' => metric_data['value'] }
+    elsif metric_data['status'] == 404
+      metrics_array << { 'name' => metric_name, 'data' => nil}
     else
       metric_mbean = metrics[index]['mbean']
       $error_array << "HTTP Error #{metric_data['status']} for #{metric_mbean}"