Merge pull request #139 from jarretlavallee/client_auth

Enable remote PuppetDB collection in 2019.8.5+

Author: MartyEwings

functions/localhost_or_hosts_with_pe_profile.pp

@@ -12,12 +12,23 @@
 function puppet_metrics_dashboard::localhost_or_hosts_with_pe_profile(
   String $profile,
 ) >> Array {
-  if ($profile == 'puppetdb') and (puppet_metrics_dashboard::puppetdb_no_remote_metrics()) {
-    if $facts['puppet_server'] == $trusted['certname'] {
-      $hosts = ['localhost']
+  if ($profile == 'puppetdb') {
+    if $settings::storeconfigs {
+      # PuppetDB metrics in the following versions can only be reached via localhost
+      # 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 < "5.2.13"
+        }').map |$nodes| { $nodes['certname'] }
     } else {
       $hosts = []
     }
+    if empty($hosts) and $facts.dig('puppet_metrics_dashboard', 'versions', 'puppetdb') {
+      ['localhost']
+    } else {
+      sort($hosts)
+    }
   } else {
     if $settings::storeconfigs {
       $_profile = capitalize($profile)

functions/puppetdb_no_remote_metrics.pp

@@ -0,0 +1,9 @@
+# @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'], '5.5.19') >= 0 {
+    true
+  } else {
+    false
+  }
+}

functions/puppetdb_v2_metrics.pp

@@ -0,0 +1,16 @@
+Facter.add(:puppet_metrics_dashboard) do
+  confine kernel: 'linux'
+
+  setcode do
+    result = { versions: {} }
+    if File.readable?('/opt/puppetlabs/server/apps/puppetdb/ezbake.manifest')
+      version = File.read('/opt/puppetlabs/server/apps/puppetdb/ezbake.manifest').match(%r{puppetlabs/puppetdb "(.*)"})
+
+      result[:versions][:puppetdb] = version.captures.first.gsub(%r{^(\d+\.\d+\.\d+).*}, '\1') unless version.nil?
+    end
+
+    result[:overwrite_dashboards_disabled] = File.exist?('/opt/puppetlabs/puppet/cache/state/overwrite_dashboards_disabled')
+
+    result
+  end
+end

lib/facter/overwrite_dashboards.rb

@@ -15,7 +15,7 @@
       mode   => '0644',
     }
 
-    $_overwrite = $facts['overwrite_dashboards_disabled'] ? {
+    $_overwrite = $facts.dig('puppet_metrics_dashboard', 'overwrite_dashboards_disabled') ? {
       true    => false,
       default => true,
     }

lib/facter/puppet_metrics_dashboard_facts.rb

@@ -9,7 +9,7 @@
     default => 'http',
   }
 
-  if puppet_metrics_dashboard::puppetdb_no_remote_metrics() {
+  if puppet_metrics_dashboard::puppetdb_v2_metrics() {
     $pdb_dash_version = '_v2'
   } else {
     $pdb_dash_version = undef

manifests/dashboards.pp

@@ -58,7 +58,7 @@
     default => 'http'
   }
 
-  if puppet_metrics_dashboard::puppetdb_no_remote_metrics() {
+  if puppet_metrics_dashboard::puppetdb_v2_metrics() {
         $metrics_version = 'v2/read'
       } else {
         $metrics_version = 'v1/mbeans'

manifests/dashboards/telegraf.pp

@@ -11,8 +11,10 @@
         <<-PRE_COND
           class {'puppet_metrics_dashboard':
             add_dashboard_examples => false,
-            influxdb_database_name => ['puppet_metrics','telegraf','graphite'],
+            influxdb_database_name => ['graphite'],
             grafana_password       => 'puppetlabs',
+            enable_telegraf        => false,
+            configure_telegraf     => false,
           }
         PRE_COND
       end

manifests/profile/puppetdb.pp

@@ -11,8 +11,10 @@
         <<-PRE_COND
           class {'puppet_metrics_dashboard':
             add_dashboard_examples => false,
-            influxdb_database_name => ['puppet_metrics','telegraf','graphite'],
+            influxdb_database_name => ['puppet_metrics'],
             grafana_password       => 'puppetlabs',
+            enable_telegraf        => false,
+            configure_telegraf     => false,
           }
         PRE_COND
       end