Commit Graph

19374 Commits

Author SHA1 Message Date
Torkel Ödegaard
8a9582dad5 minor updates 2019-01-23 13:54:34 +01:00
ijin08
2ec55d0650 changed color for label tooltips from blue/red-yellow gradient to black/white 2019-01-23 13:28:39 +01:00
Torkel Ödegaard
db99b86591
Merge pull request #12765 from cxcv/master
added percentencode formatting option
2019-01-22 15:55:36 +01:00
Benjamin Schweizer
bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Torkel Ödegaard
75e3d90089
Merge pull request #14988 from grafana/sanitize-input-fixes
Fixed issues with the sanitizie input in text panels
2019-01-22 12:26:51 +01:00
Torkel Ödegaard
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Leonard Gram
caa9a90bfd build: removes arm32v6 docker image. 2019-01-22 11:44:02 +01:00
Torkel Ödegaard
39fa0aec5d
Updated version in package.json to 6.0.0-pre1 2019-01-22 11:37:14 +01:00
Torkel Ödegaard
cd3157fa68
Update CHANGELOG.md 2019-01-22 11:36:38 +01:00
Torkel Ödegaard
cfdef66f8c
Merge pull request #14984 from grafana/4117-xss-sanitize-text-panels
XSS sanitize text panels
2019-01-22 11:29:50 +01:00
Torkel Ödegaard
bc7842e324
Merge pull request #14972 from grafana/hugoh/rendering-null-as-valuemapping
Added check for null value in ValueMappings and added tests
2019-01-22 11:28:44 +01:00
Benjamin Schweizer
8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Leonard Gram
ec11d5a90a build: armv6 docker image. 2019-01-22 11:09:27 +01:00
Leonard Gram
2bdc147e55 build: skips building rpm for armv6. 2019-01-22 11:09:27 +01:00
Leonard Gram
5f188058e3 build: builds for armv6. 2019-01-22 11:09:27 +01:00
Torkel Ödegaard
e43fafd96e Explore: mini styling fix for angular query editors 2019-01-22 10:46:21 +01:00
Torkel Ödegaard
a03faba9a3
Merge pull request #14983 from grafana/hugoh/logs-refactoring
Logs refactoring
2019-01-22 10:32:05 +01:00
Torkel Ödegaard
40b73a1fcd Removed unused props & state in PromQueryField 2019-01-22 09:57:27 +01:00
Torkel Ödegaard
e8e1d35340
Merge pull request #14981 from grafana/hugoh/sidemenu-should-be-clickable
Added link to side menu header and fixed styling
2019-01-22 09:36:58 +01:00
Johannes Schill
08dc5a4f97 chore: Remove logging and use the updated config param 2019-01-22 09:36:07 +01:00
Johannes Schill
1ed35f3dc1 chore: Reverse sanitize variable so it defaults to false 2019-01-22 09:36:07 +01:00
Johannes Schill
15d560a1c0 feat: wip: Sanitize user input on text panel 2019-01-22 09:36:07 +01:00
Johannes Schill
a3e13b333e fix: Text panel should re-render when panel mode is changed #14922 2019-01-22 09:36:07 +01:00
Torkel Ödegaard
5446f49f19
Merge pull request #14977 from grafana/explore-fix-datasource-selector
Fixed data source selection in explore
2019-01-22 09:36:02 +01:00
Hugo Häggmark
bcb3824e6a Minor rename of LogsProps and LogsState 2019-01-22 09:25:40 +01:00
Hugo Häggmark
c369279401 Splitted up LogLabels into LogLabelStats and LogLabel 2019-01-22 09:22:38 +01:00
Hugo Häggmark
23202ab130 Refactored out LogRow to a separate file 2019-01-22 08:59:22 +01:00
Hugo Häggmark
bf0333e329 Removed strange edit 2019-01-22 08:18:03 +01:00
Hugo Häggmark
a6428fef0c Added link to side menu header and fixed styling 2019-01-22 08:12:48 +01:00
Hugo Häggmark
a9c33ab658 Moved ValueMapping logic and tests to separate files 2019-01-22 06:40:04 +01:00
Torkel Ödegaard
9c8dea062a
Merge pull request #14975 from grafana/default-datasource-query-editor
Fix for default datasource query editor
2019-01-21 21:43:01 +01:00
Torkel Ödegaard
79bd7f4077 Fixed data source selection in explore 2019-01-21 21:36:30 +01:00
Torkel Ödegaard
018fef0400 Added refId to missing queries on panel model init 2019-01-21 20:35:24 +01:00
Torkel Ödegaard
db2a15daf0 Fixed loading of default query editor 2019-01-21 18:54:57 +01:00
Hugo Häggmark
bbb7596113 Changed null logic for range value mappings after PR comments 2019-01-21 17:30:47 +01:00
Hugo Häggmark
38ea11d110 Added check for null value in ValueMappings and added tests 2019-01-21 16:07:55 +01:00
Torkel Ödegaard
96d28703f7
Merge pull request #14963 from grafana/hugoh/bug-viewers-can-edit-not-working-for-explore
Viewers can edit now means that viewers have access to Explore
2019-01-21 13:51:46 +01:00
Torkel Ödegaard
721e40db90 fixed trailing whitespace 2019-01-21 13:51:33 +01:00
Torkel Ödegaard
c188a44ba8
Merge pull request #14969 from grafana/gotmetalinter-script
Gometalinter changes & megacheck fix
2019-01-21 13:49:35 +01:00
Torkel Ödegaard
778e1f78c2
Merge branch 'master' into hugoh/bug-viewers-can-edit-not-working-for-explore 2019-01-21 13:31:05 +01:00
Torkel Ödegaard
829e3024ce fixed circleci script run path for gometalinter 2019-01-21 13:20:24 +01:00
Torkel Ödegaard
f24e6ebf67 Fixed circleci name for gometalinter exec step 2019-01-21 13:10:00 +01:00
Torkel Ödegaard
37e917939a moved script and added exit_if_fail 2019-01-21 13:07:28 +01:00
Torkel Ödegaard
d5e49845f3 Moved gometalinter to a script instead of seperate commands in circleci file, removed megacheck and added staticcheck 2019-01-21 13:03:05 +01:00
Hugo Häggmark
b95650d19c Added function hasAccessToExplore in ContextSrv and refactored tests 2019-01-21 10:50:34 +01:00
Hugo Häggmark
9d6ac2c3d4 fix: Viewers can edit means that viewers have acces to Explore #14281 2019-01-21 08:47:41 +01:00
Torkel Ödegaard
d843044841 decreased panel height in edit mode 2019-01-19 08:31:20 +01:00
Torkel Ödegaard
f94a6b2431
Merge pull request #14956 from grafana/query-editor-row-style-update
Query editor row style update & sass cleanup
2019-01-19 08:24:28 +01:00
Torkel Ödegaard
17aebf8462
Merge pull request #14955 from grafana/datasource-typings
Datasource typings
2019-01-19 08:24:06 +01:00
Torkel Ödegaard
4cbed807d6 toggle collapse when clicking on collapse state text 2019-01-19 08:22:56 +01:00