Torkel Ödegaard
cde1bbff78
Merge branch 'alert_conditions' into alerting
2016-07-27 09:52:42 +02:00
Torkel Ödegaard
c675ffc682
Merge branch 'master' into alerting
2016-07-27 09:45:16 +02:00
Torkel Ödegaard
e4592c8d53
Merge branch 'v3.1.x'
2016-07-27 09:36:46 +02:00
Torkel Ödegaard
971e2d62f1
fix(zoom): fixed zoom in and out issues when graph is embedded, fixes #5666 , fixes #4489
2016-07-27 09:36:35 +02:00
Torkel Ödegaard
5155c8a753
feat(templating): set default min span to 4, fixes #5662
2016-07-26 17:20:27 +02:00
Torkel Ödegaard
0b0f6b0848
feat(alerting): made very basic threshold viz work again
2016-07-26 14:35:42 +02:00
Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
Torkel Ödegaard
6cb1dafb1d
feat(alerting): progress on notifications
2016-07-25 16:26:28 +02:00
Torkel Ödegaard
8df558dece
feat(notifications): refactoring notification handling
2016-07-25 13:52:17 +02:00
Torkel Ödegaard
9f14b209bd
fix(html): moved body tag, fixes #5648
2016-07-25 12:21:51 +02:00
Torkel Ödegaard
ee0d6ecfe6
Merge branch 'master' of github.com:grafana/grafana
2016-07-25 12:04:58 +02:00
Torkel Ödegaard
9fd7676846
Merge branch 'v3.1.x'
2016-07-25 12:03:40 +02:00
Torkel Ödegaard
0de0f4d014
feat(templating): fixed issue with template variables set to reload on dashboard load being issued multiple times, fixes #5637
2016-07-25 12:02:59 +02:00
bmundt
f6b1d5a84a
Added '!=' option for where clause in the influx query builder ( #5646 )
2016-07-25 10:36:38 +02:00
Torkel Ödegaard
9f777a535b
fix(): removed dashboard version to schema version migration
2016-07-23 13:29:48 +02:00
Torkel Ödegaard
7a2e8324b9
Merge branch 'v3.1.x'
2016-07-23 12:54:23 +02:00
Torkel Ödegaard
ddf579f204
fix(mixed data sources): fix when using two graphite data sources in mixed mode, fixes #5617
2016-07-23 12:54:11 +02:00
Torkel Ödegaard
4a33e2023f
Merge branch 'v3.1.x'
2016-07-23 12:01:27 +02:00
Torkel Ödegaard
3abbf08a17
tech(): upgrade jquery to 2.2.4, closes #5627
2016-07-23 12:00:45 +02:00
Torkel Ödegaard
474a821767
fix(elasticsearch): fix json escape logic when doing terms template value lookup, fixes #5485
2016-07-23 11:52:49 +02:00
Torkel Ödegaard
a6c6094775
feat(alerting): started reworking notifications
2016-07-22 16:45:17 +02:00
Torkel Ödegaard
7eb2d2cf47
feat(alerting): working on state management
2016-07-22 13:14:09 +02:00
Torkel Ödegaard
783d697529
feat(alerting): more output when testing alert
2016-07-21 21:54:12 +02:00
Torkel Ödegaard
b073fe0eba
feat(alerting): more work on handling result and saving state
2016-07-21 17:31:46 +02:00
Torkel Ödegaard
f0fc336e88
feat(alerting): worked on alert condition eval tests
2016-07-21 16:19:28 +02:00
Torkel Ödegaard
3ad38eefd2
feat(alerting): test results look better
2016-07-21 13:57:19 +02:00
Torkel Ödegaard
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
9e91aacd34
feat(alerting): progress on testing alerts
2016-07-21 10:29:11 +02:00
Torkel Ödegaard
20fcffb71e
feat(alerting): working on alerting conditions model
2016-07-19 16:15:26 +02:00
Torkel Ödegaard
f38c954639
feat(alerting): more work on alert conditions
2016-07-19 11:54:41 +02:00
Torkel Ödegaard
29d308e447
feat(alerting): refactoring alert model to use conditions concept
2016-07-19 11:24:27 +02:00
Torkel Ödegaard
b0fe69822a
Merge branch 'master' into alerting
...
Conflicts:
public/app/core/services/alert_srv.ts
public/app/partials/confirm_modal.html
2016-07-18 18:22:35 +02:00
Torkel Ödegaard
3f861dd039
Merge branch 'v3.1.x'
2016-07-18 16:27:27 +02:00
Torkel Ödegaard
3ae327320a
fix(prometheus): fixed svg link in prometheus dashboard, fixes #5604
2016-07-18 16:27:02 +02:00
Torkel Ödegaard
78d0badffe
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
2016-07-18 16:22:31 +02:00
Torkel Ödegaard
575b015fe0
fix(panel rendering): Fixed png panel rendering timing issue, #5606
2016-07-18 16:18:00 +02:00
Torkel Ödegaard
b9a2546a10
fix(iframe): fixed issue with using full height of iframe, fixes #5605
2016-07-18 16:17:46 +02:00
Torkel Ödegaard
7ad0904fdb
:Merge branch 'master' of github.com:grafana/grafana
2016-07-18 16:16:44 +02:00
Torkel Ödegaard
ffd865c7ca
fix(panel rendering): Fixed png panel rendering timing issue, #5606
2016-07-18 16:13:50 +02:00
Torkel Ödegaard
e507bb6dd7
fix(iframe): fixed issue with using full height of iframe, fixes #5605
2016-07-18 15:41:06 +02:00
Torkel Ödegaard
6c6dae1c92
Merge branch 'elasticsearch_precision_threshold' of https://github.com/lucasrodcosta/grafana into lucasrodcosta-elasticsearch_precision_threshold
2016-07-18 13:56:34 +02:00
Torkel Ödegaard
c82d5f86ac
fix(singlestat): fixed minor editor blur issue on decimal option that did not cause update of rendered value, fixes #5004
2016-07-18 11:24:41 +02:00
Loren West
51940fa209
Tooltip detatch too soon on mobile click ( #5598 )
...
* Tooltip detatch too soon on mobile click
* Fixed syntax error
2016-07-18 09:04:06 +02:00
Torkel Ödegaard
f13b869aa4
feat(alerting): work on alerting
2016-07-14 13:32:16 +02:00
Jack Meagher
2c77f2231e
Do not substitute #[A-Z] in graphite target when invalid ref ( #5581 )
...
* Do not substitute #[A-Z] in graphite target when invalid ref
In the case where #[A-Z] does not reference another query, such as #J when there
are only 2 queries, do not perform the substitution. This prevents the situation
target name without a query labelled J (10th query).
* Do not substitute #[A-Z] in graphite target when invalid ref
In the case where #[A-Z] does not reference another query, such as #J when there
are only 2 queries, do not perform the substitution. This prevents the situation
target name without a query labelled J (10th query).
2016-07-14 10:29:22 +02:00
Torkel Ödegaard
82eebf64b6
fix(graph): Fix so that zoom works even when no data exists, fixes #5570
2016-07-13 10:02:53 +02:00
Torkel Ödegaard
cc5c45112a
Merge branch 'master' of github.com:grafana/grafana
2016-07-12 15:55:10 +02:00
Torkel Ödegaard
4bb4d7f7d3
Merge branch 'v3.1.x'
2016-07-12 15:54:31 +02:00
Torkel Ödegaard
b2acac3a41
feat(apps): more polish on app dashboard save warning, #5529
2016-07-12 08:41:56 +02:00
Torkel Ödegaard
f3db2fa262
feat(plugins): hide link on small screens
2016-07-11 19:16:35 +02:00
