Merge branch 'batman-nair-patch-2'

This commit is contained in:
Tobias Witek 2017-09-10 09:16:49 +02:00
commit b4dcfb792c

View file

@ -5,6 +5,7 @@
Parameters: Parameters:
* traffic.exclude: Comma-separated list of interface prefixes to exclude (defaults to "lo,virbr,docker,vboxnet,veth") * traffic.exclude: Comma-separated list of interface prefixes to exclude (defaults to "lo,virbr,docker,vboxnet,veth")
* traffic.states: Comma-separated list of states to show (prefix with "^" to invert - i.e. ^down -> show all devices that are not in state down) * traffic.states: Comma-separated list of states to show (prefix with "^" to invert - i.e. ^down -> show all devices that are not in state down)
* traffic.showname: If set to False, hide network interface name (defaults to True)
""" """
import re import re
@ -23,6 +24,7 @@ class Module(bumblebee.engine.Module):
self._exclude = tuple(filter(len, self.parameter("exclude", "lo,virbr,docker,vboxnet,veth").split(","))) self._exclude = tuple(filter(len, self.parameter("exclude", "lo,virbr,docker,vboxnet,veth").split(",")))
self._status = "" self._status = ""
self._showname = bumblebee.util.asbool(self.parameter("showname", True))
self._prev = {} self._prev = {}
self._states = {} self._states = {}
self._states["include"] = [] self._states["include"] = []
@ -85,8 +87,9 @@ class Module(bumblebee.engine.Module):
} }
name = "traffic-{}".format(interface) name = "traffic-{}".format(interface)
self.create_widget(widgets, name, interface) if self._showname:
self.create_widget(widgets, name, interface)
for direction in ["rx", "tx"]: for direction in ["rx", "tx"]:
name = "traffic.{}-{}".format(direction, interface) name = "traffic.{}-{}".format(direction, interface)