Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions ...

Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go

2016-06-07 13:31:56 +02:00

..

alertstates

feat(alerting): moved alerting models back to alerting package, models is more for storage dtos

2016-06-06 10:31:21 +02:00

datasources

feat(alerting): moved alerting models back to alerting package, models is more for storage dtos

2016-06-06 10:31:21 +02:00

alerting_test.go

feat(alerting): extracts alert rule reading

2016-05-30 18:52:38 +02:00

alerting.go

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

dashboard_parser.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

engine.go

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

executor_test.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

executor.go

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

interfaces.go

feat(alerting): minor progress

2016-06-06 14:24:14 +02:00

models.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

notifier.go

feat(alerting): only start unfinnished jobs

2016-05-23 14:14:02 +02:00

rule_reader.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

scheduler.go

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +02:00

ticker_test.go

feat(alerting): began work on splitting scheduler into scheduler and engine

2016-06-06 11:56:58 +02:00

ticker.go

feat(alerting): began work on splitting scheduler into scheduler and engine

2016-06-06 11:56:58 +02:00