public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ryan 6e4b199bc2 tabs to spaces 
testing commit permisions :)
 2018-07-08 11:07:01 +02:00
Sven Klemm 09c06ced14 formatting 2018-07-07 21:22:12 +02:00
Sven Klemm 5b5dcabd22 add None to metric column suggestions 2018-07-07 21:21:11 +02:00
Sven Klemm 3f4c808cc5 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-07 20:54:33 +02:00
Sven Klemm 8490ae41b6 handle pre query gui queries gracefully 2018-07-07 20:41:24 +02:00
Sven Klemm eb170e741b dont break on panels that dont have rawQuery set 2018-07-07 19:59:25 +02:00
Sven Klemm b2b4860bdb refactor transformToSegments 2018-07-07 19:43:21 +02:00
Torkel Ödegaard b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard 645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Marcus Efraimsson 922371ba76 changelog: add notes about closing #12379 
[skip ci]
 2018-07-06 17:48:39 +02:00
Marcus Efraimsson 319488676f Merge pull request #12521 from grafana/davkal/fix-datasource-sort 
Fix datasource sorting with template variables
 2018-07-06 16:18:02 +02:00
David Kaltschmidt 7ddcaf22d5 Fix datasource sorting with template variables 
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
 2018-07-06 15:32:08 +02:00
Torkel Ödegaard dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Marcus Efraimsson f2980bb978 changelog: add notes about closing #12484 
[skip ci]
 2018-07-06 12:55:12 +02:00
Marcus Efraimsson cbdf6ef355 changelog: add notes about closing #12506 
[skip ci]
 2018-07-06 12:53:10 +02:00
Marcus Efraimsson 1db067f2ad Merge pull request #12511 from alexanderzobnin/fix-12484 
Prometheus heatmap: fix unhandled error when some points are missing
 2018-07-06 12:50:04 +02:00
Sven Klemm e4b4b3a772 rename quoteLiteral to quoteIdentAsLiteral 2018-07-06 12:38:43 +02:00
Marcus Efraimsson af434df5a3 changelog: add notes about closing #12506 
[skip ci]
 2018-07-06 12:35:19 +02:00
Marcus Efraimsson 926892749f Merge pull request #12518 from grafana/12506_dash_links 
Fix links not updating after changing variables
 2018-07-06 12:33:19 +02:00
Marcus Efraimsson 5e4d6958d6 fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Sven Klemm a63298bca2 remove unused function removeSelect 2018-07-06 11:25:20 +02:00
Sven Klemm d9db3d1402 put updateParam back in 2018-07-06 11:24:49 +02:00
Sven Klemm 6143924ec6 fix where clause generation 2018-07-06 10:56:47 +02:00
Sven Klemm 7600c6efcb remove hardcoded $__timeFilter, make macros functional in where clause 2018-07-06 10:38:52 +02:00
Sven Klemm 8ed210c8d5 remove dead code, make label more flexible 2018-07-06 10:38:18 +02:00
Sven Klemm 85ab1cfa8f fix constraint removal 2018-07-06 09:28:34 +02:00
Torkel Ödegaard c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Sven Klemm d8c7756489 dont autoquote, suggest quoted values if requried 2018-07-05 21:36:39 +02:00
Torkel Ödegaard 447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard 09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07:00
Alexander Zobnin 36f08994cc prometheus heatmap: fix unhandled error when some points are missing 2018-07-05 16:33:52 +03:00
Marcus Efraimsson 50a522d418 fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Sven Klemm 3f614e635b do not autoquote identifiers 2018-07-05 11:27:19 +02:00
Sven Klemm c604651092 fix group by ui 2018-07-05 10:19:22 +02:00
Marcus Efraimsson 240cf63ba6 changelog: add notes about closing #11618 #11619 2018-07-04 20:07:43 +02:00
Marcus Efraimsson d90d4ce55d Merge pull request #12402 from AustinWinstanley/macros/sql 
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros

The $__timeFilter macro now uses a BETWEEN with timestamps instead of 
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format 
YYYY-MM-DDThh:mm:ssZ instead of epoch
 2018-07-04 20:01:43 +02:00
Sven Klemm aacf555985 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 18:59:23 +02:00
Sven Klemm 3595436614 fix where constraint handling 2018-07-04 18:57:55 +02:00
Sven Klemm 7d30ca04de remove dead code from sql_part 
fix where clause query generation
 2018-07-04 15:37:06 +02:00
Sven Klemm 3b632510fb code formatting 2018-07-04 15:20:52 +02:00
Tobias Skarhed 74bf80962d Add mock to test files 2018-07-04 14:32:22 +02:00
Tobias Skarhed 962340bcd1 Create new instance in beforeEach 2018-07-04 14:32:22 +02:00
Tobias Skarhed a37a0c7be3 Remove comments 2018-07-04 14:32:22 +02:00
Tobias Skarhed 42ba0dc73f Karma to Jest: Cloudwatch datasource 2018-07-04 14:32:22 +02:00
Tobias Skarhed d4bd52139a Karma to Jest: MySQL datasource 2018-07-04 14:30:36 +02:00
Tobias Skarhed 3bbe39c5ad Karma to Jest: postgres datasource 2018-07-04 14:30:36 +02:00
Marcus Efraimsson ea9964cfa1 Merge pull request #12493 from dehrax/12224-datasource-elastic 
Karma to Jest: elasticsearch datasource
 2018-07-04 14:03:25 +02:00
Marcus Efraimsson e8ee1be5e4 Merge pull request #12502 from Nexucis/feature/api-doc-improve 
Fix HTTP-API admin doc
 2018-07-04 13:52:13 +02:00
Tobias Skarhed d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00