Torkel Ödegaard
|
61756d2ae6
|
feat(alerting): removed delete button
|
2016-08-10 07:58:40 +02:00 |
|
Torkel Ödegaard
|
e044a65d08
|
feat(alerting): updated
|
2016-08-01 22:15:28 +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
|
f9ddfb4337
|
Merge branch 'master' into alerting
|
2016-07-29 15:07:47 +02:00 |
|
Torkel Ödegaard
|
79138e211f
|
Merge branch 'v3.1.x'
|
2016-07-29 15:07:17 +02:00 |
|
Torkel Ödegaard
|
741b7353c1
|
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
|
2016-07-29 15:06:09 +02:00 |
|
Torkel Ödegaard
|
c4e7a3ae89
|
fix(png rendering): another fix for #5606
|
2016-07-29 15:04:51 +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
|
c997923b17
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-07-27 10:21:38 +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 |
|
Thib17
|
732c84c230
|
Enable scaling down seconds unit s > ms > µs > ns (#5642)
|
2016-07-27 10:10:01 +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
|
0b0f6b0848
|
feat(alerting): made very basic threshold viz work again
|
2016-07-26 14:35:42 +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
|
9f14b209bd
|
fix(html): moved body tag, fixes #5648
|
2016-07-25 12:21:51 +02:00 |
|
Torkel Ödegaard
|
ee0d6ecfe6
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-07-25 12:04:58 +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 |
|
bmundt
|
f6b1d5a84a
|
Added '!=' option for where clause in the influx query builder (#5646)
|
2016-07-25 10:36:38 +02:00 |
|
Torkel Ödegaard
|
9f777a535b
|
fix(): removed dashboard version to schema version migration
|
2016-07-23 13:29:48 +02:00 |
|
Torkel Ödegaard
|
7a2e8324b9
|
Merge branch 'v3.1.x'
|
2016-07-23 12:54:23 +02:00 |
|
Torkel Ödegaard
|
ddf579f204
|
fix(mixed data sources): fix when using two graphite data sources in mixed mode, fixes #5617
|
2016-07-23 12:54:11 +02:00 |
|
Torkel Ödegaard
|
4a33e2023f
|
Merge branch 'v3.1.x'
|
2016-07-23 12:01:27 +02:00 |
|
Torkel Ödegaard
|
3abbf08a17
|
tech(): upgrade jquery to 2.2.4, closes #5627
|
2016-07-23 12:00:45 +02:00 |
|
Torkel Ödegaard
|
474a821767
|
fix(elasticsearch): fix json escape logic when doing terms template value lookup, fixes #5485
|
2016-07-23 11:52:49 +02:00 |
|
Torkel Ödegaard
|
a6c6094775
|
feat(alerting): started reworking notifications
|
2016-07-22 16:45:17 +02:00 |
|
Torkel Ödegaard
|
7eb2d2cf47
|
feat(alerting): working on state management
|
2016-07-22 13:14:09 +02:00 |
|
Torkel Ödegaard
|
783d697529
|
feat(alerting): more output when testing alert
|
2016-07-21 21:54:12 +02:00 |
|
Torkel Ödegaard
|
b073fe0eba
|
feat(alerting): more work on handling result and saving state
|
2016-07-21 17:31:46 +02:00 |
|
Torkel Ödegaard
|
f0fc336e88
|
feat(alerting): worked on alert condition eval tests
|
2016-07-21 16:19:28 +02:00 |
|
Torkel Ödegaard
|
3ad38eefd2
|
feat(alerting): test results look better
|
2016-07-21 13:57:19 +02:00 |
|
Torkel Ödegaard
|
f6a160b270
|
feat(alerting): testing alert is starting to work
|
2016-07-21 13:09:12 +02:00 |
|
Torkel Ödegaard
|
9e91aacd34
|
feat(alerting): progress on testing alerts
|
2016-07-21 10:29:11 +02:00 |
|
Torkel Ödegaard
|
20fcffb71e
|
feat(alerting): working on alerting conditions model
|
2016-07-19 16:15:26 +02:00 |
|
Torkel Ödegaard
|
f38c954639
|
feat(alerting): more work on alert conditions
|
2016-07-19 11:54:41 +02:00 |
|
Torkel Ödegaard
|
29d308e447
|
feat(alerting): refactoring alert model to use conditions concept
|
2016-07-19 11:24:27 +02:00 |
|
Torkel Ödegaard
|
b0fe69822a
|
Merge branch 'master' into alerting
Conflicts:
public/app/core/services/alert_srv.ts
public/app/partials/confirm_modal.html
|
2016-07-18 18:22:35 +02:00 |
|
Torkel Ödegaard
|
3f861dd039
|
Merge branch 'v3.1.x'
|
2016-07-18 16:27:27 +02:00 |
|