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

Use same flags for all bsd family ping varients (#4241) 

(cherry picked from commit 7fe6e2f5ae)
This commit is contained in:
Daniel Nelson 2018-06-06 14:28:12 -07:00 committed by Daniel Nelson
parent 27cd582f27
commit b4a0c854f5
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ func (p *Ping) args(url string) []string {
} }
if p.Timeout > 0 { if p.Timeout > 0 {
switch runtime.GOOS { switch runtime.GOOS {
case "darwin": case "darwin", "freebsd", "netbsd", "openbsd":
args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64)) args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
case "linux": case "linux":
args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64)) args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64))
@ -186,7 +186,7 @@ func (p *Ping) args(url string) []string {
} }
if p.Deadline > 0 { if p.Deadline > 0 {
switch runtime.GOOS { switch runtime.GOOS {
case "darwin": case "darwin", "freebsd", "netbsd", "openbsd":
args = append(args, "-t", strconv.Itoa(p.Deadline)) args = append(args, "-t", strconv.Itoa(p.Deadline))
case "linux": case "linux":
args = append(args, "-w", strconv.Itoa(p.Deadline)) args = append(args, "-w", strconv.Itoa(p.Deadline))
@ -197,10 +197,10 @@ func (p *Ping) args(url string) []string {
} }
if p.Interface != "" { if p.Interface != "" {
switch runtime.GOOS { switch runtime.GOOS {
case "darwin", "freebsd", "netbsd", "openbsd":
args = append(args, "-S", p.Interface)
case "linux": case "linux":
args = append(args, "-I", p.Interface) args = append(args, "-I", p.Interface)
case "freebsd", "darwin":
args = append(args, "-S", p.Interface)
default: default:
// Not sure the best option here, just assume GNU ping? // Not sure the best option here, just assume GNU ping?
args = append(args, "-I", p.Interface) args = append(args, "-I", p.Interface)