Set default ping count in Windows

fixes #2934
This commit is contained in:
Daniel Nelson 2017-06-16 13:39:55 -07:00
parent a375c9ac6b
commit 4f095bfc1c
1 changed files with 15 additions and 8 deletions

View File

@ -3,15 +3,16 @@ package ping
import ( import (
"errors" "errors"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/plugins/inputs"
"os/exec" "os/exec"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/plugins/inputs"
) )
// HostPinger is a function that runs the "ping" function using a list of // HostPinger is a function that runs the "ping" function using a list of
@ -38,14 +39,14 @@ func (s *Ping) Description() string {
} }
const sampleConfig = ` const sampleConfig = `
## urls to ping ## List of urls to ping
urls = ["www.google.com"] # required urls = ["www.google.com"]
## number of pings to send per collection (ping -n <COUNT>) ## number of pings to send per collection (ping -n <COUNT>)
count = 4 # required # count = 1
## Ping timeout, in seconds. 0.0 means default timeout (ping -w <TIMEOUT>) ## Ping timeout, in seconds. 0.0 means default timeout (ping -w <TIMEOUT>)
#timeout = 0.0 # timeout = 0.0
` `
func (s *Ping) SampleConfig() string { func (s *Ping) SampleConfig() string {
@ -145,6 +146,9 @@ func (p *Ping) args(url string) []string {
} }
func (p *Ping) Gather(acc telegraf.Accumulator) error { func (p *Ping) Gather(acc telegraf.Accumulator) error {
if p.Count < 1 {
p.Count = 1
}
var wg sync.WaitGroup var wg sync.WaitGroup
errorChannel := make(chan error, len(p.Urls)*2) errorChannel := make(chan error, len(p.Urls)*2)
var pendingError error = nil var pendingError error = nil
@ -218,6 +222,9 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
func init() { func init() {
inputs.Add("ping", func() telegraf.Input { inputs.Add("ping", func() telegraf.Input {
return &Ping{pingHost: hostPinger} return &Ping{
pingHost: hostPinger,
Count: 1,
}
}) })
} }