RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #385 from prometheus/beorn7/lint 

Fix go vet warnings
This commit is contained in:
Fabian Reinartz 2016-06-17 15:19:05 +02:00 committed by GitHub
parent e6892e1063 1d6b6d6ea8
commit 064a581998
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inhibit_test.go
View File

@ -124,7 +124,7 @@ func TestInhibitRuleHasEqual(t *testing.T) {
} }
if have := r.hasEqual(c.input); have != c.result { if have := r.hasEqual(c.input); have != c.result {
t.Errorf("Unexpected result %q, expected %q", have, c.result) t.Errorf("Unexpected result %t, expected %t", have, c.result)
} }
if !reflect.DeepEqual(r.scache, c.initial) { if !reflect.DeepEqual(r.scache, c.initial) {
t.Errorf("Cache state unexpectedly changed") t.Errorf("Cache state unexpectedly changed")

2
notify/impl.go
View File

@ -563,7 +563,7 @@ func (n *Hipchat) Notify(ctx context.Context, as ...*types.Alert) error {
data = n.tmpl.Data(receiver(ctx), groupLabels(ctx), as...) data = n.tmpl.Data(receiver(ctx), groupLabels(ctx), as...)
tmplText = tmplText(n.tmpl, data, &err) tmplText = tmplText(n.tmpl, data, &err)
tmplHTML = tmplHTML(n.tmpl, data, &err) tmplHTML = tmplHTML(n.tmpl, data, &err)
url = fmt.Sprintf("%sv2/room/%s/notification?auth_token=%s", n.conf.APIURL, n.conf.RoomID, n.conf.AuthToken) url = fmt.Sprintf("%sv2/room/%d/notification?auth_token=%s", n.conf.APIURL, n.conf.RoomID, n.conf.AuthToken)
) )
if n.conf.MessageFormat == "html" { if n.conf.MessageFormat == "html" {