public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tobias Skarhed 12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed 8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed 80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed 69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed 12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Marcus Efraimsson a8970a4de9 run enterprise build only on master for now 2018-07-04 13:09:42 +02:00
Augustin Husson 86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson 991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson 01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
Sven Klemm fee36b2b35 include where constraints in query generation 2018-07-04 12:22:45 +02:00
Marcus Efraimsson d2f31a716f remove unnecessary conversions 2018-07-04 12:16:39 +02:00
Sven Klemm ced0a5828f rearrange elements of query builder 2018-07-04 11:56:26 +02:00
Sven Klemm 9847c2186f mv query_part to sql_part 2018-07-04 11:39:58 +02:00
Sven Klemm 19dcc1f41a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 10:12:27 +02:00
Marcus Efraimsson 723a894fc5 changelog: update 
[skip ci]
 2018-07-03 19:59:34 +02:00
Marcus Efraimsson 634c77469d changelog: add notes about closing #11818 
[skip ci]
 2018-07-03 19:58:19 +02:00
Marcus Efraimsson faf2ab4249 changelog: add notes about closing #12460 
[skip ci]
 2018-07-03 19:54:09 +02:00
Marcus Efraimsson 512e7f8567 changelog: add notes about closing #8186 
[skip ci]
 2018-07-03 19:50:21 +02:00