1
0
mirror of https://github.com/prometheus/prometheus synced 2025-04-01 00:06:53 +00:00

Merge pull request from prometheus/fix-double-slash

Fix double slash in GeneratorURL sent to alertmanager.
This commit is contained in:
Julius Volz 2015-05-23 22:25:43 +02:00
commit 97c0c01b40

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)