Commit Graph

17094 Commits

Author SHA1 Message Date
Torkel Ödegaard
5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard
f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +02:00
Torkel Ödegaard
9585dc7825 added the UserWasRemoved flag to make api aware of what happened to return correct message to UI 2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d Remove user form org now completely removes the user from the system if the user is orphaned 2018-10-11 07:48:35 +02:00
Yuan Liu
f8a8b213f9
remove tab 2018-10-11 11:40:23 +08:00
Yuan Liu
567db87c3a
bug fix
bug fix
2018-10-11 11:36:40 +08:00
Yuan Liu
3b9ab6e204
Update time_series_query.go
fix alert no data when elasticsearch group by terms size is set to no limit
2018-10-11 11:21:06 +08:00
Marcus Efraimsson
974eddee8f
changelog: add notes about closing #11711
[skip ci]
2018-10-10 19:24:13 +02:00
Marcus Efraimsson
bc3b7357bd
Merge pull request #13400 from connection-reset/concurrent-sql
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection 
lifetime configurable in the data source settings
2018-10-10 19:12:38 +02:00
Dan Cech
a4f90fd10d
add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Marcus Efraimsson
4757ca2242
docs: add version notes 2018-10-10 18:59:09 +02:00
Torkel Ödegaard
39b25e0596
Merge pull request #13536 from grafana/davkal/explore-text-match
Explore: highlight typed text in suggestions
2018-10-10 18:50:14 +02:00
Peter Holmberg
3ca9c10fe4 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 17:05:22 +02:00
Peter Holmberg
037e9ad0bd tests 2018-10-10 17:04:48 +02:00
Johannes Schill
a42227cdff Css fix for selected option 2018-10-10 16:21:08 +02:00
Leonard Gram
721dd532e4 User without permission to a datasource won't see it. 2018-10-10 15:55:16 +02:00
Johannes Schill
127b7d92f8 Merge branch '13425-team-picker-bug' of https://github.com/grafana/grafana into 13425-team-picker-bug 2018-10-10 15:05:04 +02:00
Johannes Schill
9a8a476776 Updated test snapshot #13425 2018-10-10 15:02:13 +02:00
Peter Holmberg
707446170d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 14:58:18 +02:00
David Kaltschmidt
dcee0771ad Initialize Explore datasource correctly 2018-10-10 14:55:41 +02:00
Leonard Gram
ccfcf02e33 Refactors ds permissions to a filter. 2018-10-10 14:25:57 +02:00
Johannes Schill
501d974eaa Remove the fixed widths and make it possible to pass it in as a prop instead #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
77d06a0924 User filtering now works properly at the backend #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
779691a072 Removed old code #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
ffae3e7a58 Rename css class "gf-form-select2" to "gf-form-select-box" #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
9afcef985c Use new class names #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
e20fa1ba70 Fixes for the tag filtering in the search #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
4d2be024f4 Start implementing the upgraded react-select in the tag filter box #13425 2018-10-10 14:15:28 +02:00
Marcus Efraimsson
c0b7ca3902 fix /api/org/users so that query and limit querystrings works 2018-10-10 14:15:28 +02:00
Johannes Schill
a94c1eaf4b Bump grafana/build-container to 1.2.0 2018-10-10 14:15:27 +02:00
Johannes Schill
314b8b8ed9 Revert "Lock down node version to see if we get rid of the circleci build issue"
This reverts commit 9080b2c4ff9cff9a1ca99c983051fb35a0789515.
2018-10-10 14:15:27 +02:00
Johannes Schill
a1853d782d Revert "Try to remove circleci cache to see if that solves the build issue"
This reverts commit f19fc935918721a29fe149fec8abfb78866b262f.
2018-10-10 14:15:27 +02:00
Johannes Schill
1f27f90cbe Try to remove circleci cache to see if that solves the build issue 2018-10-10 14:15:27 +02:00
Johannes Schill
a6fdbad2bb Generate yarn.lock from older yarn 2018-10-10 14:15:27 +02:00
Johannes Schill
c695bbfa25 Revert "Add node version output for debugging"
This reverts commit 16a931d535d02a2759e26c2ae3dc66454aa4fe89.
2018-10-10 14:15:27 +02:00
Johannes Schill
118c3b1746 Add node version output for debugging 2018-10-10 14:15:27 +02:00
Johannes Schill
878433bcfa Lock down node version to see if we get rid of the circleci build issue 2018-10-10 14:15:27 +02:00
Johannes Schill
8620804b9f Lock down webpack to 4.19.1 to avoid issue with webpack-cli (https://github.com/webpack/webpack/issues/8082) 2018-10-10 14:15:27 +02:00
Johannes Schill
67d77e6061 Bump react-select to 2.1.0 #13425 2018-10-10 14:15:27 +02:00
Johannes Schill
b28008cb5c Updated lockfile to get rid of build error #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
5c842f3ed3 Add frontend filtering of users in user picker #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
e5e7611547 Replace $white with a color working in both themes #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
f552a7a421 Replace System.import() with import() to get rid of warning 2018-10-10 14:15:26 +02:00
Johannes Schill
cc20b8de36 Clean up css for react-select v2 #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
be7ed3ebca Upgrade Datasources-picker on Explore page #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
52b329562d Enable trailing on the debounce in the TeamPicker (same as in UserPicker) #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
a29d80df4e Update typescript notifications #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
2d65845bac Update (js-) tests and snapshots for react-select 2 #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
7e7c7fe64c Remove variables not used #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
087ff2fa74 wip: Remove code for old react-select component #13425 2018-10-10 14:15:25 +02:00