(maint) Sync system_metrics directory naming

This patch updates `psql_metrics` and `vmware_metrics` such that output
directories are created from the hostname without replacing `.` by `-`.
This change matches the behavior of the `system_metrics` script.

A missing `timestamp` key is also added to the output of `psql_metrics`.

Author: Sharpie

files/psql_metrics

@@ -556,15 +556,17 @@ EOS
 
         # NOTE: A little odd, since tk_metrics uses the certname. But, this
         #   matches what system_metrics does.
-        hostname = PSQLMetrics::Exec.exec_cmd('/bin/sh', '-c', 'hostname').stdout.strip.gsub('.', '-')
+        hostname = PSQLMetrics::Exec.exec_cmd('/bin/sh', '-c', 'hostname').stdout.strip
+        timestamp = Time.now.utc
 
         metrics = PSQLMetrics.new(**@options)
-        data = {servers: {hostname => {postgres: metrics.to_h}}}
+        data = {servers: {hostname.gsub('.', '-') => {postgres: metrics.to_h}},
+                timestamp: timestamp.iso8601}
 
         if (output_dir = @options[:output_dir])
           host_dir = File.join(output_dir, hostname)
           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')
+          output_file = File.join(host_dir, timestamp.strftime('%Y%m%dT%H%M%SZ') + '.json')
 
           File.write(output_file, JSON.generate(data))
         else

files/vmware_metrics

@@ -43,7 +43,7 @@ module PuppetMetricsCollector
 
       # NOTE: A little odd, since tk_metrics uses the certname. But, this
       #   matches what system_metrics does.
-      @hostname = exec_cmd('/bin/sh', '-c', 'hostname').strip.gsub('.', '-')
+      @hostname = exec_cmd('/bin/sh', '-c', 'hostname').strip
     end
 
     # Gather VMware metrics
@@ -70,12 +70,12 @@ module PuppetMetricsCollector
       end
 
       {servers: {
-        @hostname => {
+        @hostname.gsub('.', '-') => {
           vmware: result}},
        timestamp: Time.now.utc.iso8601}
     rescue => e
       {servers: {
-        @hostname => {
+        @hostname.gsub('.', '-') => {
           vmware: {
             error: "#{e.class}: #{e.message}"}}},
        timestamp: Time.now.utc.iso8601}