dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for setting bsd source address to the ping input (#3726)

This commit is contained in:
Philipp Weber 2018-01-29 23:01:00 +01:00 committed by Daniel Nelson
parent a6e100fd54
commit 90efb9c844
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/inputs/ping/README.md
View File

@ -17,7 +17,8 @@ urls = ["www.google.com"] # required
# ping_interval = 1.0 # ping_interval = 1.0
## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>) ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
# timeout = 1.0 # timeout = 1.0
## interface to send ping from (ping -I <INTERFACE>) ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
# interface = "" # interface = ""
``` ```

15
plugins/inputs/ping/ping.go
View File

@ -34,7 +34,7 @@ type Ping struct {
// Ping timeout, in seconds. 0 means no timeout (ping -W <TIMEOUT>) // Ping timeout, in seconds. 0 means no timeout (ping -W <TIMEOUT>)
Timeout float64 Timeout float64
// Interface to send ping from (ping -I <INTERFACE>) // Interface or source address to send ping from (ping -I/-S <INTERFACE/SRC_ADDR>)
Interface string Interface string
// URLs to ping // URLs to ping
@ -60,7 +60,8 @@ const sampleConfig = `
# ping_interval = 1.0 # ping_interval = 1.0
## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>) ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
# timeout = 1.0 # timeout = 1.0
## interface to send ping from (ping -I <INTERFACE>) ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
# interface = "" # interface = ""
` `
@ -179,7 +180,15 @@ func (p *Ping) args(url string) []string {
} }
} }
if p.Interface != "" { if p.Interface != "" {
args = append(args, "-I", p.Interface) switch runtime.GOOS {
case "linux":
args = append(args, "-I", p.Interface)
case "freebsd", "darwin":
args = append(args, "-S", p.Interface)
default:
// Not sure the best option here, just assume GNU ping?
args = append(args, "-I", p.Interface)
}
} }
args = append(args, url) args = append(args, url)
return args return args