Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for glob patterns in net input plugin #3140

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions plugins/inputs/system/NET_README.md
Expand Up @@ -9,9 +9,11 @@ This plugin gathers metrics about network interface and protocol usage (Linux on
[[inputs.net]]
## By default, telegraf gathers stats from any up interface (excluding loopback)
## Setting interfaces will tell it to gather these explicit interfaces,
## regardless of status.
## regardless of status. When specifying an interface, glob-style
## patterns are also supported.
##
# interfaces = ["eth*", "enp0s[0-1]", "lo"]
##
# interfaces = ["eth0"]
```

### Measurements & Fields:
Expand Down
17 changes: 11 additions & 6 deletions plugins/inputs/system/net.go
Expand Up @@ -6,11 +6,13 @@ import (
"strings"

"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/filter"
"github.com/influxdata/telegraf/plugins/inputs"
)

type NetIOStats struct {
ps PS
filter filter.Filter
ps PS

skipChecks bool
Interfaces []string
Expand Down Expand Up @@ -38,15 +40,18 @@ func (s *NetIOStats) Gather(acc telegraf.Accumulator) error {
return fmt.Errorf("error getting net io info: %s", err)
}

if s.filter == nil {
if s.filter, err = filter.Compile(s.Interfaces); err != nil {
return fmt.Errorf("error compiling filter: %s", err)
}
}

for _, io := range netio {
if len(s.Interfaces) != 0 {
var found bool

for _, name := range s.Interfaces {
if name == io.Name {
found = true
break
}
if s.filter.Match(io.Name) {
found = true
}

if !found {
Expand Down