(PE-28451) renable additional activemq and not-found metrics

Restore additional activemq metrics.
Delete PE 2016 conditionals.
Restore counters that don't exist until a failure occurs.

Author: tkishel

manifests/service/activemq.pp

@@ -12,6 +12,44 @@
   Optional[Integer]       $metrics_server_port      = $puppet_metrics_collector::metrics_server_port,
   Optional[String]        $metrics_server_db_name   = $puppet_metrics_collector::metrics_server_db_name,
 ) {
+  $additional_metrics = [
+    {
+      'type'      => 'read',
+      'mbean'     => 'java.lang:type=Memory',
+      'attribute' => 'HeapMemoryUsage,NonHeapMemoryUsage'
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'java.lang:name=*,type=GarbageCollector',
+      'attribute' => 'CollectionCount'
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'java.lang:type=Runtime',
+      'attribute' => 'Uptime'
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'java.lang:type=OperatingSystem',
+      'attribute' => 'OpenFileDescriptorCount,MaxFileDescriptorCount'
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'org.apache.activemq:brokerName=*,type=Broker',
+      'attribute' => 'MemoryLimit,MemoryPercentUsage,CurrentConnectionsCount'
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'org.apache.activemq:type=Broker,brokerName=*,destinationType=Queue,destinationName=mcollective.*',
+      'attribute' => 'AverageBlockedTime,AverageEnqueueTime,AverageMessageSize,ConsumerCount,DequeueCount,DispatchCount,EnqueueCount,ExpiredCount,ForwardCount,InFlightCount,ProducerCount,QueueSize',
+    },
+    {
+      'type'      => 'read',
+      'mbean'     => 'org.apache.activemq:type=Broker,brokerName=*,destinationType=Topic,destinationName=mcollective.*.agent',
+      'attribute' => 'AverageBlockedTime,AverageEnqueueTime,AverageMessageSize,ConsumerCount,DequeueCount,DispatchCount,EnqueueCount,ExpiredCount,ForwardCount,InFlightCount,ProducerCount,QueueSize',
+    },
+  ]
+
   file { "${puppet_metrics_collector::scripts_dir}/amq_metrics" :
     ensure => $metrics_ensure,
     mode   => '0755',
@@ -27,7 +65,7 @@
     metric_script_file       => 'amq_metrics',
     override_metrics_command => $override_metrics_command,
     excludes                 => $excludes,
-    additional_metrics       => [],
+    additional_metrics       => $additional_metrics,
     metrics_server_type      => $metrics_server_type,
     metrics_server_hostname  => $metrics_server_hostname,
     metrics_server_port      => $metrics_server_port,

manifests/service/puppetdb.pp

@@ -28,11 +28,11 @@
       'name'  => 'global_fatal',
       'mbean' => 'puppetlabs.puppetdb.mq:name=global.fatal'
     },
-    #{
-    #  'type'  => 'read',
-    #  'name'  => 'global_generate-retry-message-time',
-    #  'mbean' => 'puppetlabs.puppetdb.mq:name=global.generate-retry-message-time'
-    #},
+    { # This counter doesn't exist until a failure occurs.
+      'type'  => 'read',
+      'name'  => 'global_generate-retry-message-time',
+      'mbean' => 'puppetlabs.puppetdb.mq:name=global.generate-retry-message-time'
+    },
     {
       'type'  => 'read',
       'name'  => 'global_message-persistence-time',
@@ -48,11 +48,11 @@
       'name'  => 'global_retry-counts',
       'mbean' => 'puppetlabs.puppetdb.mq:name=global.retry-counts'
     },
-    #{
-    #  'type'  => 'read',
-    #  'name'  => 'global_retry-persistence-time',
-    #  'mbean' => 'puppetlabs.puppetdb.mq:name=global.retry-persistence-time'
-    #},
+    { # This counter doesn't exist until a failure occurs.
+      'type'  => 'read',
+      'name'  => 'global_retry-persistence-time',
+      'mbean' => 'puppetlabs.puppetdb.mq:name=global.retry-persistence-time'
+    },
     {
       'type'  => 'read',
       'name'  => 'global_seen',
@@ -178,42 +178,38 @@
     }
   ]
 
-  # Retaining for future reference.
-  $numbers = $::pe_server_version ? {
-    /^2016\.[45]\./ => {'catalogs' => 9, 'facts' => 5, 'reports' => 8},
-    default         => {'catalogs' => 9, 'facts' => 5, 'reports' => 8},
-  }
+  $version = {'catalogs' => 9, 'facts' => 5, 'reports' => 8},
 
   $version_specific_metrics = [
     {
       'type'  => 'read',
       'name'  => 'mq_replace_catalog_retried',
-      'mbean' => "puppetlabs.puppetdb.mq:name=replace catalog.${numbers['catalogs']}.retried"
+      'mbean' => "puppetlabs.puppetdb.mq:name=replace catalog.${version['catalogs']}.retried"
     },
     {
       'type'  => 'read',
       'name'  => 'mq_replace_catalog_retry-counts',
-      'mbean' => "puppetlabs.puppetdb.mq:name=replace catalog.${numbers['catalogs']}.retry-counts"
+      'mbean' => "puppetlabs.puppetdb.mq:name=replace catalog.${version['catalogs']}.retry-counts"
     },
     {
       'type'  => 'read',
       'name'  => 'mq_replace_facts_retried',
-      'mbean' => "puppetlabs.puppetdb.mq:name=replace facts.${numbers['facts']}.retried"
+      'mbean' => "puppetlabs.puppetdb.mq:name=replace facts.${version['facts']}.retried"
     },
     {
       'type'  => 'read',
       'name'  => 'mq_replace_facts_retry-counts',
-      'mbean' => "puppetlabs.puppetdb.mq:name=replace facts.${numbers['facts']}.retry-counts"
+      'mbean' => "puppetlabs.puppetdb.mq:name=replace facts.${version['facts']}.retry-counts"
     },
     {
       'type'  => 'read',
       'name'  => 'mq_store_report_retried',
-      'mbean' => "puppetlabs.puppetdb.mq:name=store report.${numbers['reports']}.retried"
+      'mbean' => "puppetlabs.puppetdb.mq:name=store report.${version['reports']}.retried"
     },
     {
       'type'  => 'read',
       'name'  => 'mq_store_reports_retry-counts',
-      'mbean' => "puppetlabs.puppetdb.mq:name=store report.${numbers['reports']}.retry-counts"
+      'mbean' => "puppetlabs.puppetdb.mq:name=store report.${version['reports']}.retry-counts"
     }
   ]
 
@@ -291,11 +287,11 @@
       'name'  => 'ha_seconds-since-last-successful-sync',
       'mbean' => 'puppetlabs.puppetdb.ha:name=seconds-since-last-successful-sync'
     },
-    #{
-    #  'type'  => 'read',
-    #  'name'  => 'ha_failed-request-counter',
-    #  'mbean' => 'puppetlabs.puppetdb.ha:name=failed-request-counter'
-    #},
+    { # This counter doesn't exist until a failure occurs.
+      'type'  => 'read',
+      'name'  => 'ha_failed-request-counter',
+      'mbean' => 'puppetlabs.puppetdb.ha:name=failed-request-counter'
+    },
     {
       'type'  => 'read',
       'name'  => 'ha_sync-duration',