Commit Graph

20320 Commits

Author SHA1 Message Date
Torkel Ödegaard
cc61d9c5cc Merge branch 'master' into move-error-boundry 2019-02-14 13:10:49 +01:00
Carl Bergquist
4f3b9c6c37
Merge pull request #15420 from marefr/fix_generic_oauth_doc
docs: add availability note regarding non-compliant providers
2019-02-14 10:17:58 +01:00
Marcus Efraimsson
0cbf7aaf25
Merge pull request #15412 from marefr/ha_loki
devenv: loki support in ha test
2019-02-14 10:15:51 +01:00
Torkel Ödegaard
4c9dba9152
Merge pull request #15423 from grafana/fixed-react-panels-dimensions
Fixed issue with react panel dimensions
2019-02-13 17:17:19 +01:00
Peter Holmberg
0c72fb3be1 Merge branch 'master' into move-error-boundry 2019-02-13 16:52:52 +01:00
Torkel Ödegaard
ef9e74fabb Fixed issue with sass variables used from typescript, the prettier lowercases export variables 2019-02-13 16:36:59 +01:00
Peter Holmberg
aad558ce9c using error callback from datapanel instead 2019-02-13 15:54:10 +01:00
Marcus Efraimsson
3b0159bf84
docs: add availability note regarding non-compliant providers
ref #15408
2019-02-13 15:36:16 +01:00
Torkel Ödegaard
c243e78913
Merge pull request #15399 from grafana/15330-vizpicker-red-when-0-hits
Red border color on input when zero hits in vizpicker
2019-02-13 15:22:00 +01:00
Torkel Ödegaard
61de0a7330
Merge pull request #15418 from grafana/change-default-devenv-datasource
Changed devenv default data source to testdata
2019-02-13 15:04:51 +01:00
Torkel Ödegaard
124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Torkel Ödegaard
0ed32ebcb4 Changed devenv default data source to testdata 2019-02-13 14:09:04 +01:00
Torkel Ödegaard
adf87dc49f
Merge pull request #15413 from grafana/prettier-on-all-again
Prettier fixes
2019-02-13 12:27:04 +01:00
Torkel Ödegaard
ffdf747080 More files that has fixed with prettier 2019-02-13 11:39:41 +01:00
Torkel Ödegaard
ac9129c2b7 Added prettierignore and check script 2019-02-13 11:38:04 +01:00
Marcus Efraimsson
0f758fd1ff
devenv: use grafana:dev image in ha test per default 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
e61616d829
devenv: send nginx logs to loki in ha test 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
d55a6deb97
devenv: proper fluentd conf for grafana and loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
7b1249ad47
devenv: use grafana/fluent-plugin-loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
0f40b2d206
devenv: trying to make fluentd with inoffical fluent-plugin-loki work 2019-02-13 11:18:29 +01:00
Peter Holmberg
56f7cd9602 fixed issue with updatePopperPosition 2019-02-13 11:18:08 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
Johannes Schill
27bbadce1d feat: Add EmptySearchResult ui component and use it in VizTypePicker 2019-02-13 09:22:09 +01:00
Torkel Ödegaard
3b0ae4bd0a
Merge pull request #15368 from grafana/15217-panels-without-queries
POC: Panels without queries can skip DataPanel
2019-02-13 08:06:25 +01:00
Torkel Ödegaard
6be50c952c
Merge pull request #15400 from grafana/removed-icons-in-buttons
Removed some icons in action button
2019-02-13 08:05:11 +01:00
Johannes Schill
b6305c2d80 Revert "feat: Add css-support for invalid form input elements"
This reverts commit b1aa84804b.
2019-02-13 07:46:21 +01:00
Johannes Schill
44eaa3eaa8 Revert "feat: Highlight vizpicker input when there are no panels matching the search query"
This reverts commit 11db48e76e.
2019-02-13 07:46:14 +01:00
Torkel Ödegaard
88ef2e1d32 Fixed a minor plugin json lingering issue 2019-02-12 18:31:35 +01:00
Torkel Ödegaard
960fa56033
Merge pull request #15382 from grafana/hugoh/bug-pressing-brackets-key-in-input-fields
Bug pressing special regexp chars in input fields
2019-02-12 17:55:42 +01:00
Torkel Ödegaard
f195459b01 Removed some icons in action button
Trying to align some title case issues
2019-02-12 17:51:08 +01:00
Peter Holmberg
1c5118748a implement show error in panelcorner 2019-02-12 17:01:07 +01:00
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark
222482b6be Forgot about the snapshots 2019-02-12 16:31:11 +01:00
Torkel Ödegaard
c839034f45 Merge branch '15217-panels-without-queries' of github.com:grafana/grafana into 15217-panels-without-queries 2019-02-12 16:30:41 +01:00
Torkel Ödegaard
ef7236439a
Merge pull request #15391 from grafana/fixed-double-datasource-edit-page
Fixed issues with double page body and husky pre-commit hook
2019-02-12 16:28:07 +01:00
Hugo Häggmark
4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Johannes Schill
11db48e76e feat: Highlight vizpicker input when there are no panels matching the search query 2019-02-12 16:19:23 +01:00
Torkel Ödegaard
5708660893 Updated a few plugin json files with dataFormats 2019-02-12 16:15:05 +01:00
Johannes Schill
b1aa84804b feat: Add css-support for invalid form input elements 2019-02-12 16:14:48 +01:00
Peter Holmberg
9f88a22b4c remove comments 2019-02-12 16:14:26 +01:00
Peter Holmberg
f52aa4de4e Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 16:13:15 +01:00
Peter Holmberg
f0565684c7 Merge branch '15217-panels-without-queries' of https://github.com/grafana/grafana into 15217-panels-without-queries 2019-02-12 16:11:04 +01:00
Peter Holmberg
530a370379 bubble error from datapanel to panelchrome 2019-02-12 16:06:02 +01:00
Torkel Ödegaard
a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Torkel Ödegaard
bde9e9d5a5
Merge pull request #15394 from grafana/13066-save-as-dashboard
fix: No need to have edit permissions to be able to "Save as"
2019-02-12 15:57:41 +01:00
Carl Bergquist
dcec61e1b4
Merge pull request #15378 from grafana/auth_token_quotas
use authTokenService for session quotas restrictions
2019-02-12 15:38:57 +01:00
bergquist
e163aadfe4 use authtoken for session quota restrictions
closes #15360
2019-02-12 15:10:55 +01:00
Torkel Ödegaard
8bd7e5a5f4
Merge pull request #15374 from grafana/explore/dedup-selector
Move deduplication calculation from Logs component to reselect selector
2019-02-12 14:57:06 +01:00
Torkel Ödegaard
9772497354
Merge pull request #15389 from grafana/tooltip-error-theme-text-color
fix: Tooltip error text color
2019-02-12 14:43:51 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00