Issue 623854: Support unit annotations in ts_mon metrics

infra/services/sysmon/system_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 errno
 import os
 import logging
 import time
 
 import psutil
 
 from infra_libs import ts_mon
 
 
 cpu_count = ts_mon.GaugeMetric('dev/cpu/count',
                                description='Number of CPU cores.')
 cpu_time = ts_mon.FloatMetric('dev/cpu/time',
                               description='percentage of time spent by the CPU'
                                   ' in different states.')
 
 disk_free = ts_mon.GaugeMetric('dev/disk/free',
-                               description='Available bytes on disk partition.')
+                               description='Available bytes on disk partition.',
+                               units=ts_mon.MetricsDataUnits.BYTES)
 disk_total = ts_mon.GaugeMetric('dev/disk/total',
-                                description='Total bytes on disk partition.')
+                                description='Total bytes on disk partition.',
+                                units=ts_mon.MetricsDataUnits.BYTES)
 
 # inode counts are only available on Unix.
 if os.name == 'posix':  # pragma: no cover
   inodes_free = ts_mon.GaugeMetric('dev/inodes/free',
                                    description='Number of available inodes on '
                                        'disk partition (unix only).')
   inodes_total = ts_mon.GaugeMetric('dev/inodes/total',
                                     description='Number of possible inodes on '
                                         'disk partition (unix only)')
 
 mem_free = ts_mon.GaugeMetric('dev/mem/free',
                               description='Amount of memory available to a '
                                   'process (in Bytes). Buffers are considered '
-                                  'free memory.')
+                                  'free memory.',
+                              units=ts_mon.MetricsDataUnits.BYTES)
 
 mem_total = ts_mon.GaugeMetric('dev/mem/total',
-                               description='Total physical memory in Bytes.')
+                               description='Total physical memory in Bytes.',
+                               units=ts_mon.MetricsDataUnits.BYTES)
 
 START_TIME = psutil.boot_time()
 net_up = ts_mon.CounterMetric('dev/net/bytes/up', start_time=START_TIME,
-                              description='Number of bytes sent on interface.')
+                              description='Number of bytes sent on interface.',
+                              units=ts_mon.MetricsDataUnits.BYTES)
 net_down = ts_mon.CounterMetric('dev/net/bytes/down', start_time=START_TIME,
                                 description='Number of Bytes received on '
-                                    'interface.')
+                                    'interface.',
+                                units=ts_mon.MetricsDataUnits.BYTES)
 net_err_up = ts_mon.CounterMetric('dev/net/err/up', start_time=START_TIME,
                                   description='Total number of errors when '
                                       'sending (per interface).')
 net_err_down = ts_mon.CounterMetric('dev/net/err/down', start_time=START_TIME,
                                     description='Total number of errors when '
                                         'receiving (per interface).')
 net_drop_up = ts_mon.CounterMetric('dev/net/drop/up', start_time=START_TIME,
                                    description='Total number of outgoing '
                                        'packets that have been dropped.')
 net_drop_down = ts_mon.CounterMetric('dev/net/drop/down', start_time=START_TIME,
                                      description='Total number of incoming '
                                          'packets that have been dropped.')
 
 disk_read = ts_mon.CounterMetric('dev/disk/read', start_time=START_TIME,
-                                 description='Number of Bytes read on disk.')
+                                 description='Number of Bytes read on disk.',
+                                 units=ts_mon.MetricsDataUnits.BYTES)
 disk_write = ts_mon.CounterMetric('dev/disk/write', start_time=START_TIME,
                                   description='Number of Bytes written on '
-                                      'disk.')
+                                      'disk.',
+                                  units=ts_mon.MetricsDataUnits.BYTES)
 
 uptime = ts_mon.GaugeMetric('dev/uptime',
-                            description='Machine uptime, in seconds.')
+                            description='Machine uptime, in seconds.',
+                            units=ts_mon.MetricsDataUnits.SECONDS)
 
 proc_count = ts_mon.GaugeMetric('dev/proc/count',
                                 description='Number of processes currently '
                                     'running.')
 load_average = ts_mon.FloatMetric('dev/proc/load_average',
                                   description='Number of processes currently '
                                       'in the system run queue.')
 
 # tsmon pipeline uses backend clocks when assigning timestamps to metric points.
 # By comparing point timestamp to the point value (i.e. time by machine's local
@@ skipping 96 matching lines @@
     except OSError:  # pragma: no cover
       pass
     else:
       load_average.set(avg1, fields={'minutes': 1})
       load_average.set(avg5, fields={'minutes': 5})
       load_average.set(avg15, fields={'minutes': 15})
 
 
 def get_unix_time():
   unix_time.set(int(time.time() * 1000))