From eb0215c38210e095e8ac27c11357f5a372ac76d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 16 Aug 2017 11:59:41 -0700
Subject: [PATCH] Remove log message on ping timeout (#3126)
---
plugins/inputs/ping/ping.go | 29 +++++++++++++++++++++++++----
plugins/inputs/ping/ping_test.go | 3 ++-
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index af671e49..dffa8875 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -4,11 +4,13 @@ package ping
import (
"errors"
+ "fmt"
"os/exec"
"runtime"
"strconv"
"strings"
"sync"
+ "syscall"
"time"
"github.com/influxdata/telegraf"
@@ -76,17 +78,36 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
defer wg.Done()
args := p.args(u)
totalTimeout := float64(p.Count)*p.Timeout + float64(p.Count-1)*p.PingInterval
+
out, err := p.pingHost(totalTimeout, args...)
if err != nil {
- // Combine go err + stderr output
- acc.AddError(errors.New(
- strings.TrimSpace(out) + ", " + err.Error()))
+ // Some implementations of ping return a 1 exit code on
+ // timeout, if this occurs we will not exit and try to parse
+ // the output.
+ status := -1
+ if exitError, ok := err.(*exec.ExitError); ok {
+ if ws, ok := exitError.Sys().(syscall.WaitStatus); ok {
+ status = ws.ExitStatus()
+ }
+ }
+
+ if status != 1 {
+ // Combine go err + stderr output
+ out = strings.TrimSpace(out)
+ if len(out) > 0 {
+ acc.AddError(fmt.Errorf("%s, %s", out, err))
+ } else {
+ acc.AddError(err)
+ }
+ return
+ }
}
+
tags := map[string]string{"url": u}
trans, rec, min, avg, max, stddev, err := processPingOutput(out)
if err != nil {
// fatal error
- acc.AddError(err)
+ acc.AddError(fmt.Errorf("%s: %s", err, u))
return
}
// Calculate packet loss percentage
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index e924d517..8d422d4b 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -211,7 +211,8 @@ Request timeout for icmp_seq 0
`
func mockErrorHostPinger(timeout float64, args ...string) (string, error) {
- return errorPingOutput, errors.New("No packets received")
+ // This error will not trigger correct error paths
+ return errorPingOutput, nil
}
// Test that Gather works on a ping with no transmitted packets, even though the
--
GitLab