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

Merge pull request #9111 from eloo/feature/enhance_hipchat_card

Browse Source 
Feature/enhance hipchat card
This commit is contained in:
Carl Bergquist 2017-10-05 16:11:04 +02:00 committed by GitHub
commit ab5bc1bf4a
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.editorconfig
View File

@ -1,13 +1,6 @@
# http://editorconfig.org # http://editorconfig.org
root = true root = true
[*.go]
indent_style = tab
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*] [*]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
@ -15,5 +8,12 @@ charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
[*.go]
indent_style = tab
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false

49
pkg/services/alerting/notifiers/hipchat.go
View File

@ -84,15 +84,17 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
return err return err
} }
message := evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text + "<br><a href=" + ruleUrl + ">Check Dashboard</a>" attributes := make([]map[string]interface{}, 0)
fields := make([]map[string]interface{}, 0)
message += "<br>"
for index, evt := range evalContext.EvalMatches { for index, evt := range evalContext.EvalMatches {
message += evt.Metric + " :: " + strconv.FormatFloat(evt.Value.Float64, 'f', -1, 64) + "<br>" metricName := evt.Metric
fields = append(fields, map[string]interface{}{ if len(metricName) > 50 {
"title": evt.Metric, metricName = metricName[:50]
"value": evt.Value, }
"short": true, attributes = append(attributes, map[string]interface{}{
"label": metricName,
"value": map[string]interface{}{
"label": strconv.FormatFloat(evt.Value.Float64, 'f', -1, 64),
},
}) })
if index > maxFieldCount { if index > maxFieldCount {
break break
@ -100,16 +102,23 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
} }
if evalContext.Error != nil { if evalContext.Error != nil {
fields = append(fields, map[string]interface{}{ attributes = append(attributes, map[string]interface{}{
"title": "Error message", "label": "Error message",
"value": evalContext.Error.Error(), "value": map[string]interface{}{
"short": false, "label": evalContext.Error.Error(),
},
}) })
} }
message := ""
if evalContext.Rule.State != models.AlertStateOK { //dont add message when going back to alert state ok. if evalContext.Rule.State != models.AlertStateOK { //dont add message when going back to alert state ok.
message += " " + evalContext.Rule.Message message += " " + evalContext.Rule.Message
} }
if message == "" {
message = evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text
}
//HipChat has a set list of colors //HipChat has a set list of colors
var color string var color string
switch evalContext.Rule.State { switch evalContext.Rule.State {
@ -123,15 +132,24 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
// Add a card with link to the dashboard // Add a card with link to the dashboard
card := map[string]interface{}{ card := map[string]interface{}{
"style": "link", "style": "application",
"url": ruleUrl, "url": ruleUrl,
"id": "1", "id": "1",
"title": evalContext.GetNotificationTitle(), "title": evalContext.GetNotificationTitle(),
"description": evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text, "description": message,
"icon": map[string]interface{}{ "icon": map[string]interface{}{
"url": "https://grafana.com/assets/img/fav32.png", "url": "https://grafana.com/assets/img/fav32.png",
}, },
"date": evalContext.EndTime.Unix(), "date": evalContext.EndTime.Unix(),
"attributes": attributes,
}
if evalContext.ImagePublicUrl != "" {
card["thumbnail"] = map[string]interface{}{
"url": evalContext.ImagePublicUrl,
"url@2x": evalContext.ImagePublicUrl,
"width": 1193,
"height": 564,
}
} }
body := map[string]interface{}{ body := map[string]interface{}{
@ -144,6 +162,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
hipUrl := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", this.Url, this.RoomId, this.ApiKey) hipUrl := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", this.Url, this.RoomId, this.ApiKey)
data, _ := json.Marshal(&body) data, _ := json.Marshal(&body)
this.log.Info("Request payload", "json", string(data))
cmd := &models.SendWebhookSync{Url: hipUrl, Body: string(data)} cmd := &models.SendWebhookSync{Url: hipUrl, Body: string(data)}
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {