IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): revert operand positions

Browse Source
This commit is contained in:
bergquist 2016-05-30 14:47:59 +02:00
parent 077be210da
commit 411568351d
4 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/alerting/alert_rule_reader.go
View File

@ -1,6 +1,7 @@
package alerting
import (
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
)
@ -11,6 +12,7 @@ type RuleReader interface {
type AlertRuleReader struct{}
func (this AlertRuleReader) Fetch() []m.AlertRule {
/*
return []m.AlertRule{
//{Id: 1, Title: "alert rule 1", Interval: "10s", Frequency: 10},
//{Id: 2, Title: "alert rule 2", Interval: "10s", Frequency: 10},
@ -32,4 +34,13 @@ func (this AlertRuleReader) Fetch() []m.AlertRule {
QueryRange: 3600,
},
}
*/
cmd := &m.GetAlertsQuery{
OrgId: 1,
}
bus.Dispatch(cmd)
return cmd.Result
}

6
pkg/services/alerting/executor.go
View File

@ -48,11 +48,13 @@ func (this *ExecutorImpl) ValidateRule(rule m.AlertRule, series m.TimeSeriesSlic
var aggValue = aggregator[rule.Aggregator](serie)
if operators[rule.CritOperator](float64(rule.CritLevel), aggValue) {
//if operators[rule.CritOperator](float64(rule.CritLevel), aggValue) {
if operators[rule.CritOperator](aggValue, float64(rule.CritLevel)) {
return &AlertResult{State: m.AlertStateCritical, Id: rule.Id, ActualValue: aggValue}
}
if operators[rule.WarnOperator](float64(rule.WarnLevel), aggValue) {
//if operators[rule.WarnOperator](float64(rule.WarnLevel), aggValue) {
if operators[rule.WarnOperator](aggValue, float64(rule.WarnLevel)) {
return &AlertResult{State: m.AlertStateWarn, Id: rule.Id, ActualValue: aggValue}
}
}

12
pkg/services/alerting/executor_test.go
View File

@ -11,7 +11,7 @@ func TestAlertingExecutor(t *testing.T) {
executor := &ExecutorImpl{}
Convey("Show return ok since avg is above 2", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "sum"}
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "sum"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{2, 0}}),
@ -22,7 +22,7 @@ func TestAlertingExecutor(t *testing.T) {
})
Convey("Show return critical since below 2", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "sum"}
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "sum"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{2, 0}}),
@ -33,7 +33,7 @@ func TestAlertingExecutor(t *testing.T) {
})
Convey("Show return critical since sum is above 10", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "sum"}
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "sum"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{9, 0}, {9, 0}}),
@ -44,7 +44,7 @@ func TestAlertingExecutor(t *testing.T) {
})
Convey("Show return ok since avg is below 10", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "avg"}
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "avg"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{9, 0}, {9, 0}}),
@ -55,7 +55,7 @@ func TestAlertingExecutor(t *testing.T) {
})
Convey("Show return ok since min is below 10", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "min"}
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "min"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{11, 0}, {9, 0}}),
@ -66,7 +66,7 @@ func TestAlertingExecutor(t *testing.T) {
})
Convey("Show return ok since max is above 10", func() {
rule := m.AlertRule{CritLevel: 10, CritOperator: "<", Aggregator: "max"}
rule := m.AlertRule{CritLevel: 10, CritOperator: ">", Aggregator: "max"}
timeSeries := []*m.TimeSeries{
m.NewTimeSeries("test1", [][2]float64{{1, 0}, {11, 0}}),

12
public/app/plugins/panel/graph/partials/tab_alerting.html
View File

@ -45,15 +45,15 @@
</div>
<div class="gf-form">
<span class="gf-form-label width-10">Query range</span>
<input class="gf-form-input max-width-10" type="text"
ng-model="ctrl.panel.alerting.queryRange" placeholder="10m"></input>
<span class="gf-form-label width-10">Query range (seconds)</span>
<input class="gf-form-input max-width-10" type="number"
ng-model="ctrl.panel.alerting.queryRange" placeholder="3600"></input>
</div>
<div class="gf-form">
<span class="gf-form-label width-10">Interval</span>
<input class="gf-form-input max-width-10" type="text"
ng-model="ctrl.panel.alerting.interval" placeholder="10s"></input>
<span class="gf-form-label width-10">Frequency (seconds)</span>
<input class="gf-form-input max-width-10" type="number"
ng-model="ctrl.panel.alerting.interval" placeholder="60"></input>
</div>
</div>
<div class="gf-form-group section">