diff --git a/checker/rule.go b/checker/rule.go index 29ed887..3b0886c 100644 --- a/checker/rule.go +++ b/checker/rule.go @@ -32,14 +32,14 @@ func (r *xmppRule) ValidateOptions(opts sdk.CheckerOptions) error { return nil } -func (r *xmppRule) Evaluate(ctx context.Context, obs sdk.ObservationGetter, opts sdk.CheckerOptions) sdk.CheckState { +func (r *xmppRule) Evaluate(ctx context.Context, obs sdk.ObservationGetter, opts sdk.CheckerOptions) []sdk.CheckState { var data XMPPData if err := obs.Get(ctx, ObservationKeyXMPP, &data); err != nil { - return sdk.CheckState{ + return []sdk.CheckState{{ Status: sdk.StatusError, Message: fmt.Sprintf("failed to load XMPP observation: %v", err), Code: "xmpp.observation_error", - } + }} } issues := append([]Issue(nil), data.Issues...) @@ -113,26 +113,26 @@ func (r *xmppRule) Evaluate(ctx context.Context, obs sdk.ObservationGetter, opts switch worst { case sdk.StatusOK: - return sdk.CheckState{ + return []sdk.CheckState{{ Status: sdk.StatusOK, Message: fmt.Sprintf("XMPP operational (c2s=%v, s2s=%v, %d endpoints)", data.Coverage.WorkingC2S, data.Coverage.WorkingS2S, len(data.Endpoints)), Code: "xmpp.ok", Meta: meta, - } + }} case sdk.StatusWarn: - return sdk.CheckState{ + return []sdk.CheckState{{ Status: sdk.StatusWarn, Message: "XMPP works with warnings: " + joinTop(warnMsgs, 2), Code: firstWarnCode, Meta: meta, - } + }} default: - return sdk.CheckState{ + return []sdk.CheckState{{ Status: sdk.StatusCrit, Message: "XMPP broken: " + joinTop(critMsgs, 2), Code: firstCritCode, Meta: meta, - } + }} } } diff --git a/go.mod b/go.mod index e181a72..436824e 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module git.happydns.org/checker-xmpp go 1.25.0 require ( - git.happydns.org/checker-sdk-go v1.1.0 - git.happydns.org/checker-tls v0.1.0 + git.happydns.org/checker-sdk-go v1.2.0 + git.happydns.org/checker-tls v0.2.0 github.com/miekg/dns v1.1.72 ) diff --git a/go.sum b/go.sum index 5ff535c..60c7216 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ -git.happydns.org/checker-sdk-go v0.0.1 h1:4RxCJr73HWKxjOyU/6NJMO8lXJmH0gMLA68EzTqLbQI= -git.happydns.org/checker-sdk-go v0.0.1/go.mod h1:aNAcfYFfbhvH9kJhE0Njp5GX0dQbxdRB0rJ0KvSC5nI= +git.happydns.org/checker-sdk-go v1.2.0 h1:v4MpKAz0W3PwP+bxx3pya8w893sVH5xTD1of1cc0TV8= +git.happydns.org/checker-sdk-go v1.2.0/go.mod h1:aNAcfYFfbhvH9kJhE0Njp5GX0dQbxdRB0rJ0KvSC5nI= +git.happydns.org/checker-tls v0.2.0 h1:2dYpcePBylUc3le76fFlLbxraiLpGESmOhx4NfD7REM= +git.happydns.org/checker-tls v0.2.0/go.mod h1:0ZSG0CTP007SHBPE7qInESVIOcW+xgucHUhHgj6MeZ8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=