bergquist
90e3d8afda
Merge branch 'alerting' into alerting_notifications
2016-06-17 09:55:58 +02:00
bergquist
c96108226c
fix(alerting): use alert frequency
2016-06-17 09:55:42 +02:00
bergquist
764c58ba8d
Merge branch 'alerting' into alerting_notifications
2016-06-17 09:54:38 +02:00
bergquist
9481fcb830
fix(alerting): use alert frequency
2016-06-17 09:54:11 +02:00
bergquist
ebada26b85
Merge branch 'alerting' into alerting_notifications
2016-06-17 08:27:58 +02:00
bergquist
e8a324c7f5
feat(alerting): add frequency back to alert model
2016-06-17 08:27:38 +02:00
bergquist
946dc0ecf3
Merge branch 'alerting' into alerting_notifications
2016-06-17 07:44:39 +02:00
bergquist
1771ab032e
Merge branch 'master' into alerting
2016-06-17 07:44:21 +02:00
bergquist
8b2f6fffc9
test(dashboards): comment code in broken tests
2016-06-17 07:43:57 +02:00
Torkel Ödegaard
32479503bd
fix(build): another windows build issue
2016-06-16 21:10:30 +02:00
Torkel Ödegaard
b06ec734f1
fix(build): windows, another windows build fix, #5370
2016-06-16 18:21:12 +02:00
bergquist
b035074613
tech(alerting): disable update state api
2016-06-16 17:02:45 +02:00
bergquist
a0418da160
Merge branch 'alerting' into alerting_notifications
2016-06-16 16:49:16 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
bergquist
3c4d2b8ca1
feat(alerting): add basic body for webhooks
2016-06-16 16:25:23 +02:00
bergquist
6705efef6f
feat(alerting): make some settings properties required
2016-06-16 16:18:40 +02:00
bergquist
f3009dc23b
fix(alerting): broken link
2016-06-16 16:06:40 +02:00
bergquist
b907ce341c
feat(alerting): enables deletes for alert notifications
2016-06-16 15:21:44 +02:00
bergquist
149c2ae913
feat(alerting): add submenu for alerting
2016-06-16 15:21:23 +02:00
Torkel Ödegaard
b039a81375
feat(build): fixing windows build issue, #5370
2016-06-16 14:36:19 +02:00
bergquist
7f767224af
feat(alerting): basic support for creating and updating notifications
2016-06-16 14:29:20 +02:00
Joel Smith
46fe9a167e
Update file_export.ts ( #5325 )
...
Prepended first line to export file containing
`sep=;\n`
which I believe should be all that is required for Excel to interpret the CSV file as semicolon delimited.
2016-06-16 14:27:00 +02:00
Torkel Ödegaard
79eb971fad
docs(): updated changelog
2016-06-16 10:49:40 +02:00
Torkel Ödegaard
81e9aa4de4
feat(datasource): cancel in flight data source requests, refeatoring #5321
2016-06-16 10:48:26 +02:00
bergquist
c51facfaef
style(alerting): move filter below HR
2016-06-16 09:23:53 +02:00
bergquist
00fc2e2593
test(alerting): fixes broken unittest
2016-06-16 09:09:09 +02:00
Torkel Ödegaard
6d3521c240
Merge branch 'cancel-in-flight-repeats' of https://github.com/stuartnelson3/grafana into stuartnelson3-cancel-in-flight-repeats
2016-06-16 08:57:31 +02:00
bergquist
72e23bca5f
tech(alerting): improve/cleanup logging
2016-06-16 08:56:19 +02:00
Torkel Ödegaard
23e0240410
fix(build): removed logging call that caused wrong dependency to be used
2016-06-16 08:55:36 +02:00
bergquist
4d03e04172
feat(alerting): enable email notifiter
2016-06-16 08:29:49 +02:00
Torkel Ödegaard
1ae24b366f
feat(profiler): fixed issues with frontend perf profiler
2016-06-16 08:28:50 +02:00
bergquist
2e809cae05
tech(alerting): enforce POST for webhooks
2016-06-16 08:16:16 +02:00
bergquist
efea3bc9cb
feat(alerting): skeleton commit for webhook
2016-06-16 08:16:16 +02:00
bergquist
a3b7ea7704
feat(alerting): skeleton for alert notification configuration page
2016-06-16 08:16:16 +02:00
bergquist
4c5d2d6079
style(alerting): remove unused code
2016-06-16 08:16:16 +02:00
bergquist
b9b65cf2d4
tech(alerting): add logging about failed notifications
2016-06-16 08:16:16 +02:00
bergquist
9a8416416d
feat(alerting): converter for db model to notification
2016-06-16 08:16:16 +02:00
bergquist
6eca26e8ec
style(alerting): improve formating
2016-06-16 08:16:16 +02:00
bergquist
dbf3795aaf
feat(alerting): add sql layer for alert notifications
2016-06-16 08:16:16 +02:00
bergquist
8b91e57ef6
feat(alerting): notification query
2016-06-16 08:16:16 +02:00
Torkel Ödegaard
2ceb58d0c4
feat(elasticsearch): removed dashboard import migration
2016-06-16 08:11:40 +02:00
Torkel Ödegaard
e1f63a3346
docs(): updated changelog
2016-06-16 08:10:15 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
4b78ab5bcd
feat(graph): graph tooltip sort order PR refactored/changed #4944 , changed the layout graph display options, #4944
2016-06-15 17:20:55 +02:00
Torkel Ödegaard
ae554a736b
change(graphite): removed graphite png option in graph panel, closes #5367
2016-06-15 14:20:44 +02:00
bergquist
779ea55ee0
style(alerting): rename executor -> handler
2016-06-15 11:49:20 +02:00
bergquist
777ca4cd7d
style(alerting): rename level.level to level.value
2016-06-15 11:39:25 +02:00
Torkel Ödegaard
a893152141
feat(alerting): thesholds unification
2016-06-15 10:41:21 +02:00
Torkel Ödegaard
f03e8292a2
feat(alerting): progress on threshold unification
2016-06-14 17:00:51 +02:00
Torkel Ödegaard
ed7a539ddb
feat(alerting): thresholds rethink
2016-06-14 16:45:51 +02:00
bergquist
Torkel Ödegaard
Joel Smith