mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
NGAlert: Remove unwanted fields from notification channel config (#34036)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
parent
bfcf82f861
commit
89c2b5e863
2
go.mod
2
go.mod
@ -14,7 +14,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.18.8
|
|||||||
require (
|
require (
|
||||||
cloud.google.com/go/storage v1.14.0
|
cloud.google.com/go/storage v1.14.0
|
||||||
cuelang.org/go v0.3.2
|
cuelang.org/go v0.3.2
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.14.0 // indirect
|
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.14.0
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.8.0
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.8.0
|
||||||
github.com/BurntSushi/toml v0.3.1
|
github.com/BurntSushi/toml v0.3.1
|
||||||
github.com/Masterminds/semver v1.5.0
|
github.com/Masterminds/semver v1.5.0
|
||||||
|
@ -89,13 +89,10 @@ func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *models.ReqContext) response
|
|||||||
secureFields[k] = true
|
secureFields[k] = true
|
||||||
}
|
}
|
||||||
gr := apimodels.GettableGrafanaReceiver{
|
gr := apimodels.GettableGrafanaReceiver{
|
||||||
Uid: pr.Uid,
|
UID: pr.UID,
|
||||||
Name: pr.Name,
|
Name: pr.Name,
|
||||||
Type: pr.Type,
|
Type: pr.Type,
|
||||||
IsDefault: pr.IsDefault,
|
|
||||||
SendReminder: pr.SendReminder,
|
|
||||||
DisableResolveMessage: pr.DisableResolveMessage,
|
DisableResolveMessage: pr.DisableResolveMessage,
|
||||||
Frequency: pr.Frequency,
|
|
||||||
Settings: pr.Settings,
|
Settings: pr.Settings,
|
||||||
SecureFields: secureFields,
|
SecureFields: secureFields,
|
||||||
}
|
}
|
||||||
|
@ -6,14 +6,13 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/api/dtos"
|
amv2 "github.com/prometheus/alertmanager/api/v2/models"
|
||||||
"github.com/grafana/grafana/pkg/models"
|
|
||||||
"github.com/grafana/grafana/pkg/setting"
|
|
||||||
"github.com/grafana/grafana/pkg/util"
|
|
||||||
"github.com/prometheus/alertmanager/config"
|
"github.com/prometheus/alertmanager/config"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
|
|
||||||
amv2 "github.com/prometheus/alertmanager/api/v2/models"
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
|
"github.com/grafana/grafana/pkg/setting"
|
||||||
|
"github.com/grafana/grafana/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
// swagger:route POST /api/alertmanager/{Recipient}/config/api/v1/alerts alertmanager RoutePostAlertingConfig
|
// swagger:route POST /api/alertmanager/{Recipient}/config/api/v1/alerts alertmanager RoutePostAlertingConfig
|
||||||
@ -504,8 +503,23 @@ func AllReceivers(route *config.Route) (res []string) {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
type GettableGrafanaReceiver dtos.AlertNotification
|
type GettableGrafanaReceiver struct {
|
||||||
type PostableGrafanaReceiver models.CreateAlertNotificationCommand
|
UID string `json:"uid"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
DisableResolveMessage bool `json:"disableResolveMessage"`
|
||||||
|
Settings *simplejson.Json `json:"settings"`
|
||||||
|
SecureFields map[string]bool `json:"secureFields"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type PostableGrafanaReceiver struct {
|
||||||
|
UID string `json:"uid"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
DisableResolveMessage bool `json:"disableResolveMessage"`
|
||||||
|
Settings *simplejson.Json `json:"settings"`
|
||||||
|
SecureSettings map[string]string `json:"secureSettings"`
|
||||||
|
}
|
||||||
|
|
||||||
type ReceiverType int
|
type ReceiverType int
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@ import (
|
|||||||
|
|
||||||
"github.com/grafana/grafana/pkg/components/securejsondata"
|
"github.com/grafana/grafana/pkg/components/securejsondata"
|
||||||
"github.com/grafana/grafana/pkg/infra/log"
|
"github.com/grafana/grafana/pkg/infra/log"
|
||||||
"github.com/grafana/grafana/pkg/models"
|
|
||||||
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
|
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
|
||||||
"github.com/grafana/grafana/pkg/services/ngalert/logging"
|
"github.com/grafana/grafana/pkg/services/ngalert/logging"
|
||||||
"github.com/grafana/grafana/pkg/services/ngalert/metrics"
|
"github.com/grafana/grafana/pkg/services/ngalert/metrics"
|
||||||
@ -397,12 +396,10 @@ func (am *Alertmanager) buildReceiverIntegrations(receiver *apimodels.PostableAp
|
|||||||
secureSettings[k] = d
|
secureSettings[k] = d
|
||||||
}
|
}
|
||||||
var (
|
var (
|
||||||
cfg = &models.AlertNotification{
|
cfg = &channels.NotificationChannelConfig{
|
||||||
Uid: r.Uid,
|
UID: r.UID,
|
||||||
Name: r.Name,
|
Name: r.Name,
|
||||||
Type: r.Type,
|
Type: r.Type,
|
||||||
IsDefault: r.IsDefault,
|
|
||||||
SendReminder: r.SendReminder,
|
|
||||||
DisableResolveMessage: r.DisableResolveMessage,
|
DisableResolveMessage: r.DisableResolveMessage,
|
||||||
Settings: r.Settings,
|
Settings: r.Settings,
|
||||||
SecureSettings: secureSettings,
|
SecureSettings: secureSettings,
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
const defaultDingdingMsgType = "link"
|
const defaultDingdingMsgType = "link"
|
||||||
|
|
||||||
// NewDingDingNotifier is the constructor for the Dingding notifier
|
// NewDingDingNotifier is the constructor for the Dingding notifier
|
||||||
func NewDingDingNotifier(model *models.AlertNotification, t *template.Template) (*DingDingNotifier, error) {
|
func NewDingDingNotifier(model *NotificationChannelConfig, t *template.Template) (*DingDingNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -36,12 +36,18 @@ func NewDingDingNotifier(model *models.AlertNotification, t *template.Template)
|
|||||||
msgType := model.Settings.Get("msgType").MustString(defaultDingdingMsgType)
|
msgType := model.Settings.Get("msgType").MustString(defaultDingdingMsgType)
|
||||||
|
|
||||||
return &DingDingNotifier{
|
return &DingDingNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
MsgType: msgType,
|
Uid: model.UID,
|
||||||
URL: url,
|
Name: model.Name,
|
||||||
Message: model.Settings.Get("message").MustString(`{{ template "default.message" .}}`),
|
Type: model.Type,
|
||||||
log: log.New("alerting.notifier.dingding"),
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
tmpl: t,
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
|
MsgType: msgType,
|
||||||
|
URL: url,
|
||||||
|
Message: model.Settings.Get("message").MustString(`{{ template "default.message" .}}`),
|
||||||
|
log: log.New("alerting.notifier.dingding"),
|
||||||
|
tmpl: t,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ func TestDingdingNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "dingding_testing",
|
Name: "dingding_testing",
|
||||||
Type: "dingding",
|
Type: "dingding",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -32,7 +32,7 @@ type EmailNotifier struct {
|
|||||||
|
|
||||||
// NewEmailNotifier is the constructor function
|
// NewEmailNotifier is the constructor function
|
||||||
// for the EmailNotifier.
|
// for the EmailNotifier.
|
||||||
func NewEmailNotifier(model *models.AlertNotification, t *template.Template) (*EmailNotifier, error) {
|
func NewEmailNotifier(model *NotificationChannelConfig, t *template.Template) (*EmailNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -48,12 +48,18 @@ func NewEmailNotifier(model *models.AlertNotification, t *template.Template) (*E
|
|||||||
addresses := util.SplitEmails(addressesString)
|
addresses := util.SplitEmails(addressesString)
|
||||||
|
|
||||||
return &EmailNotifier{
|
return &EmailNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
Addresses: addresses,
|
Uid: model.UID,
|
||||||
SingleEmail: singleEmail,
|
Name: model.Name,
|
||||||
Message: model.Settings.Get("message").MustString(),
|
Type: model.Type,
|
||||||
log: log.New("alerting.notifier.email"),
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
tmpl: t,
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
|
Addresses: addresses,
|
||||||
|
SingleEmail: singleEmail,
|
||||||
|
Message: model.Settings.Get("message").MustString(),
|
||||||
|
log: log.New("alerting.notifier.email"),
|
||||||
|
tmpl: t,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ func TestEmailNotifier(t *testing.T) {
|
|||||||
json := `{ }`
|
json := `{ }`
|
||||||
|
|
||||||
settingsJSON, _ := simplejson.NewJson([]byte(json))
|
settingsJSON, _ := simplejson.NewJson([]byte(json))
|
||||||
model := &models.AlertNotification{
|
model := &NotificationChannelConfig{
|
||||||
Name: "ops",
|
Name: "ops",
|
||||||
Type: "email",
|
Type: "email",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
@ -44,7 +44,7 @@ func TestEmailNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(json))
|
settingsJSON, err := simplejson.NewJson([]byte(json))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
emailNotifier, err := NewEmailNotifier(&models.AlertNotification{
|
emailNotifier, err := NewEmailNotifier(&NotificationChannelConfig{
|
||||||
Name: "ops",
|
Name: "ops",
|
||||||
Type: "email",
|
Type: "email",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -45,7 +45,7 @@ type PagerdutyNotifier struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewPagerdutyNotifier is the constructor for the PagerDuty notifier
|
// NewPagerdutyNotifier is the constructor for the PagerDuty notifier
|
||||||
func NewPagerdutyNotifier(model *models.AlertNotification, t *template.Template) (*PagerdutyNotifier, error) {
|
func NewPagerdutyNotifier(model *NotificationChannelConfig, t *template.Template) (*PagerdutyNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -56,8 +56,14 @@ func NewPagerdutyNotifier(model *models.AlertNotification, t *template.Template)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &PagerdutyNotifier{
|
return &PagerdutyNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
Key: key,
|
Uid: model.UID,
|
||||||
|
Name: model.Name,
|
||||||
|
Type: model.Type,
|
||||||
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
|
Key: key,
|
||||||
CustomDetails: map[string]string{
|
CustomDetails: map[string]string{
|
||||||
"firing": `{{ template "__text_alert_list" .Alerts.Firing }}`,
|
"firing": `{{ template "__text_alert_list" .Alerts.Firing }}`,
|
||||||
"resolved": `{{ template "__text_alert_list" .Alerts.Resolved }}`,
|
"resolved": `{{ template "__text_alert_list" .Alerts.Resolved }}`,
|
||||||
|
@ -139,7 +139,7 @@ func TestPagerdutyNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "pageduty_testing",
|
Name: "pageduty_testing",
|
||||||
Type: "pagerduty",
|
Type: "pagerduty",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -54,7 +54,7 @@ var reRecipient *regexp.Regexp = regexp.MustCompile("^((@[a-z0-9][a-zA-Z0-9._-]*
|
|||||||
var SlackAPIEndpoint = "https://slack.com/api/chat.postMessage"
|
var SlackAPIEndpoint = "https://slack.com/api/chat.postMessage"
|
||||||
|
|
||||||
// NewSlackNotifier is the constructor for the Slack notifier
|
// NewSlackNotifier is the constructor for the Slack notifier
|
||||||
func NewSlackNotifier(model *models.AlertNotification, t *template.Template) (*SlackNotifier, error) {
|
func NewSlackNotifier(model *NotificationChannelConfig, t *template.Template) (*SlackNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -112,7 +112,13 @@ func NewSlackNotifier(model *models.AlertNotification, t *template.Template) (*S
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &SlackNotifier{
|
return &SlackNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
|
Uid: model.UID,
|
||||||
|
Name: model.Name,
|
||||||
|
Type: model.Type,
|
||||||
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
URL: apiURL,
|
URL: apiURL,
|
||||||
Recipient: recipient,
|
Recipient: recipient,
|
||||||
MentionUsers: mentionUsers,
|
MentionUsers: mentionUsers,
|
||||||
|
@ -16,7 +16,6 @@ import (
|
|||||||
|
|
||||||
"github.com/grafana/grafana/pkg/components/simplejson"
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
"github.com/grafana/grafana/pkg/infra/log"
|
"github.com/grafana/grafana/pkg/infra/log"
|
||||||
"github.com/grafana/grafana/pkg/models"
|
|
||||||
"github.com/grafana/grafana/pkg/services/alerting"
|
"github.com/grafana/grafana/pkg/services/alerting"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -176,7 +175,7 @@ func TestSlackNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "slack_testing",
|
Name: "slack_testing",
|
||||||
Type: "slack",
|
Type: "slack",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -30,7 +30,7 @@ type TeamsNotifier struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewTeamsNotifier is the constructor for Teams notifier.
|
// NewTeamsNotifier is the constructor for Teams notifier.
|
||||||
func NewTeamsNotifier(model *models.AlertNotification, t *template.Template) (*TeamsNotifier, error) {
|
func NewTeamsNotifier(model *NotificationChannelConfig, t *template.Template) (*TeamsNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -41,11 +41,17 @@ func NewTeamsNotifier(model *models.AlertNotification, t *template.Template) (*T
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &TeamsNotifier{
|
return &TeamsNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
URL: u,
|
Uid: model.UID,
|
||||||
Message: model.Settings.Get("message").MustString(`{{ template "default.message" .}}`),
|
Name: model.Name,
|
||||||
log: log.New("alerting.notifier.teams"),
|
Type: model.Type,
|
||||||
tmpl: t,
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
|
URL: u,
|
||||||
|
Message: model.Settings.Get("message").MustString(`{{ template "default.message" .}}`),
|
||||||
|
log: log.New("alerting.notifier.teams"),
|
||||||
|
tmpl: t,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ func TestTeamsNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "teams_testing",
|
Name: "teams_testing",
|
||||||
Type: "teams",
|
Type: "teams",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -35,7 +35,7 @@ type TelegramNotifier struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewTelegramNotifier is the constructor for the Telegram notifier
|
// NewTelegramNotifier is the constructor for the Telegram notifier
|
||||||
func NewTelegramNotifier(model *models.AlertNotification, t *template.Template) (*TelegramNotifier, error) {
|
func NewTelegramNotifier(model *NotificationChannelConfig, t *template.Template) (*TelegramNotifier, error) {
|
||||||
if model.Settings == nil {
|
if model.Settings == nil {
|
||||||
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
|
||||||
}
|
}
|
||||||
@ -53,12 +53,18 @@ func NewTelegramNotifier(model *models.AlertNotification, t *template.Template)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &TelegramNotifier{
|
return &TelegramNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
BotToken: botToken,
|
Uid: model.UID,
|
||||||
ChatID: chatID,
|
Name: model.Name,
|
||||||
Message: message,
|
Type: model.Type,
|
||||||
tmpl: t,
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
log: log.New("alerting.notifier.telegram"),
|
Settings: model.Settings,
|
||||||
|
}),
|
||||||
|
BotToken: botToken,
|
||||||
|
ChatID: chatID,
|
||||||
|
Message: message,
|
||||||
|
tmpl: t,
|
||||||
|
log: log.New("alerting.notifier.telegram"),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,6 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/components/simplejson"
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
"github.com/grafana/grafana/pkg/models"
|
|
||||||
"github.com/grafana/grafana/pkg/services/alerting"
|
"github.com/grafana/grafana/pkg/services/alerting"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -101,7 +100,7 @@ func TestTelegramNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "telegram_testing",
|
Name: "telegram_testing",
|
||||||
Type: "telegram",
|
Type: "telegram",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -2,6 +2,9 @@ package channels
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/prometheus/common/model"
|
"github.com/prometheus/common/model"
|
||||||
|
|
||||||
|
"github.com/grafana/grafana/pkg/components/securejsondata"
|
||||||
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -16,3 +19,20 @@ func getAlertStatusColor(status model.AlertStatus) string {
|
|||||||
}
|
}
|
||||||
return ColorAlertResolved
|
return ColorAlertResolved
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type NotificationChannelConfig struct {
|
||||||
|
UID string `json:"uid"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
DisableResolveMessage bool `json:"disableResolveMessage"`
|
||||||
|
Settings *simplejson.Json `json:"settings"`
|
||||||
|
SecureSettings securejsondata.SecureJsonData `json:"secureSettings"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DecryptedValue returns decrypted value from secureSettings
|
||||||
|
func (an *NotificationChannelConfig) DecryptedValue(field string, fallback string) string {
|
||||||
|
if value, ok := an.SecureSettings.DecryptedValue(field); ok {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
@ -34,20 +34,26 @@ type WebhookNotifier struct {
|
|||||||
|
|
||||||
// NewWebHookNotifier is the constructor for
|
// NewWebHookNotifier is the constructor for
|
||||||
// the WebHook notifier.
|
// the WebHook notifier.
|
||||||
func NewWebHookNotifier(model *models.AlertNotification, t *template.Template) (*WebhookNotifier, error) {
|
func NewWebHookNotifier(model *NotificationChannelConfig, t *template.Template) (*WebhookNotifier, error) {
|
||||||
url := model.Settings.Get("url").MustString()
|
url := model.Settings.Get("url").MustString()
|
||||||
if url == "" {
|
if url == "" {
|
||||||
return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
|
return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
|
||||||
}
|
}
|
||||||
return &WebhookNotifier{
|
return &WebhookNotifier{
|
||||||
NotifierBase: old_notifiers.NewNotifierBase(model),
|
NotifierBase: old_notifiers.NewNotifierBase(&models.AlertNotification{
|
||||||
URL: url,
|
Uid: model.UID,
|
||||||
User: model.Settings.Get("username").MustString(),
|
Name: model.Name,
|
||||||
Password: model.DecryptedValue("password", model.Settings.Get("password").MustString()),
|
Type: model.Type,
|
||||||
HTTPMethod: model.Settings.Get("httpMethod").MustString("POST"),
|
DisableResolveMessage: model.DisableResolveMessage,
|
||||||
MaxAlerts: model.Settings.Get("maxAlerts").MustInt(0),
|
Settings: model.Settings,
|
||||||
log: log.New("alerting.notifier.webhook"),
|
}),
|
||||||
tmpl: t,
|
URL: url,
|
||||||
|
User: model.Settings.Get("username").MustString(),
|
||||||
|
Password: model.DecryptedValue("password", model.Settings.Get("password").MustString()),
|
||||||
|
HTTPMethod: model.Settings.Get("httpMethod").MustString("POST"),
|
||||||
|
MaxAlerts: model.Settings.Get("maxAlerts").MustInt(0),
|
||||||
|
log: log.New("alerting.notifier.webhook"),
|
||||||
|
tmpl: t,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ func TestWebhookNotifier(t *testing.T) {
|
|||||||
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
settingsJSON, err := simplejson.NewJson([]byte(c.settings))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
m := &models.AlertNotification{
|
m := &NotificationChannelConfig{
|
||||||
Name: "webhook_testing",
|
Name: "webhook_testing",
|
||||||
Type: "webhook",
|
Type: "webhook",
|
||||||
Settings: settingsJSON,
|
Settings: settingsJSON,
|
||||||
|
@ -49,7 +49,6 @@ func TestAlertmanagerConfigurationIsTransactional(t *testing.T) {
|
|||||||
},
|
},
|
||||||
"secureSettings": {},
|
"secureSettings": {},
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"sendReminder": true,
|
|
||||||
"name": "slack.receiver",
|
"name": "slack.receiver",
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"uid": ""
|
"uid": ""
|
||||||
@ -96,7 +95,6 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
|
|||||||
"url": "http://averysecureurl.com/webhook"
|
"url": "http://averysecureurl.com/webhook"
|
||||||
},
|
},
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"sendReminder": true,
|
|
||||||
"name": "slack.receiver",
|
"name": "slack.receiver",
|
||||||
"disableResolveMessage": false
|
"disableResolveMessage": false
|
||||||
}]
|
}]
|
||||||
@ -127,7 +125,6 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
|
|||||||
"url": true
|
"url": true
|
||||||
},
|
},
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"sendReminder": true,
|
|
||||||
"name": "slack.receiver",
|
"name": "slack.receiver",
|
||||||
"disableResolveMessage": false
|
"disableResolveMessage": false
|
||||||
}]
|
}]
|
||||||
@ -153,16 +150,10 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
|
|||||||
"receivers": [{
|
"receivers": [{
|
||||||
"name": "slack.receiver",
|
"name": "slack.receiver",
|
||||||
"grafana_managed_receiver_configs": [{
|
"grafana_managed_receiver_configs": [{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "slack.receiver",
|
"name": "slack.receiver",
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": true,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"recipient": "#unified-alerting-test-but-updated"
|
"recipient": "#unified-alerting-test-but-updated"
|
||||||
},
|
},
|
||||||
|
@ -67,7 +67,8 @@ func TestNotificationChannels(t *testing.T) {
|
|||||||
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/alertmanager/grafana/config/api/v1/alerts", grafanaListedAddr)
|
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/alertmanager/grafana/config/api/v1/alerts", grafanaListedAddr)
|
||||||
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
|
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
|
||||||
b := getBody(t, resp.Body)
|
b := getBody(t, resp.Body)
|
||||||
require.JSONEq(t, getExpAlertmanagerConfigFromAPI(mockChannel.server.Addr), b)
|
e := getExpAlertmanagerConfigFromAPI(mockChannel.server.Addr)
|
||||||
|
require.JSONEq(t, e, b)
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -584,16 +585,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "email_recv",
|
"name": "email_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "email_test",
|
"name": "email_test",
|
||||||
"type": "email",
|
"type": "email",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"addresses": "test@email.com",
|
"addresses": "test@email.com",
|
||||||
"singleEmail": true
|
"singleEmail": true
|
||||||
@ -606,16 +601,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "dingding_recv",
|
"name": "dingding_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "dingding_test",
|
"name": "dingding_test",
|
||||||
"type": "dingding",
|
"type": "dingding",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"url": "http://CHANNEL_ADDR/dingding_recv/dingding_test"
|
"url": "http://CHANNEL_ADDR/dingding_recv/dingding_test"
|
||||||
},
|
},
|
||||||
@ -627,16 +616,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "teams_recv",
|
"name": "teams_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "teams_test",
|
"name": "teams_test",
|
||||||
"type": "teams",
|
"type": "teams",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"url": "http://CHANNEL_ADDR/teams_recv/teams_test"
|
"url": "http://CHANNEL_ADDR/teams_recv/teams_test"
|
||||||
},
|
},
|
||||||
@ -648,16 +631,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "webhook_recv",
|
"name": "webhook_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "webhook_test",
|
"name": "webhook_test",
|
||||||
"type": "webhook",
|
"type": "webhook",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"url": "http://CHANNEL_ADDR/webhook_recv/webhook_test",
|
"url": "http://CHANNEL_ADDR/webhook_recv/webhook_test",
|
||||||
"username": "my_username",
|
"username": "my_username",
|
||||||
@ -674,16 +651,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "telegram_recv",
|
"name": "telegram_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "telegram_test",
|
"name": "telegram_test",
|
||||||
"type": "telegram",
|
"type": "telegram",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"chatid": "telegram_chat_id"
|
"chatid": "telegram_chat_id"
|
||||||
},
|
},
|
||||||
@ -697,16 +668,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "slack_recv1",
|
"name": "slack_recv1",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "slack_test_without_token",
|
"name": "slack_test_without_token",
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"fallback": "Integration Test {{ template \"slack.default.title\" . }}",
|
"fallback": "Integration Test {{ template \"slack.default.title\" . }}",
|
||||||
"icon_emoji": "🚀",
|
"icon_emoji": "🚀",
|
||||||
@ -729,16 +694,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "slack_recv2",
|
"name": "slack_recv2",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "slack_test_with_token",
|
"name": "slack_test_with_token",
|
||||||
"type": "slack",
|
"type": "slack",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"mentionUsers": "user1, user2",
|
"mentionUsers": "user1, user2",
|
||||||
"recipient": "#test-channel",
|
"recipient": "#test-channel",
|
||||||
@ -754,16 +713,10 @@ var expAlertmanagerConfigFromAPI = `
|
|||||||
"name": "pagerduty_recv",
|
"name": "pagerduty_recv",
|
||||||
"grafana_managed_receiver_configs": [
|
"grafana_managed_receiver_configs": [
|
||||||
{
|
{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "pagerduty_test",
|
"name": "pagerduty_test",
|
||||||
"type": "pagerduty",
|
"type": "pagerduty",
|
||||||
"isDefault": false,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"class": "testclass",
|
"class": "testclass",
|
||||||
"component": "Integration Test",
|
"component": "Integration Test",
|
||||||
|
@ -21,16 +21,10 @@ const defaultAlertmanagerConfigJSON = `
|
|||||||
"receivers": [{
|
"receivers": [{
|
||||||
"name": "grafana-default-email",
|
"name": "grafana-default-email",
|
||||||
"grafana_managed_receiver_configs": [{
|
"grafana_managed_receiver_configs": [{
|
||||||
"id": 0,
|
|
||||||
"uid": "",
|
"uid": "",
|
||||||
"name": "email receiver",
|
"name": "email receiver",
|
||||||
"type": "email",
|
"type": "email",
|
||||||
"isDefault": true,
|
|
||||||
"sendReminder": false,
|
|
||||||
"disableResolveMessage": false,
|
"disableResolveMessage": false,
|
||||||
"frequency": "",
|
|
||||||
"created": "0001-01-01T00:00:00Z",
|
|
||||||
"updated": "0001-01-01T00:00:00Z",
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"addresses": "\u003cexample@email.com\u003e"
|
"addresses": "\u003cexample@email.com\u003e"
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user