bergquist
|
488b42377b
|
feat(alerting): update state if not been updated for 15min
|
2016-06-23 11:03:27 +02:00 |
|
bergquist
|
5d62c84a19
|
feat(alerting): adds default checkbox to ui
|
2016-06-20 16:19:15 +02:00 |
|
bergquist
|
fa309ec925
|
feat(alerting): add default notification group
|
2016-06-20 15:24:48 +02:00 |
|
bergquist
|
96e5ad3f5c
|
Merge branch 'alerting' into alerting_notifications
|
2016-06-20 10:45:05 +02:00 |
|
bergquist
|
dd8c3d0355
|
Merge branch 'master' into alerting
|
2016-06-20 10:44:48 +02:00 |
|
Torkel Ödegaard
|
305a6ae110
|
feat(dashboards): dashboard sharing fixes
|
2016-06-17 11:36:35 +02:00 |
|
Torkel Ödegaard
|
10daf1d63a
|
Revert "Enable the "limit" param in /api/search"
This reverts commit 3d77685108.
|
2016-06-17 11:22:39 +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
|
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
|
b907ce341c
|
feat(alerting): enables deletes for alert notifications
|
2016-06-16 15:21:44 +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
|
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 |
|
bergquist
|
779ea55ee0
|
style(alerting): rename executor -> handler
|
2016-06-15 11:49:20 +02:00 |
|
Torkel Ödegaard
|
dac8b35a1a
|
feat(alerting): renamed scheduler to handler
|
2016-06-13 15:58:22 +02:00 |
|
bergquist
|
7f22b9eb6e
|
tech(alerting): expression -> settings
|
2016-06-13 15:18:19 +02:00 |
|
bergquist
|
3ad90c389c
|
style(alerting): improve naming
|
2016-06-13 14:01:57 +02:00 |
|
bergquist
|
1e41eb8c97
|
tech(alerting): remove frequency from alert model
|
2016-06-13 10:42:36 +02:00 |
|
bergquist
|
2cf72715fb
|
test(alerting): fixes broken unit tests
|
2016-06-13 09:33:14 +02:00 |
|
Torkel Ödegaard
|
1500c0e954
|
feat(alerting): alert threshold handles progress
|
2016-06-11 22:33:02 +02:00 |
|
Torkel Ödegaard
|
66c2594262
|
feat(alerting): sql update fixes
|
2016-06-11 14:08:55 +02:00 |
|
Torkel Ödegaard
|
0ef6801117
|
Merge branch 'master' into alert_ui_take2
|
2016-06-11 12:17:14 +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
|
ea8fb66f73
|
test(alerting): fixes broken unittests
|
2016-06-10 13:47:54 +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
|
fdf051ad5a
|
feat(alerting): begin alert rule storage refactoring
|
2016-06-09 22:21:28 +02:00 |
|
Torkel Ödegaard
|
dee5f582d7
|
Merge branch 'master' into alerting_definitions
|
2016-06-09 10:45:16 +02:00 |
|
bergquist
|
a1f97e0b77
|
feat(alerting): add heartbeat writer
|
2016-06-09 10:00:34 +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 |
|
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
|
b25cb60259
|
Merge branch 'new-logger'
Conflicts:
CHANGELOG.md
|
2016-06-08 08:09:59 +02:00 |
|
Zdenek Styblik
|
5eceabf810
|
fix(): Check Organization exists before User is added (#5302)
Commit adds a check whether Organization exists before User is added to
the organization.
Fixes #3151.
|
2016-06-08 05:46:21 +02:00 |
|
Torkel Ödegaard
|
93fdc18fd4
|
feat(logging): fixed dependencies
|
2016-06-07 15:59:50 +02:00 |
|
bergquist
|
8d4aa5d114
|
test(alerting): update dashboard json
|
2016-06-07 15:52:33 +02:00 |
|
Torkel Ödegaard
|
e4ea24dfc4
|
Merge branch 'new-logger' into alerting_definitions
Conflicts:
pkg/services/sqlstore/migrations/migrations_test.go
|
2016-06-07 15:51:22 +02:00 |
|
Torkel Ödegaard
|
73b0e6c37b
|
feat(logging): disable migrator logging during test
|
2016-06-07 15:50:16 +02:00 |
|
Torkel Ödegaard
|
3289225b77
|
feat(alerting): fixed test issues
|
2016-06-07 14:51:53 +02:00 |
|
Torkel Ödegaard
|
8105ec4660
|
feat(alerting): fixed test issues
|
2016-06-07 14:27:56 +02:00 |
|
Torkel Ödegaard
|
0667d73660
|
Merge branch 'new-logger' into alerting_definitions
Conflicts:
pkg/api/api.go
pkg/setting/setting.go
|
2016-06-07 13:31:56 +02:00 |
|