public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove option used to control within browser

Browse Source
This commit is contained in:
Athurg Feng
2019-02-02 13:35:17 +08:00
parent 919d00437e
commit bba92c0746
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/notifiers/dingding.go
+14 -24
View File
@@ -22,11 +22,6 @@ const DingdingOptionsTemplate = `
<span class="gf-form-label width-10">MessageType</span> <span class="gf-form-label width-10">MessageType</span>
<select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.msgType" ng-options="s for s in ['link','actionCard']" ng-init="ctrl.model.settings.msgType=ctrl.model.settings.msgType || '` + DefaultDingdingMsgType + `'"></select> <select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.msgType" ng-options="s for s in ['link','actionCard']" ng-init="ctrl.model.settings.msgType=ctrl.model.settings.msgType || '` + DefaultDingdingMsgType + `'"></select>
</div> </div>
<div class="gf-form">
<span class="gf-form-label width-10">OpenInBrowser</span>
<gf-form-switch class="gf-form" checked="ctrl.model.settings.openInBrowser"></gf-form-switch>
<info-popover mode="right-normal">Open the message url in browser instead of inside of Dingding</info-popover>
</div>
` `
func init() { func init() {
@@ -47,23 +42,20 @@ func NewDingDingNotifier(model *m.AlertNotification) (alerting.Notifier, error)
} }
msgType := model.Settings.Get("msgType").MustString(DefaultDingdingMsgType) msgType := model.Settings.Get("msgType").MustString(DefaultDingdingMsgType)
openInBrowser := model.Settings.Get("openInBrowser").MustBool(true)
return &DingDingNotifier{ return &DingDingNotifier{
NotifierBase: NewNotifierBase(model), NotifierBase: NewNotifierBase(model),
OpenInBrowser: openInBrowser, MsgType: msgType,
MsgType: msgType, Url: url,
Url: url, log: log.New("alerting.notifier.dingding"),
log: log.New("alerting.notifier.dingding"),
}, nil }, nil
} }
type DingDingNotifier struct { type DingDingNotifier struct {
NotifierBase NotifierBase
MsgType string MsgType string
OpenInBrowser bool //Set whether the message url will open outside of Dingding Url string
Url string log log.Logger
log log.Logger
} }
func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error { func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
@@ -75,17 +67,15 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
messageUrl = "" messageUrl = ""
} }
if this.OpenInBrowser { q := url.Values{
q := url.Values{ "pc_slide": {"false"},
"pc_slide": {"false"}, "url": {messageUrl},
"url": {messageUrl},
}
// Use special link to auto open the message url outside of Dingding
// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=385&articleId=104972&docType=1#s9
messageUrl = "dingtalk://dingtalkclient/page/link?" + q.Encode()
} }
// Use special link to auto open the message url outside of Dingding
// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=385&articleId=104972&docType=1#s9
messageUrl = "dingtalk://dingtalkclient/page/link?" + q.Encode()
this.log.Info("messageUrl:" + messageUrl) this.log.Info("messageUrl:" + messageUrl)
message := evalContext.Rule.Message message := evalContext.Rule.Message