Ensure OSP compatibility with excludes

Jarret Lavallee · Jarret Lavallee · commit 8e593ad554ea · 2019-11-26T09:25:56.000-07:00
Prior to this commit, if the `pe_server_version` fact was missing the
code would error out. This commit enables OSP and older versions of PE.
diff --git a/functions/version_based_excludes.pp b/functions/version_based_excludes.pp
@@ -3,7 +3,7 @@ function puppet_metrics_collector::version_based_excludes(
 ) >> Array[String] {
   case $metrics_type {
     'puppetserver': {
-      $excludes = versioncmp($facts['pe_server_version'], '2017.3.0') >= 0 ? {
+      $excludes = ($facts['pe_server_version'] =~ NotUndef and versioncmp($facts['pe_server_version'], '2017.3.0') >= 0) ? {
         true    => ['file-sync-storage-service','pe-puppet-profiler','pe-master','pe-jruby-metrics'],
         default => ['file-sync-storage-service'],
       }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ function puppet_metrics_collector::version_based_excludes(`
`3`	`3`	`) >> Array[String] {`
`4`	`4`	`case $metrics_type {`
`5`	`5`	`'puppetserver': {`
`6`		`- $excludes = versioncmp($facts['pe_server_version'], '2017.3.0') >= 0 ? {`
	`6`	`+ $excludes = ($facts['pe_server_version'] =~ NotUndef and versioncmp($facts['pe_server_version'], '2017.3.0') >= 0) ? {`
`7`	`7`	`true => ['file-sync-storage-service','pe-puppet-profiler','pe-master','pe-jruby-metrics'],`
`8`	`8`	`default => ['file-sync-storage-service'],`
`9`	`9`	`}`