adding os metrics (os name and version) being collected every hour

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 platform
 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',
@@ skipping 60 matching lines @@
 # 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
 # clock), we can potentially detect some anomalies (clock drift, unusually high
 # metrics pipeline delay, completely wrong clocks, etc).
 #
 # It is important to gather this metric right before the flush.
 unix_time = ts_mon.GaugeMetric('dev/unix_time',
                                description='Number of milliseconds since epoch '
                                   'based on local machine clock.')
 
+metric_os_name = ts_mon.StringMetric('proc/os/name',
+                                    description='OS name on the machine '

[dsansome, 2016/06/29 06:21:29]

Align these lines with the ' above

[chrishall, 2016/07/01 04:27:59]

Done.

+                                    'metric:hostname.')
+
+metric_os_version = ts_mon.StringMetric('proc/os/version',
+                                       description='OS version on the machine '
+                                       'metric:hostname.')
 
 def get_uptime():
   uptime.set(int(time.time() - START_TIME))
 
 
 def get_cpu_info():
   cpu_count.set(psutil.cpu_count())
 
   times = psutil.cpu_times_percent()
   for mode in ('user', 'system', 'idle'):
@@ skipping 60 matching lines @@
     fields = {'interface': nic}
     for metric, counter_name in metric_counter_names:
       try:
         metric.set(getattr(counters, counter_name), fields=fields)
       except ts_mon.MonitoringDecreasingValueError as ex:  # pragma: no cover
         # This normally shouldn't happen, but might if the network driver module
         # is reloaded, so log an error and continue instead of raising an
         # exception.
         logging.error(str(ex))
 
+def get_os_info():

[dsansome, 2016/06/29 06:21:29]

Please add tests for this to test/system_metrics_test.py.  You'll probably need
to @mock.patch('platform.system') and friends.

[chrishall, 2016/07/01 04:27:59]

Done.

+  os_name    = ""
+  os_version = ""
+
+  os_name    = platform.system().lower()
+  if "windows" in os_name:
+    os_name    = "windows"
+    # os_release will be something like '7', 'vista', or 'xp'
+    os_version = platform.release()
+
+  elif "linux" in os_name:
+    # will return something like ('Ubuntu', '14.04', 'trusty')
+    dist_info  = platform.dist()
+    os_name    = dist_info[0]
+    os_version = dist_info[1]
+
+  # on mac platform.system() reports 'darwin'
+  else:
+    # this tuple is only populated on mac systems
+    mac_ver    = platform.mac_ver()
+    # will be '10.11.5' or similar on a valid mac
+    # or will be '' on a non-mac
+    os_version = mac_ver[0]
+    if os_version:
+      # we found a valid mac
+      os_name = "mac"
+    else :
+      # not a mac
+      # unable to find platform information
+      # reset
+      os_name    = ""
+      os_version = ""
+
+  # normalize to lower case
+  os_name    = os_name.lower()
+  os_version = os_version.lower()
+
+  # construct metrics
+  metric_os_name.set(os_name)
+  metric_os_version.set(os_version)
+

[dsansome, 2016/06/29 06:21:29]

Need 2 blank lines between top-level functions

[chrishall, 2016/07/01 04:27:59]

Done.

+def clear_os_info():
+  metric_os_name.reset()
+  metric_os_version.reset()
 
 def get_proc_info():
   procs = psutil.pids()
   proc_count.set(len(procs))
 
   if os.name == 'posix':  # pragma: no cover
     try:
       avg1, avg5, avg15 = os.getloadavg()
     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))