 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
|
0392fde34e
|
feat(alerting): doing schema changes
|
2016-08-15 15:12:43 +02:00 |
|
 bergquist
|
3195209878
|
tech(circle): rearrange build order
|
2016-08-15 14:01:20 +02:00 |
|
|
Torkel Ödegaard
|
befca9bb2f
|
feat(query parts): refactoring query part component to support actions
|
2016-08-15 13:51:55 +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 |
|
|
Torkel Ödegaard
|
2c1b893c55
|
feat(metrics): minor fix for internal metrics fix PR #5758
|
2016-08-15 09:57:23 +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 |
|
 Torkel Ödegaard
|
cd9bd5be17
|
Update CHANGELOG.md
|
2016-08-15 09:15:20 +02:00 |
|
|
bergquist
|
7ce13ef075
|
docs(changelog): add note about fixing #5806
|
2016-08-15 09:13:49 +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 |
|
|
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 |
|
|
Torkel Ödegaard
|
1eca0d7c53
|
docs(): updated docs
|
2016-08-14 13:58:04 +02:00 |
|
|
Torkel Ödegaard
|
76e4b7ce3b
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-08-14 13:51:09 +02:00 |
|
|
Julian Einwag
|
deb245f526
|
fix repeat panels (#5796)
|
2016-08-14 13:50:49 +02:00 |
|
 Mitsuhiro Tanda
|
7a1011ac39
|
(cloudwatch) support ApplicationELB (#5802)
|
2016-08-14 13:21:17 +02:00 |
|
|
Torkel Ödegaard
|
8499d32d0f
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-08-14 13:18:55 +02:00 |
|
|
Torkel Ödegaard
|
d894c13718
|
fix(graph): fixed issue with tooltip introduced in recent commit
|
2016-08-14 13:18:23 +02:00 |
|
|
Torkel Ödegaard
|
46ea3ed971
|
fix(godep): fixed godep dependency
|
2016-08-13 13:07:55 +02:00 |
|
|
bergquist
|
fb7a6c0764
|
feat(alerting): list all series in alert email
|
2016-08-13 12:50:51 +02:00 |
|
|
Carl Bergquist
|
a530df8449
|
Merge pull request #5809 from kou/patch-1
Update the number of ways
|
2016-08-13 12:18:01 +02:00 |
|
|
bergquist
|
c4e905474a
|
feat(alerting): improve email notifications layout
|
2016-08-13 11:24:03 +02:00 |
|
 Kouhei Sutou
|
46630df88d
|
Update the number of ways
|
2016-08-13 14:12:29 +09:00 |
|
|
Torkel Ödegaard
|
74dbd7fb36
|
feat(alerting): disable visual thresholds while alert is enabled
|
2016-08-12 13:19:06 +02:00 |
|
|
Torkel Ödegaard
|
7242dc2ebe
|
feat(thresholds): hide threshold handles when second y axis is shown
|
2016-08-12 10:50:31 +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
|
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 |
|
 Leandro Piccilli
|
f844cd844b
|
Fix for annotations query on ES 5.x
|
2016-08-11 22:24:58 +02:00 |
|
|
Torkel Ödegaard
|
895cff78b6
|
feat(thresholds): more work on thresholds, within and outside types no work
|
2016-08-11 22:22:15 +02:00 |
|
|
Torkel Ödegaard
|
7a5dda9e7c
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-11 21:33:29 +02:00 |
|
|
Torkel Ödegaard
|
6793eed6c5
|
feat(thresholds): dragging thresholds works again
|
2016-08-11 21:32:59 +02:00 |
|
|
Torkel Ödegaard
|
224ceb0ae5
|
feat(thresholds): updated design for grab handles
|
2016-08-11 21:22:40 +02:00 |
|
|
bergquist
|
937726499f
|
feat(alerting): add global usage metrics for alerting
closes #5786
|
2016-08-11 21:12:46 +02:00 |
|
|
Torkel Ödegaard
|
89ca15f3a1
|
feat(thresholds): lots of progress on thresholds
|
2016-08-11 18:25:41 +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 |
|