CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ethtool] interface_up field added (#8590) 

Co-authored-by: Pawel Zak <Pawel Zak>
Co-authored-by: Sven Rebhan <36194019+srebhan@users.noreply.github.com>
This commit is contained in:
Paweł Żak 2020-12-18 18:04:02 +01:00 committed by GitHub
parent 04e62e3d23
commit 7bf8cdb8e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/inputs/ethtool/README.md
View File

@ -1,6 +1,6 @@
# Ethtool Input Plugin # Ethtool Input Plugin
The ethtool input plugin pulls ethernet device stats. Fields pulled will depend on the network device and driver The ethtool input plugin pulls ethernet device stats. Fields pulled will depend on the network device and driver.
### Configuration: ### Configuration:
@ -14,20 +14,20 @@ The ethtool input plugin pulls ethernet device stats. Fields pulled will depend
# interface_exclude = ["eth1"] # interface_exclude = ["eth1"]
``` ```
Interfaces can be included or ignored using Interfaces can be included or ignored using:
- `interface_include` - `interface_include`
- `interface_exclude` - `interface_exclude`
Note that loopback interfaces will be automatically ignored Note that loopback interfaces will be automatically ignored.
### Metrics: ### Metrics:
Metrics are dependant on the network device and driver Metrics are dependent on the network device and driver.
### Example Output: ### Example Output:
``` ```
ethtool,driver=igb,host=test01,interface=mgmt0 tx_queue_1_packets=280782i,rx_queue_5_csum_err=0i,tx_queue_4_restart=0i,tx_multicast=7i,tx_queue_1_bytes=39674885i,rx_queue_2_alloc_failed=0i,tx_queue_5_packets=173970i,tx_single_coll_ok=0i,rx_queue_1_drops=0i,tx_queue_2_restart=0i,tx_aborted_errors=0i,rx_queue_6_csum_err=0i,tx_queue_5_restart=0i,tx_queue_4_bytes=64810835i,tx_abort_late_coll=0i,tx_queue_4_packets=109102i,os2bmc_tx_by_bmc=0i,tx_bytes=427527435i,tx_queue_7_packets=66665i,dropped_smbus=0i,rx_queue_0_csum_err=0i,tx_flow_control_xoff=0i,rx_packets=25926536i,rx_queue_7_csum_err=0i,rx_queue_3_bytes=84326060i,rx_multicast=83771i,rx_queue_4_alloc_failed=0i,rx_queue_3_drops=0i,rx_queue_3_csum_err=0i,rx_errors=0i,tx_errors=0i,tx_queue_6_packets=183236i,rx_broadcast=24378893i,rx_queue_7_packets=88680i,tx_dropped=0i,rx_frame_errors=0i,tx_queue_3_packets=161045i,tx_packets=1257017i,rx_queue_1_csum_err=0i,tx_window_errors=0i,tx_dma_out_of_sync=0i,rx_length_errors=0i,rx_queue_5_drops=0i,tx_timeout_count=0i,rx_queue_4_csum_err=0i,rx_flow_control_xon=0i,tx_heartbeat_errors=0i,tx_flow_control_xon=0i,collisions=0i,tx_queue_0_bytes=29465801i,rx_queue_6_drops=0i,rx_queue_0_alloc_failed=0i,tx_queue_1_restart=0i,rx_queue_0_drops=0i,tx_broadcast=9i,tx_carrier_errors=0i,tx_queue_7_bytes=13777515i,tx_queue_7_restart=0i,rx_queue_5_bytes=50732006i,rx_queue_7_bytes=35744457i,tx_deferred_ok=0i,tx_multi_coll_ok=0i,rx_crc_errors=0i,rx_fifo_errors=0i,rx_queue_6_alloc_failed=0i,tx_queue_2_packets=175206i,tx_queue_0_packets=107011i,rx_queue_4_bytes=201364548i,rx_queue_6_packets=372573i,os2bmc_rx_by_host=0i,multicast=83771i,rx_queue_4_drops=0i,rx_queue_5_packets=130535i,rx_queue_6_bytes=139488035i,tx_fifo_errors=0i,tx_queue_5_bytes=84899130i,rx_queue_0_packets=24529563i,rx_queue_3_alloc_failed=0i,rx_queue_7_drops=0i,tx_queue_6_bytes=96288614i,tx_queue_2_bytes=22132949i,tx_tcp_seg_failed=0i,rx_queue_1_bytes=246703840i,rx_queue_0_bytes=1506870738i,tx_queue_0_restart=0i,rx_queue_2_bytes=111344804i,tx_tcp_seg_good=0i,tx_queue_3_restart=0i,rx_no_buffer_count=0i,rx_smbus=0i,rx_queue_1_packets=273865i,rx_over_errors=0i,os2bmc_tx_by_host=0i,rx_queue_1_alloc_failed=0i,rx_queue_7_alloc_failed=0i,rx_short_length_errors=0i,tx_hwtstamp_timeouts=0i,tx_queue_6_restart=0i,rx_queue_2_packets=207136i,tx_queue_3_bytes=70391970i,rx_queue_3_packets=112007i,rx_queue_4_packets=212177i,tx_smbus=0i,rx_long_byte_count=2480280632i,rx_queue_2_csum_err=0i,rx_missed_errors=0i,rx_bytes=2480280632i,rx_queue_5_alloc_failed=0i,rx_queue_2_drops=0i,os2bmc_rx_by_bmc=0i,rx_align_errors=0i,rx_long_length_errors=0i,rx_hwtstamp_cleared=0i,rx_flow_control_xoff=0i 1564658080000000000 ethtool,driver=igb,host=test01,interface=mgmt0 tx_queue_1_packets=280782i,rx_queue_5_csum_err=0i,tx_queue_4_restart=0i,tx_multicast=7i,tx_queue_1_bytes=39674885i,rx_queue_2_alloc_failed=0i,tx_queue_5_packets=173970i,tx_single_coll_ok=0i,rx_queue_1_drops=0i,tx_queue_2_restart=0i,tx_aborted_errors=0i,rx_queue_6_csum_err=0i,tx_queue_5_restart=0i,tx_queue_4_bytes=64810835i,tx_abort_late_coll=0i,tx_queue_4_packets=109102i,os2bmc_tx_by_bmc=0i,tx_bytes=427527435i,tx_queue_7_packets=66665i,dropped_smbus=0i,rx_queue_0_csum_err=0i,tx_flow_control_xoff=0i,rx_packets=25926536i,rx_queue_7_csum_err=0i,rx_queue_3_bytes=84326060i,rx_multicast=83771i,rx_queue_4_alloc_failed=0i,rx_queue_3_drops=0i,rx_queue_3_csum_err=0i,rx_errors=0i,tx_errors=0i,tx_queue_6_packets=183236i,rx_broadcast=24378893i,rx_queue_7_packets=88680i,tx_dropped=0i,rx_frame_errors=0i,tx_queue_3_packets=161045i,tx_packets=1257017i,rx_queue_1_csum_err=0i,tx_window_errors=0i,tx_dma_out_of_sync=0i,rx_length_errors=0i,rx_queue_5_drops=0i,tx_timeout_count=0i,rx_queue_4_csum_err=0i,rx_flow_control_xon=0i,tx_heartbeat_errors=0i,tx_flow_control_xon=0i,collisions=0i,tx_queue_0_bytes=29465801i,rx_queue_6_drops=0i,rx_queue_0_alloc_failed=0i,tx_queue_1_restart=0i,rx_queue_0_drops=0i,tx_broadcast=9i,tx_carrier_errors=0i,tx_queue_7_bytes=13777515i,tx_queue_7_restart=0i,rx_queue_5_bytes=50732006i,rx_queue_7_bytes=35744457i,tx_deferred_ok=0i,tx_multi_coll_ok=0i,rx_crc_errors=0i,rx_fifo_errors=0i,rx_queue_6_alloc_failed=0i,tx_queue_2_packets=175206i,tx_queue_0_packets=107011i,rx_queue_4_bytes=201364548i,rx_queue_6_packets=372573i,os2bmc_rx_by_host=0i,multicast=83771i,rx_queue_4_drops=0i,rx_queue_5_packets=130535i,rx_queue_6_bytes=139488035i,tx_fifo_errors=0i,tx_queue_5_bytes=84899130i,rx_queue_0_packets=24529563i,rx_queue_3_alloc_failed=0i,rx_queue_7_drops=0i,tx_queue_6_bytes=96288614i,tx_queue_2_bytes=22132949i,tx_tcp_seg_failed=0i,rx_queue_1_bytes=246703840i,rx_queue_0_bytes=1506870738i,tx_queue_0_restart=0i,rx_queue_2_bytes=111344804i,tx_tcp_seg_good=0i,tx_queue_3_restart=0i,rx_no_buffer_count=0i,rx_smbus=0i,rx_queue_1_packets=273865i,rx_over_errors=0i,os2bmc_tx_by_host=0i,rx_queue_1_alloc_failed=0i,rx_queue_7_alloc_failed=0i,rx_short_length_errors=0i,tx_hwtstamp_timeouts=0i,tx_queue_6_restart=0i,rx_queue_2_packets=207136i,tx_queue_3_bytes=70391970i,rx_queue_3_packets=112007i,rx_queue_4_packets=212177i,tx_smbus=0i,rx_long_byte_count=2480280632i,rx_queue_2_csum_err=0i,rx_missed_errors=0i,rx_bytes=2480280632i,rx_queue_5_alloc_failed=0i,rx_queue_2_drops=0i,os2bmc_rx_by_bmc=0i,rx_align_errors=0i,rx_long_length_errors=0i,interface_up=1i,rx_hwtstamp_cleared=0i,rx_flow_control_xoff=0i 1564658080000000000
ethtool,driver=igb,host=test02,interface=mgmt0 rx_queue_2_bytes=111344804i,tx_queue_3_bytes=70439858i,multicast=83771i,rx_broadcast=24378975i,tx_queue_0_packets=107011i,rx_queue_6_alloc_failed=0i,rx_queue_6_drops=0i,rx_hwtstamp_cleared=0i,tx_window_errors=0i,tx_tcp_seg_good=0i,rx_queue_1_drops=0i,tx_queue_1_restart=0i,rx_queue_7_csum_err=0i,rx_no_buffer_count=0i,tx_queue_1_bytes=39675245i,tx_queue_5_bytes=84899130i,tx_broadcast=9i,rx_queue_1_csum_err=0i,tx_flow_control_xoff=0i,rx_queue_6_csum_err=0i,tx_timeout_count=0i,os2bmc_tx_by_bmc=0i,rx_queue_6_packets=372577i,rx_queue_0_alloc_failed=0i,tx_flow_control_xon=0i,rx_queue_2_drops=0i,tx_queue_2_packets=175206i,rx_queue_3_csum_err=0i,tx_abort_late_coll=0i,tx_queue_5_restart=0i,tx_dropped=0i,rx_queue_2_alloc_failed=0i,tx_multi_coll_ok=0i,rx_queue_1_packets=273865i,rx_flow_control_xon=0i,tx_single_coll_ok=0i,rx_length_errors=0i,rx_queue_7_bytes=35744457i,rx_queue_4_alloc_failed=0i,rx_queue_6_bytes=139488395i,rx_queue_2_csum_err=0i,rx_long_byte_count=2480288216i,rx_queue_1_alloc_failed=0i,tx_queue_0_restart=0i,rx_queue_0_csum_err=0i,tx_queue_2_bytes=22132949i,rx_queue_5_drops=0i,tx_dma_out_of_sync=0i,rx_queue_3_drops=0i,rx_queue_4_packets=212177i,tx_queue_6_restart=0i,rx_packets=25926650i,rx_queue_7_packets=88680i,rx_frame_errors=0i,rx_queue_3_bytes=84326060i,rx_short_length_errors=0i,tx_queue_7_bytes=13777515i,rx_queue_3_alloc_failed=0i,tx_queue_6_packets=183236i,rx_queue_0_drops=0i,rx_multicast=83771i,rx_queue_2_packets=207136i,rx_queue_5_csum_err=0i,rx_queue_5_packets=130535i,rx_queue_7_alloc_failed=0i,tx_smbus=0i,tx_queue_3_packets=161081i,rx_queue_7_drops=0i,tx_queue_2_restart=0i,tx_multicast=7i,tx_fifo_errors=0i,tx_queue_3_restart=0i,rx_long_length_errors=0i,tx_queue_6_bytes=96288614i,tx_queue_1_packets=280786i,tx_tcp_seg_failed=0i,rx_align_errors=0i,tx_errors=0i,rx_crc_errors=0i,rx_queue_0_packets=24529673i,rx_flow_control_xoff=0i,tx_queue_0_bytes=29465801i,rx_over_errors=0i,rx_queue_4_drops=0i,os2bmc_rx_by_bmc=0i,rx_smbus=0i,dropped_smbus=0i,tx_hwtstamp_timeouts=0i,rx_errors=0i,tx_queue_4_packets=109102i,tx_carrier_errors=0i,tx_queue_4_bytes=64810835i,tx_queue_4_restart=0i,rx_queue_4_csum_err=0i,tx_queue_7_packets=66665i,tx_aborted_errors=0i,rx_missed_errors=0i,tx_bytes=427575843i,collisions=0i,rx_queue_1_bytes=246703840i,rx_queue_5_bytes=50732006i,rx_bytes=2480288216i,os2bmc_rx_by_host=0i,rx_queue_5_alloc_failed=0i,rx_queue_3_packets=112007i,tx_deferred_ok=0i,os2bmc_tx_by_host=0i,tx_heartbeat_errors=0i,rx_queue_0_bytes=1506877506i,tx_queue_7_restart=0i,tx_packets=1257057i,rx_queue_4_bytes=201364548i,rx_fifo_errors=0i,tx_queue_5_packets=173970i 1564658090000000000 ethtool,driver=igb,host=test02,interface=mgmt0 rx_queue_2_bytes=111344804i,tx_queue_3_bytes=70439858i,multicast=83771i,rx_broadcast=24378975i,tx_queue_0_packets=107011i,rx_queue_6_alloc_failed=0i,rx_queue_6_drops=0i,rx_hwtstamp_cleared=0i,tx_window_errors=0i,tx_tcp_seg_good=0i,rx_queue_1_drops=0i,tx_queue_1_restart=0i,rx_queue_7_csum_err=0i,rx_no_buffer_count=0i,tx_queue_1_bytes=39675245i,tx_queue_5_bytes=84899130i,tx_broadcast=9i,rx_queue_1_csum_err=0i,tx_flow_control_xoff=0i,rx_queue_6_csum_err=0i,tx_timeout_count=0i,os2bmc_tx_by_bmc=0i,rx_queue_6_packets=372577i,rx_queue_0_alloc_failed=0i,tx_flow_control_xon=0i,rx_queue_2_drops=0i,tx_queue_2_packets=175206i,rx_queue_3_csum_err=0i,tx_abort_late_coll=0i,tx_queue_5_restart=0i,tx_dropped=0i,rx_queue_2_alloc_failed=0i,tx_multi_coll_ok=0i,rx_queue_1_packets=273865i,rx_flow_control_xon=0i,tx_single_coll_ok=0i,rx_length_errors=0i,rx_queue_7_bytes=35744457i,rx_queue_4_alloc_failed=0i,rx_queue_6_bytes=139488395i,rx_queue_2_csum_err=0i,rx_long_byte_count=2480288216i,rx_queue_1_alloc_failed=0i,tx_queue_0_restart=0i,rx_queue_0_csum_err=0i,tx_queue_2_bytes=22132949i,rx_queue_5_drops=0i,tx_dma_out_of_sync=0i,rx_queue_3_drops=0i,rx_queue_4_packets=212177i,tx_queue_6_restart=0i,rx_packets=25926650i,rx_queue_7_packets=88680i,rx_frame_errors=0i,rx_queue_3_bytes=84326060i,rx_short_length_errors=0i,tx_queue_7_bytes=13777515i,rx_queue_3_alloc_failed=0i,tx_queue_6_packets=183236i,rx_queue_0_drops=0i,rx_multicast=83771i,rx_queue_2_packets=207136i,rx_queue_5_csum_err=0i,rx_queue_5_packets=130535i,rx_queue_7_alloc_failed=0i,tx_smbus=0i,tx_queue_3_packets=161081i,rx_queue_7_drops=0i,tx_queue_2_restart=0i,tx_multicast=7i,tx_fifo_errors=0i,tx_queue_3_restart=0i,rx_long_length_errors=0i,tx_queue_6_bytes=96288614i,tx_queue_1_packets=280786i,tx_tcp_seg_failed=0i,rx_align_errors=0i,tx_errors=0i,rx_crc_errors=0i,rx_queue_0_packets=24529673i,rx_flow_control_xoff=0i,tx_queue_0_bytes=29465801i,rx_over_errors=0i,rx_queue_4_drops=0i,os2bmc_rx_by_bmc=0i,rx_smbus=0i,dropped_smbus=0i,tx_hwtstamp_timeouts=0i,rx_errors=0i,tx_queue_4_packets=109102i,tx_carrier_errors=0i,tx_queue_4_bytes=64810835i,tx_queue_4_restart=0i,rx_queue_4_csum_err=0i,tx_queue_7_packets=66665i,tx_aborted_errors=0i,rx_missed_errors=0i,tx_bytes=427575843i,collisions=0i,rx_queue_1_bytes=246703840i,rx_queue_5_bytes=50732006i,rx_bytes=2480288216i,os2bmc_rx_by_host=0i,rx_queue_5_alloc_failed=0i,rx_queue_3_packets=112007i,tx_deferred_ok=0i,os2bmc_tx_by_host=0i,tx_heartbeat_errors=0i,rx_queue_0_bytes=1506877506i,tx_queue_7_restart=0i,tx_packets=1257057i,rx_queue_4_bytes=201364548i,interface_up=0i,rx_fifo_errors=0i,tx_queue_5_packets=173970i 1564658090000000000
``` ```

7
plugins/inputs/ethtool/ethtool.go
View File

@ -27,9 +27,10 @@ type Ethtool struct {
} }
const ( const (
pluginName = "ethtool" pluginName = "ethtool"
tagInterface = "interface" tagInterface = "interface"
tagDriverName = "driver" tagDriverName = "driver"
fieldInterfaceUp = "interface_up"
sampleConfig = ` sampleConfig = `
## List of interfaces to pull metrics for ## List of interfaces to pull metrics for

11
plugins/inputs/ethtool/ethtool_linux.go
View File

@ -18,7 +18,6 @@ type CommandEthtool struct {
} }
func (e *Ethtool) Gather(acc telegraf.Accumulator) error { func (e *Ethtool) Gather(acc telegraf.Accumulator) error {
// Get the list of interfaces // Get the list of interfaces
interfaces, err := e.command.Interfaces() interfaces, err := e.command.Interfaces()
if err != nil { if err != nil {
@ -35,7 +34,6 @@ func (e *Ethtool) Gather(acc telegraf.Accumulator) error {
var wg sync.WaitGroup var wg sync.WaitGroup
for _, iface := range interfaces { for _, iface := range interfaces {
// Check this isn't a loop back and that its matched by the filter // Check this isn't a loop back and that its matched by the filter
if (iface.Flags&net.FlagLoopback == 0) && interfaceFilter.Match(iface.Name) { if (iface.Flags&net.FlagLoopback == 0) && interfaceFilter.Match(iface.Name) {
wg.Add(1) wg.Add(1)
@ -59,7 +57,6 @@ func (e *Ethtool) Init() error {
// Gather the stats for the interface. // Gather the stats for the interface.
func (e *Ethtool) gatherEthtoolStats(iface net.Interface, acc telegraf.Accumulator) { func (e *Ethtool) gatherEthtoolStats(iface net.Interface, acc telegraf.Accumulator) {
tags := make(map[string]string) tags := make(map[string]string)
tags[tagInterface] = iface.Name tags[tagInterface] = iface.Name
@ -80,6 +77,7 @@ func (e *Ethtool) gatherEthtoolStats(iface net.Interface, acc telegraf.Accumulat
return return
} }
fields[fieldInterfaceUp] = e.interfaceUp(iface)
for k, v := range stats { for k, v := range stats {
fields[k] = v fields[k] = v
} }
@ -87,12 +85,15 @@ func (e *Ethtool) gatherEthtoolStats(iface net.Interface, acc telegraf.Accumulat
acc.AddFields(pluginName, fields, tags) acc.AddFields(pluginName, fields, tags)
} }
func (e *Ethtool) interfaceUp(iface net.Interface) bool {
return (iface.Flags & net.FlagUp) != 0
}
func NewCommandEthtool() *CommandEthtool { func NewCommandEthtool() *CommandEthtool {
return &CommandEthtool{} return &CommandEthtool{}
} }
func (c *CommandEthtool) Init() error { func (c *CommandEthtool) Init() error {
if c.ethtool != nil { if c.ethtool != nil {
return nil return nil
} }
@ -114,7 +115,6 @@ func (c *CommandEthtool) Stats(intf string) (map[string]uint64, error) {
} }
func (c *CommandEthtool) Interfaces() ([]net.Interface, error) { func (c *CommandEthtool) Interfaces() ([]net.Interface, error) {
// Get the list of interfaces // Get the list of interfaces
interfaces, err := net.Interfaces() interfaces, err := net.Interfaces()
if err != nil { if err != nil {
@ -125,7 +125,6 @@ func (c *CommandEthtool) Interfaces() ([]net.Interface, error) {
} }
func init() { func init() {
inputs.Add(pluginName, func() telegraf.Input { inputs.Add(pluginName, func() telegraf.Input {
return &Ethtool{ return &Ethtool{
InterfaceInclude: []string{}, InterfaceInclude: []string{},

33
plugins/inputs/ethtool/ethtool_test.go
View File

@ -15,10 +15,11 @@ var command *Ethtool
var interfaceMap map[string]*InterfaceMock var interfaceMap map[string]*InterfaceMock
type InterfaceMock struct { type InterfaceMock struct {
Name string Name string
DriverName string DriverName string
Stat map[string]uint64 Stat map[string]uint64
LoopBack bool LoopBack bool
InterfaceUp bool
} }
type CommandEthtoolMock struct { type CommandEthtoolMock struct {
@ -42,11 +43,14 @@ func (c *CommandEthtoolMock) DriverName(intf string) (driverName string, err err
func (c *CommandEthtoolMock) Interfaces() ([]net.Interface, error) { func (c *CommandEthtoolMock) Interfaces() ([]net.Interface, error) {
interfaceNames := make([]net.Interface, 0) interfaceNames := make([]net.Interface, 0)
for k, v := range c.InterfaceMap { for k, v := range c.InterfaceMap {
var flag net.Flags
// Whether to set the flag to loopback // When interface is up
flag := net.FlagUp if v.InterfaceUp {
flag |= net.FlagUp
}
// For loopback interface
if v.LoopBack { if v.LoopBack {
flag = net.FlagLoopback flag |= net.FlagLoopback
} }
// Create a dummy interface // Create a dummy interface
@ -72,10 +76,10 @@ func (c *CommandEthtoolMock) Stats(intf string) (stat map[string]uint64, err err
} }
func setup() { func setup() {
interfaceMap = make(map[string]*InterfaceMock) interfaceMap = make(map[string]*InterfaceMock)
eth1Stat := map[string]uint64{ eth1Stat := map[string]uint64{
"interface_up": 1,
"port_rx_1024_to_15xx": 25167245, "port_rx_1024_to_15xx": 25167245,
"port_rx_128_to_255": 1573526387, "port_rx_128_to_255": 1573526387,
"port_rx_15xx_to_jumbo": 137819058, "port_rx_15xx_to_jumbo": 137819058,
@ -173,10 +177,11 @@ func setup() {
"tx_tso_fallbacks": 0, "tx_tso_fallbacks": 0,
"tx_tso_long_headers": 0, "tx_tso_long_headers": 0,
} }
eth1 := &InterfaceMock{"eth1", "driver1", eth1Stat, false} eth1 := &InterfaceMock{"eth1", "driver1", eth1Stat, false, true}
interfaceMap[eth1.Name] = eth1 interfaceMap[eth1.Name] = eth1
eth2Stat := map[string]uint64{ eth2Stat := map[string]uint64{
"interface_up": 0,
"port_rx_1024_to_15xx": 11529312, "port_rx_1024_to_15xx": 11529312,
"port_rx_128_to_255": 1868952037, "port_rx_128_to_255": 1868952037,
"port_rx_15xx_to_jumbo": 130339387, "port_rx_15xx_to_jumbo": 130339387,
@ -274,14 +279,14 @@ func setup() {
"tx_tso_fallbacks": 0, "tx_tso_fallbacks": 0,
"tx_tso_long_headers": 0, "tx_tso_long_headers": 0,
} }
eth2 := &InterfaceMock{"eth2", "driver1", eth2Stat, false} eth2 := &InterfaceMock{"eth2", "driver1", eth2Stat, false, false}
interfaceMap[eth2.Name] = eth2 interfaceMap[eth2.Name] = eth2
// dummy loopback including dummy stat to ensure that the ignore feature is working // dummy loopback including dummy stat to ensure that the ignore feature is working
lo0Stat := map[string]uint64{ lo0Stat := map[string]uint64{
"dummy": 0, "dummy": 0,
} }
lo0 := &InterfaceMock{"lo0", "", lo0Stat, true} lo0 := &InterfaceMock{"lo0", "", lo0Stat, true, true}
interfaceMap[lo0.Name] = lo0 interfaceMap[lo0.Name] = lo0
c := &CommandEthtoolMock{interfaceMap} c := &CommandEthtoolMock{interfaceMap}
@ -301,7 +306,6 @@ func toStringMapInterface(in map[string]uint64) map[string]interface{} {
} }
func TestGather(t *testing.T) { func TestGather(t *testing.T) {
setup() setup()
var acc testutil.Accumulator var acc testutil.Accumulator
@ -324,7 +328,6 @@ func TestGather(t *testing.T) {
} }
func TestGatherIncludeInterfaces(t *testing.T) { func TestGatherIncludeInterfaces(t *testing.T) {
setup() setup()
var acc testutil.Accumulator var acc testutil.Accumulator
@ -352,7 +355,6 @@ func TestGatherIncludeInterfaces(t *testing.T) {
} }
func TestGatherIgnoreInterfaces(t *testing.T) { func TestGatherIgnoreInterfaces(t *testing.T) {
setup() setup()
var acc testutil.Accumulator var acc testutil.Accumulator
@ -377,5 +379,4 @@ func TestGatherIgnoreInterfaces(t *testing.T) {
"driver": "driver1", "driver": "driver1",
} }
acc.AssertContainsTaggedFields(t, pluginName, expectedFieldsEth2, expectedTagsEth2) acc.AssertContainsTaggedFields(t, pluginName, expectedFieldsEth2, expectedTagsEth2)
} }