public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,167 Commits 655 Branches 650 Tags
902eba90d0d6ea20a2d01aa80c8f327094d2f786
Commit Graph
15167 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -07:00
Mitsuhiro Tanda 9b50c9038b skip backend request if extended statistics is invalid. (#12495) 
* check extended statistics pattern

* check extended statistics pattern

* Revert "check extended statistics pattern"

This reverts commit 52c7b1a972636d5f5729e64ae5e00e6fae329257.

* add test

* fix test
 2018-07-11 11:23:38 -07:00
Torkel Ödegaard c03764ff8a Refactor team pages to react & design change (#12574) 
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
 2018-07-11 11:23:07 -07:00
Mitsuhiro Tanda 18a8290c65 (prometheus) prevent error to use $__interval_ms in query (#12533) 
* prevent error to use $__interval_ms in query

* add test

* prevent error to use $__interval_ms in query
 2018-07-11 11:13:47 -07:00
Torkel Ödegaard b4e0ace7a2 fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Łukasz Gryglicki 24f395f986 Add support for skipping variable value in URL, fixes #12174 (#12541) 
* New rebase

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>

* Lint

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>
 2018-07-11 10:06:36 -07:00
Torkel Ödegaard 2c22a7b4ba Don't build-all for PRs 2018-07-11 13:31:34 +02:00
Rollulus Rouloul 2fbf2bba4e fix: requests/sec instead of requets (#12557) 2018-07-11 03:33:19 -07:00
Tobias Skarhed cfa555b569 Add folder name to dashboard title (#12545) 
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
 2018-07-11 03:31:07 -07:00
David 4d2dd22095 Fix css loading in plugins (#12573) 
- allow css loader to be imported again (wasnt prefixed by plugin)
 2018-07-11 03:29:19 -07:00
Dominic Smith 5578097210 Add new sequential color scales 
* Add new sequential color scales

* Simplify inversion logic
 2018-07-10 12:17:55 +03:00
David 9595f992b9 Merge pull request #12496 from dehrax/12224-prostgres-ds 
Karma to Jest: 3 data sources
 2018-07-10 11:13:44 +02:00
yogy rahmawan 8b32dc5847 move go vet out of scripts and fixing warning (#12552) 2018-07-09 23:25:32 -07:00
Torkel Ödegaard dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard 761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Tobias Skarhed e51f208a49 Cleanup and remove some jest.fn() 2018-07-09 15:42:34 +02:00
Torkel Ödegaard e052e165e9 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:31 +02:00
Torkel Ödegaard 4fd2107071 Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:16 +02:00
Tobias Skarhed 6670acd082 Remove irrelevant tests and templateSrv stub 2018-07-09 12:52:56 +02:00
David 25bcdbcab1 Merge pull request #12284 from grafana/davkal/queryfield-refactor 
Query field refactorings to support external plugins
 2018-07-09 11:29:59 +02:00
Torkel Ödegaard 5a925461f1 Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Jesse Tane 677117fb03 fix diff and percent_diff (#12515) 
* make diff and percent_diff tests more realistic

* fix diff and percent_diff

* include @marefr's additional tests
 2018-07-08 21:58:34 -07:00
Ryan McKinley f53e166114 Update lodash/moment version (#12532) 
* tabs to spaces

testing commit permisions :)

* revert

* Update lodash and moment
 2018-07-08 13:06:08 -07:00
Torkel Ödegaard 51f8d3ca42 fix: minor css change 2018-07-08 13:03:22 -07:00
Torkel Ödegaard 8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
Ryan McKinley dca22fd151 Tabs to spaces in tslint (#12529) 
* tabs to spaces

testing commit permisions :)

* revert

* tabs to spaces
 2018-07-08 07:48:05 -07:00
Torkel Ödegaard 50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07: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
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
Torkel Ödegaard c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07: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
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
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