mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove EvalRaw methods from Rule interface

Browse source
This commit is contained in:
Fabian Reinartz 2015-05-25 20:43:24 +02:00
parent 7943aa834c
commit 83d07516e8
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rules/alerting.go
View file

@ -126,19 +126,14 @@ func (rule *AlertingRule) Name() string {
return rule.name return rule.name
} }
// EvalRaw returns the raw value of the rule expression, without creating alerts. // Eval evaluates the rule expression and then creates pending alerts and fires
func (rule *AlertingRule) EvalRaw(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) { // or removes previously pending alerts accordingly.
func (rule *AlertingRule) Eval(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) {
query, err := engine.NewInstantQuery(rule.Vector.String(), timestamp) query, err := engine.NewInstantQuery(rule.Vector.String(), timestamp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return query.Exec().Vector() exprResult, err := query.Exec().Vector()
}
// Eval evaluates the rule expression and then creates pending alerts and fires
// or removes previously pending alerts accordingly.
func (rule *AlertingRule) Eval(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) {
exprResult, err := rule.EvalRaw(timestamp, engine)
if err != nil { if err != nil {
return nil, err return nil, err
} }

11
rules/recording.go
View file

@ -34,18 +34,13 @@ type RecordingRule struct {
// Name returns the rule name. // Name returns the rule name.
func (rule RecordingRule) Name() string { return rule.name } func (rule RecordingRule) Name() string { return rule.name }
// EvalRaw returns the raw value of the rule expression. // Eval evaluates the rule and then overrides the metric names and labels accordingly.
func (rule RecordingRule) EvalRaw(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) { func (rule RecordingRule) Eval(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) {
query, err := engine.NewInstantQuery(rule.vector.String(), timestamp) query, err := engine.NewInstantQuery(rule.vector.String(), timestamp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return query.Exec().Vector() vector, err := query.Exec().Vector()
}
// Eval evaluates the rule and then overrides the metric names and labels accordingly.
func (rule RecordingRule) Eval(timestamp clientmodel.Timestamp, engine *promql.Engine) (promql.Vector, error) {
vector, err := rule.EvalRaw(timestamp, engine)
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
rules/rules.go
View file

@ -26,9 +26,6 @@ import (
type Rule interface { type Rule interface {
// Name returns the name of the rule. // Name returns the name of the rule.
Name() string Name() string
// EvalRaw evaluates the rule's vector expression without triggering any
// other actions, like recording or alerting.
EvalRaw(clientmodel.Timestamp, *promql.Engine) (promql.Vector, error)
// Eval evaluates the rule, including any associated recording or alerting actions. // Eval evaluates the rule, including any associated recording or alerting actions.
Eval(clientmodel.Timestamp, *promql.Engine) (promql.Vector, error) Eval(clientmodel.Timestamp, *promql.Engine) (promql.Vector, error)
// DotGraph returns a Graphviz dot graph of the rule. // DotGraph returns a Graphviz dot graph of the rule.