Torkel Ödegaard
|
fc8f0721cd
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/services/alerting/eval_context.go
|
2016-09-06 20:40:49 +02:00 |
|
Torkel Ödegaard
|
fbae6abb3c
|
feat(alerting): progress on handling no data in alert query, #5860
|
2016-09-06 20:40:12 +02:00 |
|
bergquist
|
22805ce56b
|
fix(alert_tab): fix broken alert history
|
2016-09-06 14:42:34 +02:00 |
|
bergquist
|
55b560a4a8
|
feat(alerting): filter notifications based on severity
closes #5851
|
2016-09-06 14:27:48 +02:00 |
|
Torkel Ödegaard
|
6b17cdbca6
|
feat(alerting): Save As removes alerts from panels, closes #5965
|
2016-09-06 09:14:11 +02:00 |
|
bergquist
|
c893e5d241
|
feat(notifications): add support for default notifications
ref #5883
|
2016-09-05 21:35:37 +02:00 |
|
bergquist
|
d11bc57c37
|
feat(notifications): make it possible to send test alert notifications
closes #5847
|
2016-09-05 14:45:15 +02:00 |
|
Torkel Ödegaard
|
e2f5bf1666
|
feat(alerting): fixed confirm delete dashboard issue
|
2016-09-05 13:38:25 +02:00 |
|
bergquist
|
daea38060f
|
feat(notifications): redirect to notification list after creation.
|
2016-09-05 08:27:12 +02:00 |
|
Hiroaki Kobayashi
|
3645fb371c
|
fix typo
|
2016-09-02 15:22:04 +09:00 |
|
bergquist
|
e493015f54
|
fix(alerting): replace one hack with another hack
|
2016-08-31 10:10:39 +02:00 |
|
bergquist
|
53a9dec407
|
feat(alerting): move timestamp to new row
ref #5850
|
2016-08-31 09:48:58 +02:00 |
|
bergquist
|
b55b7cde4b
|
fix(alerting): remove error message when model is valid again
closes #5921
|
2016-08-30 13:36:13 +02:00 |
|
bergquist
|
11a4ff0f8a
|
feat(alerting): add basic UI for history in alert tab
ref #5850
|
2016-08-30 13:22:59 +02:00 |
|
bergquist
|
f3d6035c59
|
feat(alerting): add alerts for notification edits
|
2016-08-22 14:49:40 +02:00 |
|
bergquist
|
5a33679470
|
fix(alerting): remove has no value condition
|
2016-08-22 12:20:07 +02:00 |
|
bergquist
|
e415412691
|
feat(alerting): add image for howto popup
closes #5784
|
2016-08-18 18:36:58 +02:00 |
|
Torkel Ödegaard
|
09cdf3e9e1
|
feat(alerting): show execution errors in alert list
|
2016-08-18 11:37:35 +02:00 |
|
Torkel Ödegaard
|
5cf9711862
|
feat(alerting): added eval match to test results
|
2016-08-18 11:22:24 +02:00 |
|
Torkel Ödegaard
|
2f953d75a6
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-18 10:07:45 +02:00 |
|
Torkel Ödegaard
|
9028d4899f
|
feat(alerting): alert list fixes
|
2016-08-18 10:07:31 +02:00 |
|
bergquist
|
631acc2bf9
|
feat(alerting): only show available queries in alert query
|
2016-08-18 10:02:17 +02:00 |
|
Torkel Ödegaard
|
9b5a7b5ef6
|
feat(alerting): added alert howto text, closes #5784
|
2016-08-18 09:58:20 +02:00 |
|
Torkel Ödegaard
|
75a6c2b612
|
feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841
|
2016-08-18 09:03:46 +02:00 |
|
Torkel Ödegaard
|
2e7cb04490
|
feat(alerting): some final changes to alert list #5784
|
2016-08-17 15:48:58 +02:00 |
|
Torkel Ödegaard
|
63a283b4bc
|
feat(alerting): working on alert state filters for alert list
|
2016-08-17 11:00:00 +02:00 |
|
Torkel Ödegaard
|
0b7fa3c19d
|
feat(alerting): minor progress on alert list, #5784
|
2016-08-16 16:50:36 +02:00 |
|
Torkel Ödegaard
|
65ce01fbff
|
feat(alerting): fixing failing typescript build
|
2016-08-16 10:09:07 +02:00 |
|
Torkel Ödegaard
|
f934081bcb
|
feat(alerting): making progress on alerting list, #5784
|
2016-08-16 09:52:45 +02:00 |
|
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 |
|