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
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
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
da6ac07b1d
Merge branch 'v3.1.x'
2016-08-11 10:29:48 +02:00
Torkel Ödegaard
0d26bc63ae
fix(graphite): minor fix/improvement to graphite error handling when doing metric exploration in query editor, fixes #5778
2016-08-11 10:29:28 +02:00
Torkel Ödegaard
780ec92dd8
fix(docs): fixed plugins docs, fixes #5777
2016-08-11 07:39:34 +02:00
Jeremy Bingham
7150571e60
Mac grafana wrapper script ( #5779 )
...
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.
* add instructions for installing grafana HEAD from git with homebrew back to the docs
2016-08-11 07:37:35 +02:00
Jeremy Bingham
2c4ab4af02
Mac grafana wrapper script ( #5779 )
...
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.
* add instructions for installing grafana HEAD from git with homebrew back to the docs
2016-08-11 07:36:14 +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
Torkel Ödegaard
7c0675798e
feat(thresholds): new thresholds options are looking ok
2016-08-10 17:32:34 +02:00
Torkel Ödegaard
0f8c8517e3
feat(thresholds): adding a new form of thresholds options
2016-08-10 15:27:33 +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
