Torkel Ödegaard
|
da59d6547f
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-17 10:03:57 +02:00 |
|
Torkel Ödegaard
|
05697d5ecd
|
Merge branch 'master' into alerting
Conflicts:
conf/sample.ini
|
2016-08-17 10:03:33 +02:00 |
|
Torkel Ödegaard
|
f9b628ad0e
|
Merge branch 'v3.1.x'
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
|
2016-08-17 09:53:46 +02:00 |
|
bergquist
|
6497b307c4
|
feat(alerting): save execution error upon state changed
|
2016-08-17 09:27:29 +02:00 |
|
bergquist
|
9915f15ed0
|
feat(alerting): adds sql layer for saving execution errors
|
2016-08-17 07:49:14 +02:00 |
|
Torkel Ödegaard
|
434332f02d
|
feat(alerting): changed fontsize in alert list
|
2016-08-16 21:26:54 +02:00 |
|
Torkel Ödegaard
|
15c11fdb54
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-16 16:51:24 +02:00 |
|
Torkel Ödegaard
|
0b7fa3c19d
|
feat(alerting): minor progress on alert list, #5784
|
2016-08-16 16:50:36 +02:00 |
|
bergquist
|
c7cb93a33a
|
style(alerting): improve codestyle for evaluators
|
2016-08-16 12:44:31 +02:00 |
|
bergquist
|
fb7f2ae2e2
|
feat(alerting): adds within_range and outside_range evaluators
closes #5829
|
2016-08-16 12:37:07 +02:00 |
|
bergquist
|
b5d92b6191
|
test(alerting): fix broken tests
|
2016-08-16 12:37:07 +02:00 |
|
Torkel Ödegaard
|
6b90587d27
|
feat(alerting): fixing failing go unit test
|
2016-08-16 10:22:16 +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
|
1418cbbd8b
|
feat(query_part): refactoring query part
|
2016-08-15 17:20:45 +02:00 |
|
Torkel Ödegaard
|
0392fde34e
|
feat(alerting): doing schema changes
|
2016-08-15 15:12:43 +02:00 |
|
bergquist
|
f7a9102523
|
feat(metrics): improve graphite settings
Fixes the broken support for overriding settings with ENV variables.
closes #5769
|
2016-08-15 09:59:55 +02:00 |
|
bergquist
|
cf6736d480
|
fix(metrics): add ending dot for graphite prefix
|
2016-08-15 09:58:32 +02:00 |
|
bergquist
|
41790c6709
|
fix(metrics): hide none existing metrics settings
|
2016-08-15 09:58:23 +02:00 |
|
bergquist
|
ebecc5e5a0
|
fix(metrics): make metrics cfg backwards compatible
|
2016-08-15 09:57:49 +02:00 |
|
bergquist
|
0524d0c625
|
fix(metrics): replaces . with _ in instance name
closes #5739
|
2016-08-15 09:57:00 +02:00 |
|
bergquist
|
2b2e015d62
|
feat(cli): add default plugin folder for MAC OS
closes #5806
|
2016-08-15 09:18:56 +02:00 |
|
bergquist
|
7a913f77d3
|
feat(cli): add default plugin folder for MAC OS
closes #5806
|
2016-08-15 08:54:35 +02:00 |
|
bergquist
|
4d0982a21c
|
Merge branch 'master' into alerting
|
2016-08-15 07:58:30 +02:00 |
|
Mitsuhiro Tanda
|
7a1011ac39
|
(cloudwatch) support ApplicationELB (#5802)
|
2016-08-14 13:21:17 +02:00 |
|
bergquist
|
fb7a6c0764
|
feat(alerting): list all series in alert email
|
2016-08-13 12:50:51 +02:00 |
|
bergquist
|
c4e905474a
|
feat(alerting): improve email notifications layout
|
2016-08-13 11:24:03 +02:00 |
|
Torkel Ödegaard
|
74dbd7fb36
|
feat(alerting): disable visual thresholds while alert is enabled
|
2016-08-12 13:19:06 +02:00 |
|
bergquist
|
1dcae464fe
|
chore(notifications): remove commented test
|
2016-08-12 10:17:21 +02:00 |
|
bergquist
|
16e75a3036
|
feat(alerting): add alert message to slack integration
|
2016-08-12 10:12:04 +02:00 |
|
bergquist
|
e7613b8bc0
|
fix(metrics): typo
|
2016-08-12 08:15:53 +02:00 |
|
bergquist
|
2fa97427eb
|
fix(metrics): add ending dot for graphite prefix
|
2016-08-12 08:06:54 +02:00 |
|
bergquist
|
937726499f
|
feat(alerting): add global usage metrics for alerting
closes #5786
|
2016-08-11 21:12:46 +02:00 |
|
bergquist
|
ae15de119f
|
Merge branch 'master' into alerting
|
2016-08-11 17:01:35 +02:00 |
|
bergquist
|
f07b2ac446
|
fix(metrics): hide none existing metrics settings
|
2016-08-11 17:00:09 +02:00 |
|
bergquist
|
cb6fd4ca78
|
test(alerting): fixes broken unit test
|
2016-08-11 16:55:08 +02:00 |
|
bergquist
|
99e99922b4
|
feat(alerting): add support for uploading images to webdav.
closes #5770
|
2016-08-11 16:48:54 +02:00 |
|
bergquist
|
95c1a4a936
|
feat(alerting): implement more simple reducers
|
2016-08-10 14:06:17 +02:00 |
|
bergquist
|
f2436fc7cd
|
test(alerting): add tests for simple reducer
|
2016-08-10 13:52:15 +02:00 |
|
Torkel Ödegaard
|
4fd8b2ace4
|
Merge branch 'master' into alerting
|
2016-08-10 12:53:41 +02:00 |
|
bergquist
|
03f0bc46a1
|
fix(metrics): make metrics cfg backwards compatible
|
2016-08-10 11:15:49 +02:00 |
|
bergquist
|
5b57210aeb
|
fix(metrics): replaces . with _ in instance name
closes #5739
|
2016-08-09 14:06:03 +02:00 |
|
bergquist
|
d6fdb598b0
|
fix(alerting): gofmt
|
2016-08-08 14:46:47 +02:00 |
|
Torkel Ödegaard
|
1edd224168
|
feat(alerting): fixing failing unit tests
|
2016-08-01 14:34:58 +02:00 |
|
Torkel Ödegaard
|
e6c4e47849
|
updated dependencies
|
2016-08-01 14:15:41 +02:00 |
|
Torkel Ödegaard
|
357358898d
|
feat(annotations): working on alert annotations, #5694
|
2016-08-01 10:07:00 +02:00 |
|
Torkel Ödegaard
|
3b69c8f687
|
feat(alerting): new design for alert tab with sidemenu
|
2016-07-31 09:31:32 +02:00 |
|
Torkel Ödegaard
|
2b276d5cd1
|
feat(alerting): working on alert notification and image rendering
|
2016-07-30 13:36:21 +02:00 |
|
Torkel Ödegaard
|
4fc50742a0
|
feat(alerting): working on image rendering with alert notifications
|
2016-07-29 14:55:02 +02:00 |
|
Torkel Ödegaard
|
f9a28d3306
|
feat(alerting): slack notification improvements, #5679
|
2016-07-29 13:41:42 +02:00 |
|