bergquist fe24e6c8a8 Merge branch 'alerting_opentsdb' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_opentsdb

2016-10-14 09:19:42 +02:00

..

graphite

fix(alerting): fixed issue with using nested queries in graphite query used in alerting rule, fixes #5996

2016-10-11 12:50:11 +02:00

influxdb

feat(influxdb): choose highest interval value

2016-10-14 09:14:13 +02:00

opentsdb

Resolved conflicts

2016-10-14 00:01:36 -07:00

prometheus

tech(influxdb): refactor and cleanup

2016-10-06 14:16:26 +02:00

testdata

Merge branch 'master' into alerting_influxdb

2016-10-07 10:45:05 +02:00

batch.go

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00

executor.go

tech(tsdb): rename context to query

2016-10-03 14:32:04 +02:00

fake_test.go

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00

interval_test.go

feat(tsdb): add interval calculator

2016-10-10 09:45:33 +02:00

interval.go

tech(influxdb): remove unused logging

2016-10-10 11:17:00 +02:00

models.go

tech(influxdb): refactor and cleanup

2016-10-06 14:16:26 +02:00

query_context.go

feat(testdata): lots of work on new test data data source and scenarios

2016-09-27 18:17:39 +02:00

request.go

tech(tsdb): abort batch procces when context closes

2016-10-03 14:33:47 +02:00

time_range_test.go

feat(testdata): lots of work on new test data data source and scenarios

2016-09-27 18:17:39 +02:00

time_range.go

feat(testdata): added csv test data scenario

2016-09-28 10:37:30 +02:00

tsdb_test.go

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00