Torkel Ödegaard
|
9f29c54170
|
Merge branch 'query_part_refactor' into alerting
Conflicts:
pkg/services/sqlstore/migrations/alert_mig.go
pkg/services/sqlstore/migrations/heartbeat_mig.go
|
2016-08-15 17:54:42 +02:00 |
|
Torkel Ödegaard
|
d8d951c810
|
feat(alerting): can now change reducer
|
2016-08-15 17:53:44 +02:00 |
|
Torkel Ödegaard
|
1418cbbd8b
|
feat(query_part): refactoring query part
|
2016-08-15 17:20:45 +02:00 |
|
Torkel Ödegaard
|
befca9bb2f
|
feat(query parts): refactoring query part component to support actions
|
2016-08-15 13:51:55 +02:00 |
|
bergquist
|
4d0982a21c
|
Merge branch 'master' into alerting
|
2016-08-15 07:58:30 +02:00 |
|
Torkel Ödegaard
|
0ea3458f69
|
Merge branch 'v3.1.x'
Conflicts:
public/app/features/dashboard/dynamic_dashboard_srv.ts
|
2016-08-14 14:47:14 +02:00 |
|
Torkel Ödegaard
|
58df60f670
|
fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795
|
2016-08-14 14:45:49 +02:00 |
|
Julian Einwag
|
cbf0e77add
|
fix repeat panels (#5796)
|
2016-08-14 13:59:16 +02:00 |
|
Julian Einwag
|
deb245f526
|
fix repeat panels (#5796)
|
2016-08-14 13:50:49 +02:00 |
|
Torkel Ödegaard
|
74dbd7fb36
|
feat(alerting): disable visual thresholds while alert is enabled
|
2016-08-12 13:19:06 +02:00 |
|
Torkel Ödegaard
|
597103a1f2
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-12 10:32:58 +02:00 |
|
Torkel Ödegaard
|
06210a4a22
|
feat(thresholds): refactoring and adding many unit tests
|
2016-08-12 10:32:46 +02:00 |
|
bergquist
|
16e75a3036
|
feat(alerting): add alert message to slack integration
|
2016-08-12 10:12:04 +02:00 |
|
Torkel Ödegaard
|
89ca15f3a1
|
feat(thresholds): lots of progress on thresholds
|
2016-08-11 18:25:41 +02:00 |
|
Torkel Ödegaard
|
72a67b39f1
|
feat(thresholds): more work thresholds
|
2016-08-11 15:18:21 +02:00 |
|
Torkel Ödegaard
|
6881db87bb
|
Merge branch 'alerting' into thresholds_v3
|
2016-08-11 10:31:39 +02:00 |
|
Torkel Ödegaard
|
8878a55dc6
|
Merge branch 'master' into alerting
|
2016-08-11 10:31:15 +02:00 |
|
Torkel Ödegaard
|
fbb8f8e691
|
feat(alerting): making progress on alert handles
|
2016-08-10 21:37:10 +02:00 |
|
Torkel Ödegaard
|
2639c38912
|
fix(threshold): remove old threshold properties
|
2016-08-10 20:44:39 +02:00 |
|
Torkel Ödegaard
|
bdb8d77562
|
feat(thresholds): migration from previous threshold schema
|
2016-08-10 20:41:21 +02:00 |
|
Alexander Zobnin
|
124961a9e3
|
Explicitly set charset to utf-8 in viewJson(), fixes #5719. (#5774)
|
2016-08-10 20:23:58 +02:00 |
|
Torkel Ödegaard
|
7c0675798e
|
feat(thresholds): new thresholds options are looking ok
|
2016-08-10 17:32:34 +02:00 |
|
Torkel Ödegaard
|
0f8c8517e3
|
feat(thresholds): adding a new form of thresholds options
|
2016-08-10 15:27:33 +02:00 |
|
Torkel Ödegaard
|
4fd8b2ace4
|
Merge branch 'master' into alerting
|
2016-08-10 12:53:41 +02:00 |
|
Torkel Ödegaard
|
61756d2ae6
|
feat(alerting): removed delete button
|
2016-08-10 07:58:40 +02:00 |
|
bmundt
|
6d1dd95ab3
|
adds check for making datasource template variables children of other template variables (#5717)
|
2016-08-05 10:03:46 +02:00 |
|
hc4
|
4d40326706
|
Add refresh query parameter parsing (#5729)
|
2016-08-04 18:58:59 +02:00 |
|
Torkel Ödegaard
|
49abb205a0
|
Merge branch 'v3.1.x'
Conflicts:
public/sass/_variables.light.scss
|
2016-08-01 12:23:36 +02:00 |
|
Torkel Ödegaard
|
a4d27083d0
|
fix(tests): fixed unit test broken in recent dynamic dashboard fix
|
2016-08-01 12:20:16 +02:00 |
|
Torkel Ödegaard
|
44d1393480
|
fix(templating): fixed issue with panel/row repeat when saving dashboard, fixes #5591
|
2016-08-01 10:50:33 +02:00 |
|
Torkel Ödegaard
|
357358898d
|
feat(annotations): working on alert annotations, #5694
|
2016-08-01 10:07:00 +02:00 |
|
Torkel Ödegaard
|
c5e90b1801
|
feat(alerting): more polish on alerting tab UI
|
2016-07-31 21:58:12 +02:00 |
|
Torkel Ödegaard
|
3b69c8f687
|
feat(alerting): new design for alert tab with sidemenu
|
2016-07-31 09:31:32 +02:00 |
|
Torkel Ödegaard
|
01da3f6cb2
|
feat(alerting): worked on improving slack alerts
|
2016-07-28 17:03:53 +02:00 |
|
Torkel Ödegaard
|
ae5f8a76d9
|
feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification
|
2016-07-27 12:09:55 +02:00 |
|
Torkel Ödegaard
|
77c66a88d9
|
Merge branch 'master' into alerting
|
2016-07-27 10:22:00 +02:00 |
|
Torkel Ödegaard
|
e789d0df63
|
Merge branch 'v3.1.x'
|
2016-07-27 10:21:16 +02:00 |
|
Torkel Ödegaard
|
89dc3b88d1
|
fix(test): fixed failing test caused by recent change
|
2016-07-27 10:20:48 +02:00 |
|
Torkel Ödegaard
|
c2eeb6dda0
|
fix(alerting): minor notification fix
|
2016-07-27 10:15:21 +02:00 |
|
Torkel Ödegaard
|
cde1bbff78
|
Merge branch 'alert_conditions' into alerting
|
2016-07-27 09:52:42 +02:00 |
|
Torkel Ödegaard
|
c675ffc682
|
Merge branch 'master' into alerting
|
2016-07-27 09:45:16 +02:00 |
|
Torkel Ödegaard
|
e4592c8d53
|
Merge branch 'v3.1.x'
|
2016-07-27 09:36:46 +02:00 |
|
Torkel Ödegaard
|
971e2d62f1
|
fix(zoom): fixed zoom in and out issues when graph is embedded, fixes #5666, fixes #4489
|
2016-07-27 09:36:35 +02:00 |
|
Torkel Ödegaard
|
5155c8a753
|
feat(templating): set default min span to 4, fixes #5662
|
2016-07-26 17:20:27 +02:00 |
|
Torkel Ödegaard
|
0d9b98da6d
|
feat(alerting): progress on email notifications
|
2016-07-26 12:29:52 +02:00 |
|
Torkel Ödegaard
|
6cb1dafb1d
|
feat(alerting): progress on notifications
|
2016-07-25 16:26:28 +02:00 |
|
Torkel Ödegaard
|
8df558dece
|
feat(notifications): refactoring notification handling
|
2016-07-25 13:52:17 +02:00 |
|
Torkel Ödegaard
|
9fd7676846
|
Merge branch 'v3.1.x'
|
2016-07-25 12:03:40 +02:00 |
|
Torkel Ödegaard
|
0de0f4d014
|
feat(templating): fixed issue with template variables set to reload on dashboard load being issued multiple times, fixes #5637
|
2016-07-25 12:02:59 +02:00 |
|
Torkel Ödegaard
|
9f777a535b
|
fix(): removed dashboard version to schema version migration
|
2016-07-23 13:29:48 +02:00 |
|