bergquist
|
2cf72715fb
|
test(alerting): fixes broken unit tests
|
2016-06-13 09:33:14 +02:00 |
|
bergquist
|
d52fc8d0ad
|
Merge branch 'alert_ui_take2' into alerting
|
2016-06-13 09:20:00 +02:00 |
|
Torkel Ödegaard
|
9216492d55
|
Merge branch 'alert_handles' into alert_ui_take2
Conflicts:
pkg/services/alerting/commands.go
|
2016-06-13 07:53:13 +02:00 |
|
bergquist
|
77746f277d
|
chore(alerting): move transformers to seperate package
|
2016-06-13 07:46:54 +02:00 |
|
Torkel Ödegaard
|
e3b281dbac
|
feat(alerting): more work on alerting thresholds
|
2016-06-12 11:43:18 +02:00 |
|
Torkel Ödegaard
|
5b6fb3b124
|
feat(alerting): level handle progress
|
2016-06-11 23:52:25 +02:00 |
|
Torkel Ödegaard
|
ec640bd5da
|
feat(alerting): more work on alerting ui
|
2016-06-11 23:31:49 +02:00 |
|
Torkel Ödegaard
|
1500c0e954
|
feat(alerting): alert threshold handles progress
|
2016-06-11 22:33:02 +02:00 |
|
Torkel Ödegaard
|
f387e39b67
|
mend
|
2016-06-11 14:37:52 +02:00 |
|
Torkel Ödegaard
|
0b919c752b
|
feat(alerting): poc of dragable alert handles
|
2016-06-11 14:37:33 +02:00 |
|
Torkel Ödegaard
|
66c2594262
|
feat(alerting): sql update fixes
|
2016-06-11 14:08:55 +02:00 |
|
Torkel Ödegaard
|
71c1c0ab65
|
feat(alerting): trying to get things to work with new model
|
2016-06-11 13:49:11 +02:00 |
|
Torkel Ödegaard
|
0ef6801117
|
Merge branch 'master' into alert_ui_take2
|
2016-06-11 12:17:14 +02:00 |
|
Torkel Ödegaard
|
bf1ea560e9
|
feat(logging): error logging improvements
|
2016-06-11 12:16:33 +02:00 |
|
Torkel Ödegaard
|
77a5e3f14d
|
feat(alerting): minor fixes
|
2016-06-11 11:54:46 +02:00 |
|
Torkel Ödegaard
|
086b59483e
|
feat(loggin): disable logging by default so unit tests are not full of logging
|
2016-06-11 11:38:25 +02:00 |
|
Torkel Ödegaard
|
382f396247
|
feat(alerting): more model changes
|
2016-06-11 10:54:24 +02:00 |
|
Torkel Ödegaard
|
a362984c57
|
feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part
|
2016-06-11 10:26:48 +02:00 |
|
Torkel Ödegaard
|
2b4a9954b1
|
feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package
|
2016-06-11 10:13:33 +02:00 |
|
bergquist
|
1fa9ae810b
|
test(alerting): enable disabled tests
|
2016-06-10 15:49:23 +02:00 |
|
bergquist
|
83c422e6ef
|
feat(alerting): implement transform objects
|
2016-06-10 15:31:17 +02:00 |
|
Torkel Ödegaard
|
c18017381b
|
Merge branch 'alert_ui_take2' of github.com:grafana/grafana into alert_ui_take2
Conflicts:
public/app/plugins/panel/graph/alert_tab_ctrl.ts
|
2016-06-10 14:52:17 +02:00 |
|
Torkel Ödegaard
|
48cbeb96bf
|
feat(alerting): updated rule model and UI
|
2016-06-10 14:49:54 +02:00 |
|
bergquist
|
ea8fb66f73
|
test(alerting): fixes broken unittests
|
2016-06-10 13:47:54 +02:00 |
|
bergquist
|
3c0b5fe78e
|
tech(alerting): add graphite dateformat replacer
|
2016-06-10 13:26:19 +02:00 |
|
bergquist
|
8cd1d17916
|
feat(alerting): new alerting model\
|
2016-06-10 13:15:16 +02:00 |
|
bergquist
|
0c69c5afb1
|
test(alerting): fixes broken unittests
|
2016-06-10 11:37:03 +02:00 |
|
bergquist
|
ef35184a80
|
feat(alerting): rename alertrule model to alertruleDAO
|
2016-06-10 10:00:00 +02:00 |
|
bergquist
|
b17298c97c
|
test(alerting): remove unused code to enable gorename
|
2016-06-10 07:11:14 +02:00 |
|
bergquist
|
fdf051ad5a
|
feat(alerting): begin alert rule storage refactoring
|
2016-06-09 22:21:28 +02:00 |
|
bergquist
|
3898f427f5
|
feat(alerting): update the ux model
|
2016-06-09 15:10:50 +02:00 |
|
bergquist
|
1e4761854e
|
Merge branch 'alerting_definitions' into alert_ui_take2
|
2016-06-09 13:03:40 +02:00 |
|
Torkel Ödegaard
|
55af988e02
|
feat(alerting): mocking with new alert rule model
|
2016-06-09 12:14:50 +02:00 |
|
bergquist
|
66d47a9303
|
tech(alerting): go vet fix
|
2016-06-09 10:49:25 +02:00 |
|
Torkel Ödegaard
|
c85bb47675
|
Merge branch 'alerting_definitions' into alert_ui_take2
|
2016-06-09 10:46:03 +02:00 |
|
Torkel Ödegaard
|
dee5f582d7
|
Merge branch 'master' into alerting_definitions
|
2016-06-09 10:45:16 +02:00 |
|
Torkel Ödegaard
|
1584dac00a
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-06-09 10:43:46 +02:00 |
|
Torkel Ödegaard
|
79986e5593
|
Merge branch 'query-part-refactor'
Conflicts:
public/app/plugins/datasource/influxdb/query_part.ts
|
2016-06-09 10:43:07 +02:00 |
|
Torkel Ödegaard
|
b8aa8b3079
|
feat(prometheus): restore old prometheus query editor, revert this commit in prometheus query editor v2 branch
|
2016-06-09 10:37:33 +02:00 |
|
bergquist
|
544073b7e1
|
feat(alerting): make sure saved alerts are valid
|
2016-06-09 10:27:23 +02:00 |
|
Torkel Ödegaard
|
071c16b73c
|
feat(alerting): start on new ui
|
2016-06-09 10:13:34 +02:00 |
|
bergquist
|
a1f97e0b77
|
feat(alerting): add heartbeat writer
|
2016-06-09 10:00:34 +02:00 |
|
Mark Baas
|
ced3bafa99
|
returns correct index (#5275)
|
2016-06-09 08:13:31 +02:00 |
|
Mukesh
|
755ec552de
|
Bugfix: org select btn was not working on profile (#5317)
|
2016-06-09 00:43:38 +02:00 |
|
Torkel Ödegaard
|
a66027830b
|
Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions
|
2016-06-08 09:42:31 +02:00 |
|
Torkel Ödegaard
|
26d93d7130
|
Merge branch 'master' into alerting_definitions
|
2016-06-08 09:36:50 +02:00 |
|
bergquist
|
ffac5c1299
|
docs(changelog): add note about changelog
|
2016-06-08 09:35:34 +02:00 |
|
Carl Bergquist
|
fe5673134f
|
Merge pull request #5292 from Thib17/master
Enable the "limit" param in /api/search
|
2016-06-08 09:19:58 +02:00 |
|
bergquist
|
366fb11416
|
style(alerting): add fmt fixes
|
2016-06-08 08:50:11 +02:00 |
|
Torkel Ödegaard
|
1d8fdc09e7
|
feat(logging): added log format option, #4590
|
2016-06-08 08:48:46 +02:00 |
|