IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,719 Commits 5,454 Branches 554 Tags 1.9 GiB
e21a140fcc
Commit Graph

1709 Commits

Author SHA1 Message Date
David Kaltschmidt
68dfc5699b Moved explore helpers to utils/explore 2018-10-01 12:56:26 +02:00
David Kaltschmidt
54c9beb146 Explore: jump to explore from panels with mixed datasources 
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
  explore and collects its targets
- passes those targets to the found datasource to be serialized for
  explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
 2018-10-01 12:03:57 +02:00
David
7b543ca4b5
Merge pull request #13463 from grafana/davkal/explore-url-state 
Explore: Store UI state in URL
 2018-10-01 10:09:15 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL 
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
 2018-09-28 16:44:07 +02:00
Peter Holmberg
21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Torkel Ödegaard
5eede26a24
Merge pull request #13438 from grafana/plugin-list-to-react 
Plugin list to react
 2018-09-27 15:50:55 +02:00
Peter Holmberg
1e2c06083a rewrote to use react.sfc 2018-09-27 12:15:41 +02:00
Johannes Schill
97d718f87a Pick up the type from app/types 2018-09-27 11:53:18 +02:00
Johannes Schill
e8ba35ab2d Move User type out of UserPicker and into app/types 2018-09-27 11:53:18 +02:00
Chris Hicks
499b71c8ff Remove .dropdown-menu-open on body click fixes #13409 2018-09-25 16:12:11 +01:00
Peter Holmberg
0b7576a1f9 filter plugins and layout mode 2018-09-25 16:21:52 +02:00
Torkel Ödegaard
3fd3dbba8a
Merge pull request #13388 from jsferrei/fix-metric-segment-typeahead 
Fix metric-segment options displaying after blur
 2018-09-22 09:42:53 +02:00
Jon Ferreira
5fd24e2435 Fix https://github.com/grafana/grafana/issues/13387 metric segment 
options displays after blur
 2018-09-21 17:25:37 -04:00
Torkel Ödegaard
4022374181
Merge pull request #12128 from grafana/11056-folder-m 
added span with folder title that is shown for recently and starred
 2018-09-21 16:49:43 +02:00
Torkel Ödegaard
be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +02:00
Torkel Ödegaard
dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard
693f2fd8e9
Merge pull request #13273 from grafana/permissions-to-redux 
Permissions to redux
 2018-09-15 15:02:13 +02:00
Torkel Ödegaard
66ae7ddc02 fix: increased team picker limit to 50, closes #13294 2018-09-15 04:59:45 -07:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Torkel Ödegaard
331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard
7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
Torkel Ödegaard
d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard
f2edb82e79
Folder pages to redux (#13235) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
 2018-09-13 14:10:51 +02:00
Torkel Ödegaard
d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard
c7bb44b34a
fix: url update loop fix (#13243) 2018-09-12 13:13:47 +02:00
Torkel Ödegaard
0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
Torkel Ödegaard
7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +02:00
Torkel Ödegaard
19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +02:00
Peter Holmberg
0768a078ed Upgrade react and enzyme (#13224) 
* upgrade to latest react and fixed failing test

* upgrading libs

* grunt exec update due to change filename

* new yarn lock

* updated snaps
 2018-09-11 16:31:34 +02:00
Patrick O'Carroll
953bdc4dc0 put folder name under dashboard name, tweaked aliginments in search results 2018-09-11 14:53:38 +02:00
Peter Holmberg
9f73f13091 Teams page replace mobx (#13219) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
 2018-09-11 14:14:03 +02:00
Torkel Ödegaard
1ce9001141
upgrade of typescript and tslint and jest (#13223) 2018-09-11 13:48:13 +02:00
Patrick O'Carroll
1599806b75 Merge remote-tracking branch 'origin' into 11056-folder-m 2018-09-11 09:50:15 +02:00
Torkel Ödegaard
c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Torkel Ödegaard
100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Torkel Ödegaard
a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Alexander Zobnin
e4a488baf1
graph legend: use refactored version of scrollbar, #13175 2018-09-07 16:12:28 +03:00
Alexander Zobnin
29899003ff
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-09-07 16:07:42 +03:00
Torkel Ödegaard
4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Torkel Ödegaard
35ef51dca9 refactoring: custom scrollbars PR updated, #13175 2018-09-07 14:24:33 +02:00
Alexander Zobnin
349b2787cb
scrollbar: use enzyme for tests instead of react-test-renderer 2018-09-07 14:31:56 +03:00
Alexander Zobnin
8fca79e87e
scrollbar refactor: replace HOC by component with children 2018-09-06 22:53:40 +03:00
Alexander Zobnin
e67b8a3e1a
scrollbar refactor: replace HOC by component with children 2018-09-06 22:52:14 +03:00
Alexander Zobnin
a186bc01e0
tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03:00
Alexander Zobnin
28cc605e32
tests for withScrollBar() wrapper 2018-09-06 15:36:22 +03:00
Alexander Zobnin
cf832e7db4
wrapper for react-custom-scrollbars component 2018-09-06 15:09:18 +03:00
Alexander Zobnin
b2ba9c5166
wrapper for react-custom-scrollbars component 2018-09-06 15:03:24 +03:00
Carl Bergquist
3c0b1ef581
Merge pull request #13170 from bergquist/alerting_default_setting 
make default values for alerting configurable
 2018-09-06 13:26:42 +02:00
bergquist
3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Patrick O'Carroll
2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Patrick O'Carroll
25f13bd3ad added only-arrow-functions rule and changed files to follow new rule (#13154) 2018-09-05 15:28:30 +02:00
Torkel Ödegaard
0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +02:00
Torkel Ödegaard
c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard
dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Torkel Ödegaard
00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Torkel Ödegaard
432e203df1 Merge branch '12918-only-arrow-functions3' 2018-09-05 11:26:30 +02:00
Patrick O'Carroll
777010b20b added no-conditional-assignment rule and changed files to follow new rule 2018-09-05 10:53:58 +02:00
Patrick O'Carroll
72ab24f300 Changed functions to arrow functions for only-arrow-functions rule. (#13131) 2018-09-05 07:47:30 +02:00
Torkel Ödegaard
d8b3fa01d0 mobx: removed unused SearchStore 2018-09-04 22:38:18 -07:00
Peter Holmberg
cab6861d27 Reactify sidebar (#13091) 
* created react component and moved markdown

* extracting components

* Broke out parts into components

* tests

* Flattened file structure

* Tests

* made instances typed in test

* typing

* function instead of variable

* updated user model with missing properties

* added full set of properties to user mock

* redone from variable to function

* refactor: minor refactorings of #13091

* removed logging
 2018-09-04 17:24:08 +02:00
Patrick O'Carroll
dc4f547a40 Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 17:02:32 +02:00
Patrick O'Carroll
19b7ad61dd Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 14:27:03 +02:00
Marcus Efraimsson
7e527de5f1
Merge pull request #11081 from svenklemm/postgres-query-builder 
postgres: graphical query builder
 2018-09-04 12:24:10 +02:00
Carl Bergquist
2f6af7b811
Merge pull request #13125 from overcookedpanda/master 
added Bitcoin as a currency option
 2018-09-04 11:07:49 +02:00
Patrick O'Carroll
eca7b76290 fixed title prefix, fixes #13123 (#13128) 2018-09-04 10:33:18 +02:00
Overcooked Panda
4ab3826a08 added Bitcoin as a currency option 2018-09-03 22:02:58 -05:00
Sven Klemm
de917dfc4d Merge branch 'master' into postgres-query-builder 2018-09-03 13:43:58 +02:00
Patrick O'Carroll
b8d82df97e added no-angle-bracket-type-assertion rule and updatet files to follow rule (#13115) 2018-09-03 11:30:44 +02:00
Patrick O'Carroll
7837ee4466 Updated rules for variable name (#13106) 
* updated rules for variable name and fixed files that didn't follow new rules

* fixed test so it uses new rule

* made exceptions to rule in interval_variable
 2018-09-03 11:00:46 +02:00
Torkel Ödegaard
2a64d19f5b wip: load alert rules via redux 2018-09-02 11:36:03 -07:00
Torkel Ödegaard
7b06800295 refactor: changed nav store to use nav index and selector instead of initNav action 2018-09-02 10:36:36 -07:00
Torkel Ödegaard
2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Torkel Ödegaard
de456f8b73 wip: solid progress on redux -> angular location bridge update 2018-08-31 13:16:20 -07:00
Sven Klemm
265d5daf57 Merge branch 'master' into postgres-query-builder 2018-08-31 19:02:46 +02:00
Patrick O'Carroll
abbb6f933c added jsdoc-format rule and fixed files that didn't follow new rule (#13107) 2018-08-31 16:40:43 +02:00
Patrick O'Carroll
944c1da27b set member-access and no-var-keyword to true, removed public in two files (#13104) 2018-08-31 16:40:23 +02:00
Torkel Ödegaard
eef41cbccd Merge branch 'grafana-loading-page' 2018-08-31 07:38:42 -07:00
Alexander Zobnin
0e10fdb415
graph: legend as React component 2018-08-31 16:32:05 +03:00
Torkel Ödegaard
cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +02:00
Patrick O'Carroll
c9995d39d7 fixed so preloader is removed when app is loaded 2018-08-31 09:57:27 +02:00
Torkel Ödegaard
ad9f38ae4d Merge branch 'master' into redux-poc2 2018-08-30 13:04:29 -07:00
Torkel Ödegaard
154fbe2413
New TV Mode, dashboard toolbar update (layout change & new cycle view mode button) (#13025) 
* wip: design update for navbar with kiosk mode button

* feat: progress on new view mode button

* css: view state refactorings

* feat: kiosk modes & playlist support

* feature: cycle tv mode feature, renamed view modes to TV, and Kiosk

* fix: updated the alert notification message

* fix: removed unused parameter

* fix: correct the css class set for tv mode

* some minor improvements to playlist
 2018-08-30 11:52:31 +02:00
Torkel Ödegaard
36bc8b77fb Merge branch 'tsconfig-no-implicit-this' 2018-08-30 11:46:13 +02:00
Patrick O'Carroll
a8547ae36e added this:any to functions and changed functions to arrowfunctions 2018-08-30 10:49:18 +02:00
Patrick O'Carroll
552a61b6ae changed var to let in 50 files (#13075) 2018-08-30 09:03:11 +02:00
Patrick O'Carroll
b494a29e02 changed var to let in last files (#13087) 2018-08-30 08:58:43 +02:00
Torkel Ödegaard
c960af098a tslint: added 1 more rule, #12918 2018-08-30 07:47:46 +02:00
Torkel Ödegaard
0bb249096f tslint: added 2 more rules and removed unused component, #12918 2018-08-30 07:40:13 +02:00
Sven Klemm
70daa56a31 Merge branch 'master' into postgres-query-builder 2018-08-29 14:44:23 +02:00
Patrick O'Carroll
a702603e7b changed var to const 2 (#13068) 
* changed var to const

* fixed typo created in last commit

* added or empty object to options in prometheus/datasource
 2018-08-29 14:27:29 +02:00
Patrick O'Carroll
5e0d0c5816 changed var to const (#13061) 2018-08-29 14:26:50 +02:00
Marcus Efraimsson
e204124791
Merge pull request #12939 from grafana/12865-login-loading-animation 
animation during slow login
 2018-08-27 15:17:19 +02:00
Patrick O'Carroll
1a2ab532d1 fixed so validation of empty fields works again 2018-08-27 14:16:34 +02:00
Sven Klemm
7177f19436 Merge branch 'master' into postgres-query-builder 2018-08-27 11:23:55 +02:00
Torkel Ödegaard
e1beaaa0f7
tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard
35c00891e7
tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard
9b978b7203
tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Torkel Ödegaard
fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Torkel Ödegaard
4424bdd1b1 fix: going from fullscreen fix 2018-08-25 07:37:37 -07:00
Torkel Ödegaard
91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Torkel Ödegaard
1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard
0b794ff685 Merge branch 'master' into react-panels 2018-08-24 17:29:10 +02:00
Tobias Skarhed
8a99fa269d WIP Update tslint (#12922) 
* Interface linting rule

* fix: changed model names in store files so that the interface names do not conflict with the model names
 2018-08-24 16:48:47 +02:00
Patrick O'Carroll
050902a1e7 fixed so animation starts as soon as one pushes the button and animation stops if login failed 2018-08-23 15:31:25 +02:00
Sven Klemm
1b5486ae7f Merge branch 'master' into postgres-query-builder 2018-08-21 21:58:04 +02:00
Marcus Efraimsson
d6ad1ced6d
when value in variable changes, identify which variable(s) to update 
Given you have variables a, b, c, d where b depends on a, c depends on b, c, d depends on a.
When updating a only an update of b and d should be triggered since c depends on b
and c will be updated eventually when the update of b are finished.
 2018-08-17 12:20:21 +02:00
Sven Klemm
e84a1cbcc5 persist datatype information 2018-08-16 12:50:32 +02:00
Patrick O'Carroll
8877200ef4 created a class for loading buttons, added a button for when login slow on login page 2018-08-16 10:58:47 +02:00
Sven Klemm
5b3b0295e8 Merge branch 'master' into postgres-query-builder 2018-08-14 15:10:16 +02:00
Marcus Efraimsson
660530a3a6
Merge pull request #12914 from dehrax/12224-final 
Karma to Jest: rename and cleanup
 2018-08-14 12:55:23 +02:00
Sven Klemm
15c8ef6c95 Merge branch 'master' into postgres-query-builder 2018-08-14 12:51:03 +02:00
Torkel Ödegaard
a1ed3ae094 feat: add auto fit panels to shortcut modal, closes #12768 2018-08-14 12:26:08 +02:00
Tobias Skarhed
a65589a5fb Rename test files 2018-08-14 10:52:41 +02:00
Sven Klemm
3b6454ab88 Merge branch 'master' into postgres-query-builder 2018-08-08 12:09:17 +02:00
Marcus Efraimsson
cfe81510f9
Merge pull request #12796 from dehrax/12768-panel-heights 
WIP: Fit panels to screen height
 2018-08-07 15:57:40 +02:00
Tobias Skarhed
2ad358215a Remove window 2018-08-07 14:49:11 +02:00
Tobias Skarhed
a0da66610e Fix url param errors 2018-08-07 14:48:22 +02:00
David Kaltschmidt
eaff7b0f68 Explore: Add history to query fields 
- queries are saved to localstorage history array
- one history per datasource type (plugin ID)
- 100 items kept with timestamps
- history suggestions can be pulled up with Ctrl-SPACE
 2018-08-06 14:45:03 +02:00
Tobias Skarhed
1618b095c7 Use and add keybard shortcut 2018-08-05 11:39:46 +02:00
David
bda49fcaa2 Add click on explore table cell to add filter to query (#12729) 
* Add click on explore table cell to add filter to query

- move query state from query row to explore container to be able to set
  modified queries
- added TS interface for columns in table model
- plumbing from table cell click to datasource
- add modifyQuery to prometheus datasource
- implement addFilter as addLabelToQuery with tests

* Review feedback

- using airbnb style for Cell declaration
- fixed addLabelToQuery for complex label values
 2018-08-03 11:20:13 +03:00
Sven Klemm
67edb9e9fe Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 16:39:27 +02:00
Mitsuhiro Tanda
04fcd2a054 add series override option to hide tooltip (#12378) 
* add series override option to hide tooltip

* fix test

* invert option

* fix test

* remove initialization
 2018-08-02 02:49:40 -07:00
Sven Klemm
5c3b80b492 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 09:17:21 +02:00
Torkel Ödegaard
89eae1566d fix: team email tooltip was not showing 2018-07-31 17:31:45 +02:00
Sven Klemm
b8af68e05a Merge branch 'master' into postgres-query-builder 2018-07-31 13:04:27 +02:00
Marcus Efraimsson
49430f7557
Merge pull request #12744 from Worty/master 
change units to include characters for power of 2 and 3
 2018-07-30 16:59:12 +02:00
Worty
4fa979649c also fixed "Watt per square metre" 2018-07-30 16:28:19 +02:00
Worty
9c0fbe5a0b fixed that missing one 2018-07-30 16:19:31 +02:00
Sven Klemm
d7ddab958e Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-29 13:41:41 +02:00
Marcus Efraimsson
710566e146
Merge pull request #12742 from dehrax/12224-backend-srv 
Karma to Jest: backend_srv
 2018-07-27 17:17:54 +02:00
Worty
895b4b40ee correct volume unit 2018-07-27 16:26:04 +02:00
Tobias Skarhed
c11d0f5cc6 Remove lo 2018-07-27 15:52:22 +02:00
Tobias Skarhed
2f6b302375 Test passing. Remove Karma 2018-07-27 15:51:56 +02:00
Tobias Skarhed
4e6168f3a3 Add async/await 2018-07-27 14:22:48 +02:00
Tobias Skarhed
67c613a45a Begin conversion 2018-07-27 13:29:57 +02:00
Marcus Efraimsson
0550ec6de1
Merge pull request #12665 from grafana/9863-animated-delete-button 
built a component for delete button in tables
 2018-07-27 12:37:53 +02:00
Sven Klemm
734118de86 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-27 11:52:38 +02:00
Patrick O'Carroll
f4ab432542 added position absolute and some flexbox so I could remov changes in display and setTimeout, added tests and types, did some renaming 2018-07-25 10:29:55 +02:00
David
4d722b2177
Merge pull request #12675 from grafana/davkal/logging-datasource 
Datasource for Grafana logging platform
 2018-07-23 18:11:11 +02:00
Michał Węgrzynek
ee2eda615e
Update kbn.ts 2018-07-23 12:07:54 +02:00
David Kaltschmidt
3297ae462d Datasource for Grafana logging platform 
- new builtin datasource plugin "Logging" (likely going to be renamed)
- plugin implements no panel ctrls yet, only ships datasource
- new models for logging data as first class citizen (aside from table
  and time_series model)
- Logs as new view for Explore
- JSON view for development

Testable only against existing logish deployment.
Then test with queries like `{job="..."} regexp`.
 2018-07-20 17:07:17 +02:00
Patrick O'Carroll
0b421004ea built a component for delete button in tables, instead of using a modal to confirm it now does it in the row of the table, created a sass file for the component, the component uses css transitions for animation 2018-07-20 09:59:04 +02:00
David Kaltschmidt
c6e9ffb168 Use url params for explore state 
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
 2018-07-17 12:56:05 +02:00
Sven Klemm
6e824e81bf fix rate special function when using group by 2018-07-15 15:14:12 +02:00
Sven Klemm
f85c9c012e refactor adding sqlPart 2018-07-15 12:26:22 +02:00
Sven Klemm
f48060a1bb remove render code from sql_part 2018-07-15 09:53:22 +02:00
David
64c77febef
Merge pull request #12586 from dehrax/12075-iframe-scroll 
Prevent scroll on focus for iframe
 2018-07-12 16:10:06 +02:00
Tobias Skarhed
7361d352bf Add comments 2018-07-12 15:38:41 +02:00
Torkel Ödegaard
902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -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
Rollulus Rouloul
2fbf2bba4e fix: requests/sec instead of requets (#12557) 2018-07-11 03:33:19 -07:00
Tobias Skarhed
4ee4ca99be Prevent scroll on focus for iframe 2018-07-10 12:54:45 +02:00
Sven Klemm
5a307e80aa fix enter in sql_part_editor 2018-07-09 22:43:50 +02:00
Sven Klemm
bfc751542c fix editing expression parts 2018-07-09 22:38:29 +02:00
Sven Klemm
f140967423 rename inputBlur to switchToLink 2018-07-09 22:00:50 +02:00
Torkel Ödegaard
761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Sven Klemm
02abda7d92 fix spelling 2018-07-09 14:47:59 +02:00
Sven Klemm
2d951ba611 add current value to dropdown if its not in resultset 2018-07-09 14:27:10 +02:00
Sven Klemm
6a981d39d8 Revert "show current value in dropdown when its not part of list" 
This reverts commit 76275cae37.
 2018-07-09 13:04:55 +02:00
Sven Klemm
76275cae37 show current value in dropdown when its not part of list 2018-07-09 11:22:03 +02:00
Torkel Ödegaard
d85fa66fb4 redid redux poc, old branch was to old and caused to many conflicts 2018-07-09 10:28:20 +02:00
Torkel Ödegaard
50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
Sven Klemm
d9db3d1402 put updateParam back in 2018-07-06 11:24:49 +02:00
Sven Klemm
8ed210c8d5 remove dead code, make label more flexible 2018-07-06 10:38:18 +02:00
Torkel Ödegaard
09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07: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
19dcc1f41a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 10:12:27 +02:00
Martin Packman
6046c8b4ca Make table sorting stable when null values exist (#12362) 
Currently if a null appears in a table column, for instance in data
returned by postgres, sorting on that gives an arbitrary order. This
is due to null being neither greater or less than any string, which
makes the sort unstable.

Change the table sort function to compare on nullness first. Note
this is a slight behaviour change for numbers, which would otherwise
treat null and 0 as equivalent.

Signed-off-by: Martin Packman <gzlist@googlemail.com>
 2018-07-02 11:14:41 -07:00
David
0d1f7c8782 Fix bar width issue in aligned prometheus queries (#12483) 
* Fix bar width issue in aligned prometheus queries

This was broken because null values were filled in with unaligned times.

* use aligned times for result transformation
* add tests

An earlier version of this fix aligned the times again in the transformer, but
I think it's safe to only deal with aligned times in the response.

* Fixed prometheus heatmap tranformer test

The interval needs to be 1 to prevent step alignment.
 2018-07-02 11:04:36 -07:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Carl Bergquist
861af4cb97 Improve extensions build. (#12461) 
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
 2018-07-01 07:01:43 -07:00
Sven Klemm
d26cacccd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-30 10:49:17 +02:00
Tobias Skarhed
443ff5deb4 Karma to Jest: value_select_dropdown (#12435) 
* Begin Karma 2 Jest: value_select_dropdown

* Add return for Promise

* Remove Karma test
 2018-06-28 03:10:36 -07:00
Torkel Ödegaard
0f97d38485 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-26 16:07:12 +02:00
Torkel Ödegaard
1420147ccb Merge branch 'master' into react-panels 2018-06-26 15:18:54 +02:00
Sven Klemm
682c684df3 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-26 09:26:35 +02:00
Tobias Skarhed
762ee203fa Fix 12248 2018-06-25 13:46:33 +02:00
Marcus Efraimsson
296a841685
Merge pull request #12123 from alexanderzobnin/fix-11792 
graph: fix legend decimals precision calculation
 2018-06-20 13:08:17 +02:00
Torkel Ödegaard
230606146d wip: react panel minor progrss 2018-06-19 21:25:57 +02:00
Torkel Ödegaard
db52ea66bd react panels minor progress 2018-06-19 16:57:55 +02:00
Torkel Ödegaard
35403c1875 wip: react panel makeover mini progress 2018-06-19 08:42:41 +02:00
Torkel Ödegaard
542da8dc45 Merge branch 'master' into react-panels 2018-06-18 15:08:06 +02:00
Sven Klemm
6c7984a840 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-16 10:36:50 +02:00
flopp999
2d1f59a9cc Added Litre/min and milliLitre/min in Flow (#12282) 
units: Litre/min and milliLitre/min in Flow
 2018-06-15 10:54:38 +02:00
Marcus Efraimsson
9dd38031e4
Merge pull request #11233 from flopp999/patch-2 
units: W/m2(energy), l/h(flow) and kPa(pressure)
 2018-06-14 15:36:38 +02:00
Marcus Efraimsson
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
Alexander Zobnin
24f6d34abd
graph: fix legend decimals precision calculation 2018-06-07 16:02:44 +03:00
Ryan McKinley
1f32871f70 Use Passive eventListener for 'wheel' (#12106) 
* make wheel passive

* remove console
 2018-06-07 03:41:50 -07:00
Alexander Zobnin
9460063ab5
show import menu in sidenav, dashboard search and manage dashboards page 
if user has editor permissions for at least one folder
 2018-06-06 13:55:00 +03:00
David Kaltschmidt
661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
Sven Klemm
a05d694d31 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-05 23:21:46 +02:00
Alexander Zobnin
393f41cd14
dashboard: add Import button to manage page 2018-06-05 19:37:47 +03:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
Marcus Efraimsson
6281910591
Merge pull request #12037 from grafana/login-change-password 
change admin password after first login
 2018-06-04 16:21:45 +02:00
Patrick O'Carroll
cb6c6c8172 change admin password after first login 2018-06-04 16:01:09 +02:00
David Kaltschmidt
08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00