Simplify puppetdb v2 logic

Prior to this commit, the puppetdb v2 logic was more complex than
needed. This update changes to anything over 5.5.19 to use v2, which
should fix the issues with some newer versions using v1 metrics.

Author: Jarret Lavallee

functions/localhost_or_hosts_with_pe_profile.pp

@@ -18,7 +18,7 @@ function puppet_metrics_dashboard::localhost_or_hosts_with_pe_profile(
       # PE 2018.1.13 - PE 2019.0.0
       # PE 2019.5 - PE 2019.8.4
       $hosts = puppetdb_query('inventory[certname]{ 
-        facts.puppet_metrics_dashboard.versions.puppetdb > "6.15.0" or
+        facts.puppet_metrics_dashboard.versions.puppetdb >= "6.15.0" or
         facts.puppet_metrics_dashboard.versions.puppetdb < "5.2.13"
         }').map |$nodes| { $nodes['certname'] }
     } else {

functions/puppetdb_v2_metrics.pp

@@ -1,7 +1,7 @@
 # @summary function used to determine if the metrics v2 endpoint in PuppetDB can be used
 
 function puppet_metrics_dashboard::puppetdb_v2_metrics() >> Boolean {
-  if ((versioncmp($facts['puppetversion'], '6.14.0') >= 0) or ((versioncmp($facts['puppetversion'], '5.5.19') >= 0) and (versioncmp($facts['puppetversion'], '6.0.0') < 1))) {
+  if versioncmp($facts['puppetversion'], '5.5.19') >= 0 {
     true
   } else {
     false