Commit Graph

2212 Commits

Author SHA1 Message Date
Torkel Ödegaard
22643eb109 cloudwatch: fixed optimized build issue, fixes #10174 2017-12-18 14:36:34 +01:00
Mitsuhiro Tanda
3cb841f3db fix text panel rows limit (#10246) 2017-12-18 14:29:48 +01:00
bergquist
ea4ef47982
prometheus: change default resolution to 1/1
this should make the value of the step value more
consistant for most users

ref #9705
2017-12-15 14:24:31 +01:00
Torkel Ödegaard
c395237710 Merge branch Grafana v5 'develop' branch 2017-12-15 12:06:09 +01:00
Carl Bergquist
f5d26bfcc9
Merge pull request #10050 from davkal/davkal/multi-query-table
Add support to render values of multiple queries in the same table
2017-12-14 15:57:07 +01:00
Torkel Ödegaard
a7645b710d Merge remote-tracking branch 'origin/master' into develop 2017-12-13 19:18:10 +01:00
Torkel Ödegaard
6254304667 Merge remote-tracking branch 'origin/select-wrapper' into develop 2017-12-13 18:12:35 +01:00
Torkel Ödegaard
7f0440fded minor tweaks 2017-12-13 18:00:16 +01:00
Patrick O'Carroll
3b783216fa added select-wrapper to where it was missing for unified look 2017-12-13 15:05:43 +01:00
Patrick O'Carroll
daf32c579d changed width to input fields (#10184) 2017-12-13 12:42:50 +01:00
Torkel Ödegaard
05cc1f85c3 Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team 2017-12-12 17:07:00 +01:00
Alexander Zobnin
10fbfcb1d3 Fix graph legend scroll (#10169)
* graph panel: fix legend scroll

* graph panel: enable scroll for table legend

* graph panel: fix legend right side toggle
2017-12-12 17:02:19 +01:00
Torkel Ödegaard
a02086814e graphite: remove check so that query is sent even for possible non leaf nodes 2017-12-12 17:00:00 +01:00
Torkel Ödegaard
de91d68402 fix: don't detect graphite version before it's saved 2017-12-12 15:28:41 +01:00
Torkel Ödegaard
8a61e0967e Merge branch 'master' into develop 2017-12-12 13:22:13 +01:00
Torkel Ödegaard
a00af85f36 build: fixed unit test failure 2017-12-12 13:21:50 +01:00
Torkel Ödegaard
cafed8ce8f Merge branch 'master' into develop 2017-12-12 13:19:07 +01:00
David Kaltschmidt
edb2dcf1b0 Extracted row matching function and added comments 2017-12-12 13:18:06 +01:00
Torkel Ödegaard
871b98c06b graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path 2017-12-12 12:56:40 +01:00
Torkel Ödegaard
bb52f3670e Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget 2017-12-12 12:38:58 +01:00
David Kaltschmidt
8d70f13393 Type-agnostic row merge in table transform for multiple queries
* moved unique value naming to datasource (credit: @bergquist)
* merge rows based on same column-values and empty values
* expanded tests
2017-12-11 12:42:53 +01:00
Mikael Olenfalk
8e7166b5c4 Explicitly specify default region in CloudWatch datasource (#9440)
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.

This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
Dan Cech
588ce6606c fix function re-ordering broken in #9436 2017-12-10 21:20:38 -05:00
Dan Cech
525ae4fdf5 support metric trees of varying depth, never send '.select metric' to graphite 2017-12-10 10:48:12 -05:00
Dan Cech
8dcfa18761 simplify function parameter addition 2017-12-10 10:45:41 -05:00
Dan Cech
3a1700cbee improve handling of query references 2017-12-09 16:27:05 -05:00
Torkel Ödegaard
1e5983b46c Merge branch 'develop' into develop-settings 2017-12-09 21:50:26 +01:00
Dan Cech
4fcf79a3a6 demonstrate parseTarget issue 2017-12-09 11:17:34 -05:00
Marcus Efraimsson
1985027549 dashfolders: Folder picker should set correct default values. Fixes #10135 2017-12-08 17:46:52 +01:00
Alexander Zobnin
d8612380e9 refactor: rename User Groups to Teams 2017-12-08 18:25:45 +03:00
Sven Klemm
ce809de1ed postgres: change $__timeGroup macro to include "AS time" column alias (#10119)
* change $__timeGroup macro to include column alias

* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
Torkel Ödegaard
9369a87e93 Merge branch 'develop' into develop-settings 2017-12-08 14:32:15 +01:00
Torkel Ödegaard
e03abde778 refactoring: #10130 2017-12-08 12:17:09 +01:00
Torkel Ödegaard
4aad4a069c ux: graph legend refactoring 2017-12-08 10:54:53 +01:00
Torkel Ödegaard
8415ea6c71 refactoring: changing how graph height and legend height is calculated, using flex box seems to actually work, #10079 2017-12-07 19:53:32 +01:00
Torkel Ödegaard
c629a58b6d refactor: removed graph height from legend decimal calc 2017-12-07 18:13:56 +01:00
Torkel Ödegaard
a7897b945b Merge branch 'graph-legend-v5' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-graph-legend-v5 2017-12-07 17:09:46 +01:00
Torkel Ödegaard
beb9f8ee74 Merge remote-tracking branch 'origin/master' into develop 2017-12-07 14:14:50 +01:00
Sven Klemm
a62ebb3e59 mysql: pass timerange for template variable queries (#10071)
* mysql: pass timerange for template variable queries

* mysql: document time range macro usage in template variables

* mysql: docs for on time range change refresh mode for template queries

* Revert "mysql: docs for on time range change refresh mode for template queries"

This reverts commit 5325972aa4.
2017-12-07 11:18:36 +01:00
Alexander Zobnin
58d40eb6a0 graph: fix legend height calculation 2017-12-07 12:39:10 +03:00
Sven Klemm
b44c599410 postgres: pass timerange for template variable queries (#10069)
* pass timerange for template queries when refresh is set to timerange
change

* document on time range change refresh mode for template queries
2017-12-07 10:05:04 +01:00
Alexander Zobnin
3cdf0dce56 graph: move auto decimals calc to ticks.ts and use it for legend values format. 2017-12-07 10:49:00 +03:00
Alexander Zobnin
2cf1c29eae graph: refactor (don't render twice) 2017-12-06 21:30:14 +03:00
bergquist
48d9d0d356 prom: enable min interval per panel
This commit makes it possible to set min interval per panel.
Overrides the value configured on the datasource.

ref #9705
2017-12-06 13:51:19 +01:00
David Kaltschmidt
011b2cd1b2 Fix merge issue on multi-query table transforms
* after a match has been found the merger should keep looking for more
2017-12-06 13:12:16 +01:00
Alexander Zobnin
6b4b7969fe graph: fix karma tests 2017-12-06 14:55:57 +03:00
Alexander Zobnin
0c3e04ca60 graph: render legend before graph 2017-12-06 14:14:00 +03:00
Patrick O'Carroll
3aa1cb012a added tooltip, fixes #10092 (#10097)
* added tooltip, fixes #10092

* fixed code formatting
2017-12-06 12:13:17 +01:00
Alexander Zobnin
ae80a589c1 graph: refactor 2017-12-06 12:22:35 +03:00
Alexander Zobnin
36b3309961 graph: convert legend.js to typescript 2017-12-06 11:29:13 +03:00