IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge error

Browse Source
This commit is contained in:
bergquist 2018-12-07 14:17:09 +01:00
parent 2de5a7119b
commit a90bba859a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/alerting/notifiers/googlechat.go
View File

@ -3,12 +3,13 @@ package notifiers
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"time"
) )
func init() { func init() {
@ -35,7 +36,7 @@ func NewGoogleChatNotifier(model *m.AlertNotification) (alerting.Notifier, error
} }
return &GoogleChatNotifier{ return &GoogleChatNotifier{
NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings), NotifierBase: NewNotifierBase(model),
Url: url, Url: url,
log: log.New("alerting.notifier.googlechat"), log: log.New("alerting.notifier.googlechat"),
}, nil }, nil