sysmon: Fix references to ts_mon units
BUG=chromium:741082
TEST=None
Change-Id: I9e270c294a66ce46e44747b9f5bfd29dcb0aedf8
Reviewed-on: https://chromium-review.googlesource.com/568161
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Allen Li <ayatane@chromium.org>
diff --git a/scripts/sysmon/net_metrics.py b/scripts/sysmon/net_metrics.py
index 83baf72..b0087e7 100644
--- a/scripts/sysmon/net_metrics.py
+++ b/scripts/sysmon/net_metrics.py
@@ -13,7 +13,6 @@
from chromite.lib import cros_logging as logging
from chromite.lib import metrics
-
from infra_libs import ts_mon
logger = logging.getLogger(__name__)
@@ -22,13 +21,11 @@
_net_up_metric = metrics.CounterMetric(
'dev/net/bytes/up', start_time=_BOOT_TIME,
- description='Number of bytes sent on interface.',
- units=ts_mon.MetricsDataUnits.BYTES)
+ description='Number of bytes sent on interface.')
_net_down_metric = metrics.CounterMetric(
'dev/net/bytes/down', start_time=_BOOT_TIME,
description='Number of Bytes received on '
- 'interface.',
- units=metrics.MetricsDataUnits.BYTES)
+ 'interface.')
_net_err_up_metric = metrics.CounterMetric(
'dev/net/err/up', start_time=_BOOT_TIME,
description='Total number of errors when '
@@ -48,12 +45,10 @@
_net_bytes_metric = metrics.CounterMetric(
'dev/net/bytes', start_time=_BOOT_TIME,
- description='Number of bytes up/down on interface.',
- units=metrics.MetricsDataUnits.BYTES)
+ description='Number of bytes up/down on interface.')
_net_packets_metric = metrics.CounterMetric(
'dev/net/packets', start_time=_BOOT_TIME,
- description='Number of packets up/down on interface.',
- units=metrics.MetricsDataUnits.BYTES)
+ description='Number of packets up/down on interface.')
_net_errors_metric = metrics.CounterMetric(
'dev/net/errors', start_time=_BOOT_TIME,
description='Total number of errors up/down on interface.')
@@ -87,18 +82,18 @@
'down_counter_name'])
_net_io_duplex_metrics = (
- _IOMetric(metric=_net_bytes_metric,
- up_counter_name='bytes_sent',
- down_counter_name='bytes_recv'),
- _IOMetric(metric=_net_packets_metric,
- up_counter_name='packets_sent',
- down_counter_name='packets_recv'),
- _IOMetric(metric=_net_errors_metric,
- up_counter_name='errout',
- down_counter_name='errin'),
- _IOMetric(metric=_net_dropped_metric,
- up_counter_name='dropout',
- down_counter_name='dropin'),
+ _IOMetric(metric=_net_bytes_metric,
+ up_counter_name='bytes_sent',
+ down_counter_name='bytes_recv'),
+ _IOMetric(metric=_net_packets_metric,
+ up_counter_name='packets_sent',
+ down_counter_name='packets_recv'),
+ _IOMetric(metric=_net_errors_metric,
+ up_counter_name='errout',
+ down_counter_name='errin'),
+ _IOMetric(metric=_net_dropped_metric,
+ up_counter_name='dropout',
+ down_counter_name='dropin'),
)
@@ -120,12 +115,12 @@
_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'),
+ (_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'),
)
@@ -153,10 +148,10 @@
_net_if_metrics = (
- (_net_if_isup_metric, 'isup'),
- (_net_if_duplex_metric, 'duplex'),
- (_net_if_speed_metric, 'speed'),
- (_net_if_mtu_metric, 'mtu'),
+ (_net_if_isup_metric, 'isup'),
+ (_net_if_duplex_metric, 'duplex'),
+ (_net_if_speed_metric, 'speed'),
+ (_net_if_mtu_metric, 'mtu'),
)
@@ -171,6 +166,6 @@
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')
+ """Return whether the network interface is virtual."""
+ # TODO(ayatane): Use a different way of identifying virtual interfaces
+ return nic.startswith('veth')