check_ping: improve parser

ConSol-Monitoring · Oct 21, 2024 · eed9f36 · eed9f36
1 parent d731ee7
commit eed9f36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/snclient/check_ping.go b/pkg/snclient/check_ping.go
@@ -180,8 +180,9 @@ func (l *CheckPing) parsePingOutput(output, stderr string) (entry map[string]str
 	output = strings.TrimSpace(output)
 	// passthrough some known errors
 	switch {
-	case strings.Contains(output, "Name or service not known"):
-		entry["_error"] = output
+	case strings.Contains(output, "Name or service not known"),
+		strings.Contains(output, "Unknown host"):
+		entry["_error"] = "failed to resolve hostname"
 	default:
 		entry["_error"] = fmt.Sprintf("cannot parse ping output: %s", output)
 	}

diff --git a/pkg/snclient/check_ping_test.go b/pkg/snclient/check_ping_test.go
@@ -16,15 +16,15 @@ CheckBuiltinPlugins = enabled
 
 	res := snc.RunCheck("check_ping", []string{"host=localhost"})
 	assert.Equalf(t, CheckExitOK, res.State, "state ok")
-	assert.Regexpf(t, `^OK - Packet loss = \d+%, RTA = [\d.]+ms \|'rta'=[\d.]+ms;1000;5000 'pl'=\d+%;30;80;0`, string(res.BuildPluginOutput()), "output matches")
+	assert.Regexpf(t, `^OK - Packet loss = [\d.]+%, RTA = [\d.]+ms \|'rta'=[\d.]+ms;1000;5000 'pl'=\d+%;30;80;0`, string(res.BuildPluginOutput()), "output matches")
 
 	res = snc.RunCheck("check_ping", []string{"host=10.99.99.99"})
 	assert.Equalf(t, CheckExitCritical, res.State, "state critical")
-	assert.Regexpf(t, `^CRITICAL - Packet loss = 100% \|'rta'=U 'pl'=100%;30;80;0`, string(res.BuildPluginOutput()), "output matches")
+	assert.Regexpf(t, `^CRITICAL - Packet loss = 100(|\.0)% \|'rta'=U 'pl'=100%;30;80;0`, string(res.BuildPluginOutput()), "output matches")
 
 	res = snc.RunCheck("check_ping", []string{"host=should_not_resolve.nowhere"})
 	assert.Equalf(t, CheckExitUnknown, res.State, "state unknown")
-	assert.Regexpf(t, `^UNKNOWN - ping: should_not_resolve.nowhere: Name or service not known`, string(res.BuildPluginOutput()), "output matches")
+	assert.Regexpf(t, `^UNKNOWN - failed to resolve hostname`, string(res.BuildPluginOutput()), "output matches")
 
 	StopTestAgent(t, snc)
 }