Fix style issues in rules/...

pull/1645/head
beorn7 2016-05-19 16:59:53 +02:00
parent d9394eb359
commit b95c096a45
1 changed files with 21 additions and 21 deletions

View File

@ -106,8 +106,8 @@ func NewAlertingRule(name string, vec promql.Expr, hold time.Duration, lbls, ann
} }
// Name returns the name of the alert. // Name returns the name of the alert.
func (rule *AlertingRule) Name() string { func (r *AlertingRule) Name() string {
return rule.name return r.name
} }
func (r *AlertingRule) equal(o *AlertingRule) bool { func (r *AlertingRule) equal(o *AlertingRule) bool {
@ -255,17 +255,17 @@ func (r *AlertingRule) currentAlerts() []*Alert {
return alerts return alerts
} }
func (rule *AlertingRule) String() string { func (r *AlertingRule) String() string {
s := fmt.Sprintf("ALERT %s", rule.name) s := fmt.Sprintf("ALERT %s", r.name)
s += fmt.Sprintf("\n\tIF %s", rule.vector) s += fmt.Sprintf("\n\tIF %s", r.vector)
if rule.holdDuration > 0 { if r.holdDuration > 0 {
s += fmt.Sprintf("\n\tFOR %s", model.Duration(rule.holdDuration)) s += fmt.Sprintf("\n\tFOR %s", model.Duration(r.holdDuration))
} }
if len(rule.labels) > 0 { if len(r.labels) > 0 {
s += fmt.Sprintf("\n\tLABELS %s", rule.labels) s += fmt.Sprintf("\n\tLABELS %s", r.labels)
} }
if len(rule.annotations) > 0 { if len(r.annotations) > 0 {
s += fmt.Sprintf("\n\tANNOTATIONS %s", rule.annotations) s += fmt.Sprintf("\n\tANNOTATIONS %s", r.annotations)
} }
return s return s
} }
@ -273,21 +273,21 @@ func (rule *AlertingRule) String() string {
// HTMLSnippet returns an HTML snippet representing this alerting rule. The // HTMLSnippet returns an HTML snippet representing this alerting rule. The
// resulting snippet is expected to be presented in a <pre> element, so that // resulting snippet is expected to be presented in a <pre> element, so that
// line breaks and other returned whitespace is respected. // line breaks and other returned whitespace is respected.
func (rule *AlertingRule) HTMLSnippet(pathPrefix string) template.HTML { func (r *AlertingRule) HTMLSnippet(pathPrefix string) template.HTML {
alertMetric := model.Metric{ alertMetric := model.Metric{
model.MetricNameLabel: alertMetricName, model.MetricNameLabel: alertMetricName,
alertNameLabel: model.LabelValue(rule.name), alertNameLabel: model.LabelValue(r.name),
} }
s := fmt.Sprintf("ALERT <a href=%q>%s</a>", pathPrefix+strutil.GraphLinkForExpression(alertMetric.String()), rule.name) s := fmt.Sprintf("ALERT <a href=%q>%s</a>", pathPrefix+strutil.GraphLinkForExpression(alertMetric.String()), r.name)
s += fmt.Sprintf("\n IF <a href=%q>%s</a>", pathPrefix+strutil.GraphLinkForExpression(rule.vector.String()), rule.vector) s += fmt.Sprintf("\n IF <a href=%q>%s</a>", pathPrefix+strutil.GraphLinkForExpression(r.vector.String()), r.vector)
if rule.holdDuration > 0 { if r.holdDuration > 0 {
s += fmt.Sprintf("\n FOR %s", model.Duration(rule.holdDuration)) s += fmt.Sprintf("\n FOR %s", model.Duration(r.holdDuration))
} }
if len(rule.labels) > 0 { if len(r.labels) > 0 {
s += fmt.Sprintf("\n LABELS %s", rule.labels) s += fmt.Sprintf("\n LABELS %s", r.labels)
} }
if len(rule.annotations) > 0 { if len(r.annotations) > 0 {
s += fmt.Sprintf("\n ANNOTATIONS %s", rule.annotations) s += fmt.Sprintf("\n ANNOTATIONS %s", r.annotations)
} }
return template.HTML(s) return template.HTML(s)
} }