Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +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
e507bb6dd7
fix(iframe): fixed issue with using full height of iframe, fixes #5605
2016-07-18 15:41:06 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
81e9aa4de4
feat(datasource): cancel in flight data source requests, refeatoring #5321
2016-06-16 10:48:26 +02:00
Torkel Ödegaard
1500c0e954
feat(alerting): alert threshold handles progress
2016-06-11 22:33:02 +02:00
stuart nelson
048bcf19f6
Use panel+ref for unique id
...
Previously, if a user changed the query between
requests, the previous query would not be
canceled. This handles that edge-case.
2016-06-09 15:17:17 +02:00
stuart nelson
cc64d65c2f
Rename cacheKey to exprID/requestID
...
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
2016-06-09 12:57:55 +02:00
stuart nelson
bc7c2cd3f5
Create cacheKey at top-level
...
Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
implementation of `query`.
2016-06-09 11:36:46 +02:00
Torkel Ödegaard
c739428c30
feat(profiling): refactorign profiling code, #5286
2016-06-08 06:51:10 +02:00
Torkel Ödegaard
2a7d2ffccb
Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev
2016-06-08 05:47:30 +02:00
Torkel Ödegaard
67ad903556
feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299
2016-06-08 05:45:13 +02:00
Mitsuhiro Tanda
83c76981b2
fix profiling code
2016-06-06 17:42:11 +09:00
Torkel Ödegaard
90c9c70416
fix(): another fix for panel image rendering
2016-05-26 08:49:55 +02:00
Torkel Ödegaard
dd494e648a
fix(rendering): fixed issue with phantomjs panel rendering
2016-05-26 07:45:53 +02:00
Torkel Ödegaard
35c05463e7
Merge branch 'v3.0.x'
2016-05-20 12:23:50 +02:00
Torkel Ödegaard
f00cbc0aeb
fix(panel height): fixed issue with singlestat height, fixes #4679 , fixes #4894 , fixes #5113
2016-05-20 12:23:26 +02:00
bergquist
617d18e587
feat(panel): active tab is now placed in querystring aswell
2016-05-19 08:42:21 +02:00
bergquist
2b06ceda71
feat(panels): adds queryparameter for choose active tab in edit mode
2016-05-19 08:00:48 +02:00
Prajwal Rao
3feb6492e6
fixed datasources icon ( #5015 )
2016-05-12 21:49:58 +02:00
Torkel Ödegaard
70d03b7a1c
fix(query editor): Fixed issue with removing query for data sources without collapsable query editors, fixes #4856
2016-04-29 23:20:48 +02:00
Torkel Ödegaard
0c9a19e38c
Merge branch 'ds-template-var'
2016-04-28 19:31:56 +02:00
Torkel Ödegaard
c4440eab4c
fix(dashboard): fixed issue with render event after resize
2016-04-28 19:15:54 +02:00
Torkel Ödegaard
7349427189
feat(data source variable): progress on data source as variable
2016-04-28 19:08:35 +02:00
Torkel Ödegaard
5a241a8290
fix(): minor query editor fix
2016-04-28 10:29:36 +02:00
Torkel Ödegaard
0e4b70a4a8
feat(query_editors): more work
2016-04-28 10:13:18 +02:00
Torkel Ödegaard
f1d4fd3e67
feat(query editors): changed chevron position
2016-04-27 21:24:41 +02:00
Torkel Ödegaard
5e6485c210
feat(query editors): minor progress
2016-04-27 10:16:04 +02:00
Torkel Ödegaard
65b4945548
Merge branch 'master' into query-editor-style
2016-04-27 08:43:34 +02:00
Torkel Ödegaard
aa98ada141
fix(snapshots): fixed snapshot issue introdiuced yesterday
2016-04-26 14:51:06 +02:00
Torkel Ödegaard
bca0894f73
feat(query editors): progress on query editors
2016-04-26 09:58:55 +02:00
Torkel Ödegaard
bbf4d00319
fix(query editors): added select style to segment, used by data source selector
2016-04-25 15:49:33 +02:00
Torkel Ödegaard
6b813b4e2a
feat(query editors): remember collapsed state
2016-04-25 15:11:40 +02:00
Torkel Ödegaard
1a433de0b4
Merge branch 'master' into query-editor-style
2016-04-25 14:22:36 +02:00
Torkel Ödegaard
dfe36fb702
feat(panel): added new panel event panel-initialized
2016-04-22 11:41:56 +02:00
Torkel Ödegaard
39cdaf5175
ux(query-editors): more progress and fixes
2016-04-18 11:35:24 -04:00
Torkel Ödegaard
1069f485da
ux(query_editors): handle text overflow in collapsed mode
2016-04-17 22:24:40 -04:00
Torkel Ödegaard
4c4835e869
ux(query-editors): more progress on elastic query editor
2016-04-17 22:04:43 -04:00
Torkel Ödegaard
805fd18b7b
feat(query editors): more work on query editors make over
2016-04-17 16:43:13 -04:00
Torkel Ödegaard
33f7b8479e
ux(query editors): progress on new query editor styles
2016-04-17 12:14:25 -04:00
Torkel Ödegaard
68bd82f1b6
Merge branch 'master' into query-editor-style
2016-04-16 13:46:05 -04:00
Torkel Ödegaard
13471ae2c4
feat(templating): templated ds progress
2016-04-16 13:43:16 -04:00
Torkel Ödegaard
6355896584
fix(snapshots): Fixed issue with empty snapshots, fixes #4706
2016-04-14 11:06:48 -04:00
Torkel Ödegaard
31441f0b43
feat(dashlist): updated dashlist
2016-04-11 16:21:25 -04:00
Torkel Ödegaard
e8a209c9b5
fix(): removed obsolete call to setTimeQueryStart
2016-04-09 15:00:47 -04:00
Torkel Ödegaard
781fed1079
fix(mixed data source): fixed issue with mixed data sources in same graph, fixes #4604
2016-04-09 14:44:50 -04:00
Torkel Ödegaard
b8baeac860
Merge branch 'master' of github.com:grafana/grafana
2016-04-07 11:00:56 -04:00
Torkel Ödegaard
a425ce0826
fix(graph panel): Fixed legend option max not updating, fixes #4601
2016-04-07 10:57:55 -04:00
bergquist
513aa61d17
fix(singlestat): start timer for refreshs
2016-04-07 12:01:43 +02:00
Torkel Ödegaard
6bb001e416
Merge branch 'master' into query-editor-style
2016-04-04 13:55:55 -04:00
