Showing with 16 additions and 13 deletions.

+0 −1 .fixtures.yml

+6 −0 CHANGELOG.md

+1 −0 functions/hosts_with_pe_profile.pp

+3 −3 manifests/pe_metric.pp

+3 −1 manifests/system.pp

+3 −8 metadata.json
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,5 +1,4 @@
 ---
 fixtures:
   repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
     cron_core: "git://github.com/puppetlabs/puppetlabs-cron_core"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Minor Release 6.5.0
+
+## Changes:
+- The `puppet_metrics_collector` can now be used without requiring the
+  installation of additional dependencies, such as `puppetlabs-stdlib`.
+
 # Patch Release 6.4.1
 
 ## Changes:

diff --git a/functions/hosts_with_pe_profile.pp b/functions/hosts_with_pe_profile.pp
@@ -22,6 +22,7 @@ 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 }
+               order by certname
               }").map |$nodes| { $nodes['certname'] }
   }
   else {

diff --git a/manifests/pe_metric.pp b/manifests/pe_metric.pp
@@ -33,8 +33,8 @@
 
   $_remote_metrics_enabled = if $remote_metrics_enabled =~ Boolean {
     $remote_metrics_enabled
-  } elsif fact('pe_server_version') =~ NotUndef {
-    if versioncmp(fact('pe_server_version'), '2019.8.5') >= 0 {
+  } elsif $facts.dig('pe_server_version') =~ NotUndef {
+    if versioncmp($facts.dig('pe_server_version'), '2019.8.5') >= 0 {
       true
     } else {
       false
@@ -47,7 +47,7 @@
     'metrics_type'           => $metrics_type,
     'pe_version'             => $facts['pe_server_version'],
     'clientcert'             => $::clientcert,
-    'hosts'                  => $hosts.sort(),
+    'hosts'                  => $hosts,
     'metrics_port'           => $metrics_port,
     'ssl'                    => $ssl,
     'excludes'               => $excludes,

diff --git a/manifests/system.pp b/manifests/system.pp
@@ -51,7 +51,9 @@
 
   if $facts['virtual'] == 'vmware' {
     if $manage_vmware_tools and ($system_metrics_ensure == 'present') {
-      ensure_packages([$vmware_tools_pkg])
+      package {$vmware_tools_pkg:
+        ensure => present,
+      }
     }
 
     file { "${scripts_dir}/vmware_metrics":

diff --git a/metadata.json b/metadata.json
@@ -1,18 +1,13 @@
 {
   "name": "puppetlabs-puppet_metrics_collector",
-  "version": "6.4.1",
-  "author": "npwalker",
+  "version": "6.5.0",
+  "author": "puppetlabs",
   "summary": "A Puppet module for gathering metrics from PE components",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector",
   "project_page": "https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector",
   "issues_url": "https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/issues",
-  "dependencies": [
-    {
-      "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 2.6.0 < 8.0.0"
-    }
-  ],
+  "dependencies": [],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",