Expose additional_metrics for each service

Prior to this commit, there was no method to add additional metrics for
the pe_metric services. This commit adds a new parameter to each of the
classes to allow for specifying the extra_metrics that will be queried
from jolokia.

Author: Jarret Lavallee

manifests/service/ace.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::ace_hosts,
   Integer                 $port                     = $puppet_metrics_collector::ace_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::ace_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -18,6 +19,7 @@
     retention_days          => $retention_days,
     hosts                   => $hosts,
     metrics_port            => $port,
+    additional_metrics      => $extra_metrics,
     metric_script_file      => 'puma_metrics',
     metrics_server_type     => $metrics_server_type,
     metrics_server_hostname => $metrics_server_hostname,

manifests/service/activemq.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::activemq_hosts,
   Integer                 $port                     = $puppet_metrics_collector::activemq_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::activemq_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -13,7 +14,7 @@
   Optional[String]        $metrics_server_db_name   = $puppet_metrics_collector::metrics_server_db_name,
 ) {
   # lint:ignore:140chars
-  $additional_metrics = [
+  $base_metrics = [
     {
       'type'      => 'read',
       'mbean'     => 'java.lang:type=Memory',
@@ -58,6 +59,8 @@
     source => 'puppet:///modules/puppet_metrics_collector/amq_metrics',
   }
 
+  $additional_metrics = $base_metrics + $extra_metrics
+
   puppet_metrics_collector::pe_metric { 'activemq' :
     metric_ensure            => $metrics_ensure,
     cron_minute              => "*/${collection_frequency}",

manifests/service/bolt.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::bolt_hosts,
   Integer                 $port                     = $puppet_metrics_collector::bolt_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::bolt_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -18,6 +19,7 @@
     retention_days          => $retention_days,
     hosts                   => $hosts,
     metrics_port            => $port,
+    additional_metrics      => $extra_metrics,
     metric_script_file      => 'puma_metrics',
     metrics_server_type     => $metrics_server_type,
     metrics_server_hostname => $metrics_server_hostname,

manifests/service/orchestrator.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::orchestrator_hosts,
   Integer                 $port                     = $puppet_metrics_collector::orchestrator_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::orchestrator_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -18,6 +19,7 @@
     retention_days           => $retention_days,
     hosts                    => $hosts,
     metrics_port             => $port,
+    additional_metrics       => $extra_metrics,
     override_metrics_command => $override_metrics_command,
     excludes                 => $excludes,
     metrics_server_type      => $metrics_server_type,

manifests/service/puppetdb.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::puppetdb_hosts,
   Integer                 $port                     = $puppet_metrics_collector::puppetdb_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::puppetdb_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -329,7 +330,8 @@       'mbean' => 'puppetlabs.puppetdb.ha:name=record-transfer-duration'
     },
   ]
 
-  $additional_metrics = $base_metrics + $storage_metrics + $connection_pool_metrics + $version_specific_metrics + $ha_sync_metrics
+  $additional_metrics = $base_metrics + $storage_metrics + $connection_pool_metrics +
+                        $version_specific_metrics + $ha_sync_metrics + $extra_metrics
 
   $ssl = $hosts ? {
     ['127.0.0.1'] => false,

manifests/service/puppetserver.pp

@@ -5,6 +5,7 @@
   Integer                 $retention_days           = $puppet_metrics_collector::retention_days,
   Array[String]           $hosts                    = $puppet_metrics_collector::puppetserver_hosts,
   Integer                 $port                     = $puppet_metrics_collector::puppetserver_port,
+  Array[Hash]             $extra_metrics            = [],
   Optional[String]        $override_metrics_command = $puppet_metrics_collector::override_metrics_command,
   Optional[Array[String]] $excludes                 = $puppet_metrics_collector::puppetserver_excludes,
   Optional[Enum['influxdb', 'graphite', 'splunk_hec']] $metrics_server_type = $puppet_metrics_collector::metrics_server_type,
@@ -20,7 +21,7 @@
     metrics_port             => $port,
     override_metrics_command => $override_metrics_command,
     excludes                 => $excludes,
-    additional_metrics       => [],
+    additional_metrics       => $extra_metrics,
     metrics_server_type      => $metrics_server_type,
     metrics_server_hostname  => $metrics_server_hostname,
     metrics_server_port      => $metrics_server_port,