(SUP-1969) Add metrics shipping for VMware

Prior to this commit, there was no way to ship vmware metrics to a
remote metrics server. This commit adds the capability of doing metrics
shipping for VMware metrics.

Author: Jarret Lavallee

files/vmware_metrics

@@ -159,7 +159,8 @@ module PuppetMetricsCollector
                     'Defaults to 10.'],
                    ['--output_dir DIR',
                     'Write metrics to a timestamed file under DIR instead of',
-                    'printing to STDOUT']].freeze
+                    'printing to STDOUT'],
+                   ['-p', '--[no-]print', 'Always print to STDOUT']].freeze
 
       def initialize(argv = [])
         @action = :collect_data
@@ -172,7 +173,7 @@ module PuppetMetricsCollector
             @action = :show_help
           end
 
-          parser.on_tail('--debug', 'Enable backtraces from errors.') do
+          parser.on_tail('-d', '--debug', 'Enable backtraces from errors.') do
             @options[:debug] = true
           end
         end
@@ -208,7 +209,9 @@ module PuppetMetricsCollector
           FileUtils.mkdir_p(host_dir) unless File.directory?(host_dir)
           output_file = File.join(host_dir, Time.now.utc.strftime('%Y%m%dT%H%M%SZ') + '.json')
 
-          File.write(output_file, JSON.generate(data))
+          output = JSON.generate(data)
+          File.write(output_file, output)
+          $stdout.puts(output) if @options[:print]
         else
           $stdout.puts(JSON.generate(data))
         end

manifests/system/vmware.pp

@@ -12,6 +12,7 @@
   String  $metrics_ensure            = $puppet_metrics_collector::system::system_metrics_ensure,
   Integer $collection_frequency      = $puppet_metrics_collector::system::collection_frequency,
   Integer $retention_days            = $puppet_metrics_collector::system::retention_days,
+  String  $metrics_shipping_command  = $puppet_metrics_collector::system::metrics_shipping_command,
 ) {
   $metrics_output_dir = "${puppet_metrics_collector::system::output_dir}/vmware"
   $metrics_output_dir_ensure = $metrics_ensure ? {
@@ -27,6 +28,7 @@
 
   $metrics_command = ["${puppet_metrics_collector::system::scripts_dir}/vmware_metrics",
                       '--output_dir', $metrics_output_dir,
+                      $metrics_shipping_command,
                       '> /dev/null'].join(' ')
 
   $tidy_command = "${puppet_metrics_collector::system::scripts_dir}/metrics_tidy -d ${metrics_output_dir} -r ${retention_days}"