feat: enhance rules to UNKNOWN status

macrat · Apr 11, 2021 · 70694bd · 70694bd
1 parent f65ce88
commit 70694bd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/probe/exec.go b/probe/exec.go
@@ -2,6 +2,7 @@ package probe
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -64,6 +65,10 @@ func (p ExecuteProbe) Check() store.Record {
 
 	if err != nil {
 		status = store.STATUS_FAIL
+		if e := errors.Unwrap(err); e != nil && e.Error() == "no such file or directory" || e.Error() == "executable file not found in $PATH" {
+			status = store.STATUS_UNKNOWN
+		}
+
 		if message == "" {
 			message = err.Error()
 		}

diff --git a/probe/http.go b/probe/http.go
@@ -2,6 +2,7 @@ package probe
 
 import (
 	"errors"
+	"net"
 	"net/http"
 	"net/url"
 	"strings"
@@ -82,7 +83,9 @@ func (p HTTPProbe) Check() store.Record {
 	message := ""
 	if err != nil {
 		message = err.Error()
-		status = store.STATUS_UNKNOWN
+		if e, ok := errors.Unwrap(errors.Unwrap(err)).(*net.DNSError); ok && e.IsNotFound {
+			status = store.STATUS_UNKNOWN
+		}
 	} else {
 		message = resp.Status
 		if 200 <= resp.StatusCode && resp.StatusCode <= 299 {

diff --git a/probe/ping.go b/probe/ping.go
@@ -2,6 +2,7 @@ package probe
 
 import (
 	"fmt"
+	"net"
 	"net/url"
 	"time"
 
@@ -28,10 +29,16 @@ func (p PingProbe) Target() *url.URL {
 func (p PingProbe) Check() store.Record {
 	pinger, err := ping.NewPinger(p.target.Opaque)
 	if err != nil {
+		status := store.STATUS_FAIL
+
+		if e, ok := err.(*net.DNSError); ok && e.IsNotFound {
+			status = store.STATUS_UNKNOWN
+		}
+
 		return store.Record{
 			CheckedAt: time.Now(),
 			Target:    p.target,
-			Status:    store.STATUS_FAIL,
+			Status:    status,
 			Message:   err.Error(),
 		}
 	}
@@ -43,10 +50,7 @@ func (p PingProbe) Check() store.Record {
 
 	startTime := time.Now()
 
-	err = pinger.Run()
-	if err != nil {
-		fmt.Println(err)
-	}
+	pinger.Run()
 
 	stat := pinger.Statistics()
 

diff --git a/probe/tcp.go b/probe/tcp.go
@@ -1,6 +1,7 @@
 package probe
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -39,6 +40,12 @@ func (p TCPProbe) Check() store.Record {
 	if err != nil {
 		r.Status = store.STATUS_FAIL
 		r.Message = err.Error()
+		if _, ok := errors.Unwrap(err).(*net.AddrError); ok {
+			r.Status = store.STATUS_UNKNOWN
+		}
+		if e, ok := errors.Unwrap(err).(*net.DNSError); ok && e.IsNotFound {
+			r.Status = store.STATUS_UNKNOWN
+		}
 	} else {
 		r.Status = store.STATUS_OK
 		r.Message = fmt.Sprintf("%s -> %s", conn.LocalAddr(), conn.RemoteAddr())