[sysmon] Move network metrics to its own module
BUG=chromium:698056
TEST=None
Change-Id: I7a8b9a3eebe64c827e420646d30eda34e4f307aa
Reviewed-on: https://chromium-review.googlesource.com/448809
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/scripts/sysmon/system_metrics.py b/scripts/sysmon/system_metrics.py
index cb0a05d..a124662 100644
--- a/scripts/sysmon/system_metrics.py
+++ b/scripts/sysmon/system_metrics.py
@@ -60,52 +60,14 @@
description='Total physical memory in Bytes.',
units=ts_mon.MetricsDataUnits.BYTES)
-BOOT_TIME = psutil.boot_time()
-_net_up_metric = ts_mon.CounterMetric(
- 'dev/net/bytes/up', start_time=BOOT_TIME,
- description='Number of bytes sent on interface.',
- units=ts_mon.MetricsDataUnits.BYTES)
-_net_down_metric = ts_mon.CounterMetric(
- 'dev/net/bytes/down', start_time=BOOT_TIME,
- description='Number of Bytes received on '
- 'interface.',
- units=ts_mon.MetricsDataUnits.BYTES)
-_net_err_up_metric = ts_mon.CounterMetric(
- 'dev/net/err/up', start_time=BOOT_TIME,
- description='Total number of errors when '
- 'sending (per interface).')
-_net_err_down_metric = ts_mon.CounterMetric(
- 'dev/net/err/down', start_time=BOOT_TIME,
- description='Total number of errors when '
- 'receiving (per interface).')
-_net_drop_up_metric = ts_mon.CounterMetric(
- 'dev/net/drop/up', start_time=BOOT_TIME,
- description='Total number of outgoing '
- 'packets that have been dropped.')
-_net_drop_down_metric = ts_mon.CounterMetric(
- 'dev/net/drop/down', start_time=BOOT_TIME,
- description='Total number of incoming '
- 'packets that have been dropped.')
-
-_net_if_isup_metric = ts_mon.BooleanMetric(
- 'dev/net/isup',
- description='Whether interface is up or down.')
-_net_if_duplex_metric = ts_mon.GaugeMetric(
- 'dev/net/duplex',
- description='Whether interface supports full or half duplex.')
-_net_if_speed_metric = ts_mon.GaugeMetric(
- 'dev/net/speed',
- description='Network interface speed in Mb.')
-_net_if_mtu_metric = ts_mon.GaugeMetric(
- 'dev/net/mtu',
- description='Network interface MTU in B.')
+_BOOT_TIME = psutil.boot_time()
_disk_read_metric = ts_mon.CounterMetric(
- 'dev/disk/read', start_time=BOOT_TIME,
+ 'dev/disk/read', start_time=_BOOT_TIME,
description='Number of Bytes read on disk.',
units=ts_mon.MetricsDataUnits.BYTES)
_disk_write_metric = ts_mon.CounterMetric(
- 'dev/disk/write', start_time=BOOT_TIME,
+ 'dev/disk/write', start_time=_BOOT_TIME,
description='Number of Bytes written on disk.',
units=ts_mon.MetricsDataUnits.BYTES)
@@ -158,7 +120,7 @@
def collect_uptime():
- _uptime_metric.set(int(time.time() - BOOT_TIME))
+ _uptime_metric.set(int(time.time() - _BOOT_TIME))
def collect_cpu_info():
@@ -230,63 +192,6 @@
_mem_total_metric.set(mem.total)
-def collect_net_info():
- """Collect network metrics."""
- _collect_net_io_counters()
- _collect_net_if_stats()
-
-
-_net_io_metrics = (
- (_net_up_metric, 'bytes_sent'),
- (_net_down_metric, 'bytes_recv'),
- (_net_err_up_metric, 'errout'),
- (_net_err_down_metric, 'errin'),
- (_net_drop_up_metric, 'dropout'),
- (_net_drop_down_metric, 'dropin'),
-)
-
-
-def _collect_net_io_counters():
- """Collect metrics for network IO counters."""
- nics = psutil.net_io_counters(pernic=True)
- for nic, counters in nics.iteritems():
- if _is_virtual_netif(nic):
- continue
- fields = {'interface': nic}
- for metric, counter_name in _net_io_metrics:
- try:
- metric.set(getattr(counters, counter_name), fields=fields)
- except ts_mon.MonitoringDecreasingValueError as ex:
- # 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.
- logger.warning(str(ex))
-
-
-_net_if_metrics = (
- (_net_if_isup_metric, 'isup'),
- (_net_if_duplex_metric, 'duplex'),
- (_net_if_speed_metric, 'speed'),
- (_net_if_mtu_metric, 'mtu'),
-)
-
-
-def _collect_net_if_stats():
- """Collect metrics for network interface stats."""
- for nic, stats in psutil.net_if_stats().iteritems():
- if _is_virtual_netif(nic):
- continue
- fields = {'interface': nic}
- for metric, counter_name in _net_if_metrics:
- metric.set(getattr(stats, counter_name), fields=fields)
-
-
-def _is_virtual_netif(nic):
- """Return whether the network interface is virtual."""
- # TODO(ayatane): Use a different way of identifying virtual interfaces
- return nic.startswith('veth')
-
-
def collect_proc_info():
autoserv_count = 0
sysmon_count = 0