remove puppet_metrics_dashboard::telegraf::* classes

Author: suckatrash

REFERENCE.md

@@ -22,9 +22,6 @@
 * `puppet_metrics_dashboard::repos`: Configures InfluxDB and Grafana repos
 * `puppet_metrics_dashboard::service`: Manages services
 * `puppet_metrics_dashboard::telegraf`: Install and configure Telegraf
-* `puppet_metrics_dashboard::telegraf::config`: Configures Telegraf
-* `puppet_metrics_dashboard::telegraf::install`: Installs Telegraf
-* `puppet_metrics_dashboard::telegraf::service`: Manages the Telegraf service
 
 ## Defined types
 

manifests/init.pp

@@ -247,6 +247,6 @@
   }
 
   if $_enable_telegraf {
-    contain puppet_metrics_dashboard::telegraf
+    include puppet_metrics_dashboard::telegraf
   }
 }

manifests/telegraf.pp

@@ -4,19 +4,81 @@
 #
 # @api private
 class puppet_metrics_dashboard::telegraf {
-  # Enable Telegraf if `configure_telegraf` is true.
-  $_enable_telegraf = $puppet_metrics_dashboard::configure_telegraf ? {
-    true    => true,
-    default => $puppet_metrics_dashboard::enable_telegraf
-  }
+  if $puppet_metrics_dashboard::configure_telegraf {
+    $_puppetdb_metrics = $puppet_metrics_dashboard::puppetdb_metrics
+
+    class { 'telegraf':
+      interval       => $puppet_metrics_dashboard::telegraf_agent_interval,
+      logfile        => '/var/log/telegraf/telegraf.log',
+      hostname       => '',
+      manage_repo    => false,
+      manage_service => false,
+      outputs        => {
+        'influxdb' => [
+          {
+            'urls'              => $puppet_metrics_dashboard::influxdb_urls,
+            'database'          => $puppet_metrics_dashboard::telegraf_db_name,
+            'write_consistency' => 'any',
+            'timeout'           => '5s',
+          },
+        ],
+      },
+    }
+
+    file {'/etc/telegraf/telegraf.d/puppet_metrics_dashboard.conf':
+      ensure => absent,
+    }
+
+    # Transform the host lists into arrays of "hostname:port", using a
+    # service's default port if no alternate was specified.
+    $_master_list = $puppet_metrics_dashboard::master_list.map |$entry| {
+      $entry ? {
+        Tuple[String, Integer] => { 'host' => $entry[0], 'port' => $entry[1] },
+        String                 => { 'host' => $entry, 'port' => 8140 },
+      }
+    }
+    $_puppetdb_list = $puppet_metrics_dashboard::puppetdb_list.map |$entry| {
+      $entry ? {
+        Tuple[String, Integer] => { 'host' => $entry[0], 'port' => $entry[1] },
+        String                 => { 'host' => $entry, 'port' => 8081 },
+      }
+    }
+    $_postgres_list = $puppet_metrics_dashboard::postgres_host_list.map |$entry| {
+      $entry ? {
+        Tuple[String, Integer] => { 'host' => $entry[0], 'port' => $entry[1] },
+        String                 => { 'host' => $entry, 'port' => 5432 },
+      }
+    }
 
-  if $_enable_telegraf {
-    contain puppet_metrics_dashboard::telegraf::install
-    contain puppet_metrics_dashboard::telegraf::config
-    contain puppet_metrics_dashboard::telegraf::service
+    $_master_list.each |$master| {
+      puppet_metrics_dashboard::profile::compiler{ $master['host']:
+        compiler => $master['host'],
+        port     => $master['port'],
+        timeout  => $puppet_metrics_dashboard::http_response_timeout,
+        interval => $puppet_metrics_dashboard::telegraf_agent_interval,
+        require  => Class['Telegraf'],
+      }
+    }
+
+    $_puppetdb_list.each |$puppetdb| {
+      puppet_metrics_dashboard::profile::puppetdb{ $puppetdb['host']:
+        puppetdb_host => $puppetdb['host'],
+        port          => $puppetdb['port'],
+        timeout       => $puppet_metrics_dashboard::http_response_timeout,
+        interval      => $puppet_metrics_dashboard::telegraf_agent_interval,
+        require  => Class['Telegraf'],
+      }
+    }
+
+    $_postgres_list.each |$postgres| {
+      puppet_metrics_dashboard::profile::master::postgres{ $postgres['host']:
+        postgres_host  => $postgres['host'],
+        port           => $postgres['port'],
+        query_interval => $puppet_metrics_dashboard::pg_query_interval,
+        require  => Class['Telegraf'],
+      }
+    }
 
-    Class['puppet_metrics_dashboard::telegraf::install']
-    -> Class['puppet_metrics_dashboard::telegraf::config']
-    -> Class['puppet_metrics_dashboard::telegraf::service']
   }
+
 }

manifests/telegraf/config.pp

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'puppet_metrics_dashboard::telegraf::config' do
+describe 'puppet_metrics_dashboard::telegraf' do
   on_supported_os(facterversion: '3.7').each do |os, facts|
     context "with facter 3.7 on #{os}" do
       let(:node) do

manifests/telegraf/install.pp

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'puppet_metrics_dashboard::telegraf::install' do
+describe 'puppet_metrics_dashboard::telegraf' do
   on_supported_os(facterversion: '3.7').each do |os, facts|
     context "with facter 3.7 on #{os}" do
       let(:node) do

manifests/telegraf/service.pp

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'puppet_metrics_dashboard::telegraf::service' do
+describe 'puppet_metrics_dashboard::telegraf' do
   on_supported_os(facterversion: '3.7').each do |os, facts|
     context "with facter 3.7 on #{os}" do
       let(:node) do

spec/classes/telegraf/config_spec.rb

@@ -18,9 +18,7 @@
           PRE_COND
         end
 
-        it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::install') }
-        it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::config') }
-        it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::service') }
+        it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf') }
       end
 
       context 'with enable_telegraf and configure_telegraf disabled' do
@@ -33,9 +31,7 @@ class {'puppet_metrics_dashboard':
           PRE_COND
         end
 
-        it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::install') }
-        it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::config') }
-        it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::service') }
+        it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf') }
       end
     end
   end