Use model.Duration for timeout option in webhook notifier

Signed-off-by: Alexander Akhmetov <[email protected]>

Author: alexander-akhmetov

config/notifiers.go

@@ -538,7 +538,7 @@ type WebhookConfig struct {
 
 	// Timeout is the maximum time allowed to invoke the webhook. Setting this to 0
 	// does not impose a timeout.
-	Timeout time.Duration `yaml:"timeout" json:"timeout"`
+	Timeout model.Duration `yaml:"timeout" json:"timeout"`
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.

config/notifiers_test.go

@@ -14,12 +14,16 @@
 package config
 
 import (
+	"encoding/json"
 	"errors"
 	"net/mail"
+	"net/url"
 	"reflect"
 	"strings"
 	"testing"
+	"time"
 
+	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 )
@@ -1110,6 +1114,24 @@ parse_mode: invalid
 	}
 }
 
+func TestWebhookJSONMarshalling(t *testing.T) {
+	u, err := url.Parse("http://example.com/")
+	require.NoError(t, err)
+
+	cfg := WebhookConfig{
+		URL:     &SecretURL{u},
+		Timeout: model.Duration(500 * time.Millisecond),
+		NotifierConfig: NotifierConfig{
+			VSendResolved: false,
+		},
+	}
+
+	c, err := json.Marshal(cfg)
+
+	require.NoError(t, err)
+	require.JSONEq(t, `{"url":"<secret>","url_file":"","max_alerts":0,"timeout":"500ms", "send_resolved": false}`, string(c))
+}
+
 func newBoolPointer(b bool) *bool {
 	return &b
 }

notify/webhook/webhook.go

@@ -22,6 +22,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	commoncfg "github.com/prometheus/common/config"
 
@@ -113,7 +114,7 @@ func (n *Notifier) Notify(ctx context.Context, alerts ...*types.Alert) (bool, er
 	}
 
 	if n.conf.Timeout > 0 {
-		postCtx, cancel := context.WithTimeoutCause(ctx, n.conf.Timeout, fmt.Errorf("configured webhook timeout reached (%s)", n.conf.Timeout))
+		postCtx, cancel := context.WithTimeoutCause(ctx, time.Duration(n.conf.Timeout), fmt.Errorf("configured webhook timeout reached (%s)", n.conf.Timeout))
 		defer cancel()
 		ctx = postCtx
 	}