Merge pull request #90 from jarretlavallee/fix/master/remove_stdlib

(PE-31763) Remove the dependency on stdlib

Author: jarretlavallee

.fixtures.yml

@@ -1,5 +1,4 @@
 ---
 fixtures:
   repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
     cron_core: "git://github.com/puppetlabs/puppetlabs-cron_core"

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 {

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,

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":

metadata.json

@@ -7,12 +7,7 @@
   "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",