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

Merge pull request #729 from prometheus/fix-double-slash 

Fix double slash in GeneratorURL sent to alertmanager.
pull/731/head
Julius Volz 2015-05-23 22:25:43 +02:00
parent 87f0932e97 ff53d10849
commit 97c0c01b40
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules/manager.go
View File

@ -16,6 +16,7 @@ package rules
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"strings"
"sync" "sync"
"time" "time"
@ -211,7 +212,7 @@ func (m *Manager) queueAlertNotifications(rule *AlertingRule, timestamp clientmo
Value: aa.Value, Value: aa.Value,
ActiveSince: aa.ActiveSince.Time(), ActiveSince: aa.ActiveSince.Time(),
RuleString: rule.String(), RuleString: rule.String(),
GeneratorURL: m.prometheusURL + utility.GraphLinkForExpression(rule.Vector.String()), GeneratorURL: m.prometheusURL + strings.TrimLeft(utility.GraphLinkForExpression(rule.Vector.String()), "/"),
}) })
} }
m.notificationHandler.SubmitReqs(notifications) m.notificationHandler.SubmitReqs(notifications)