Issue 623854: Support unit annotations in ts_mon metrics

infra/services/sysmon/puppet_metrics.py

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import socket
 import sys
 import time
 
@@ skipping 10 matching lines @@
                 'the time that the configuration was parsed')
 puppet_version = ts_mon.StringMetric('puppet/version/puppet',
     description='Version of puppet client installed.')
 events = ts_mon.GaugeMetric('puppet/events',
     description='Number of changes the puppet client made to the system in its '
                 'last run, by success or failure')
 resources = ts_mon.GaugeMetric('puppet/resources',
     description='Number of resources known by the puppet client in its last '
                 'run')
 times = ts_mon.FloatMetric('puppet/times',
-    description='Time taken to perform various parts of the last puppet run')
-age = ts_mon.FloatMetric('puppet/age', description='Time since last run')
+    description='Time taken to perform various parts of the last puppet run',
+    units=ts_mon.MetricsDataUnits.SECONDS)
+age = ts_mon.FloatMetric('puppet/age',
+                         description='Time since last run',
+                         units=ts_mon.MetricsDataUnits.SECONDS)
 
 
 def _lastrunfile():  # pragma: no cover
   if sys.platform == 'win32':
     return os.path.join(puppet_metrics_win32.common_appdata_path(),
                         'PuppetLabs\\puppet\\var\\state\\last_run_summary.yaml')
   return '/var/lib/puppet_last_run_summary.yaml'
 
 
 def get_puppet_summary(time_fn=time.time):
@@ skipping 45 matching lines @@
     logging.warning('resources not found in %s', path)
 
   try:
     for key, value in data['time'].iteritems():
       if key == 'last_run':
         age.set(time_fn() - value)
       elif key != 'total':
         times.set(value, {'step': key})
   except KeyError:
     logging.warning('time not found in %s', path)