Peter Holmberg
5f515bb3fc
using react component
2018-10-19 15:33:16 +02:00
David Kaltschmidt
374fe9dcb4
Explore: reuse table merge from table panel
...
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
transformer spec
2018-10-19 15:29:58 +02:00
Alexander Zobnin
daa95c2375
graph legend: refactor, move behaviour logic into component
2018-10-19 16:20:00 +03:00
Erik Sundell
93a9885d67
stackdriver: add default project to provisioning documentation
2018-10-19 15:15:45 +02:00
Sven Klemm
8ce7e113d9
adjust meta data queries for mysql
2018-10-19 15:07:38 +02:00
Sven Klemm
aae21a631e
fix references to postgres datatypes
2018-10-19 14:52:25 +02:00
Alexander Zobnin
44ed188c84
graph legend: review fixes
2018-10-19 14:32:37 +03:00
Marcus Efraimsson
eabb04cec2
changelog: add notes about closing #13667
...
[skip ci]
2018-10-19 13:27:21 +02:00
Torkel Ödegaard
4f4bba7f8c
Merge pull request #13578 from grafana/react-panels-step1
...
WIP: React panels step1
2018-10-19 12:59:09 +02:00
Marcus Efraimsson
4e6d59d4f4
changelog: add notes about closing #13718
...
[skip ci]
2018-10-19 11:39:18 +02:00
Torkel Ödegaard
5b8178cdae
fixed gofmt issue after go update
2018-10-19 11:32:36 +02:00
Yuan Liu
68c460a957
fix cannot receive dingding alert bug
2018-10-19 17:17:38 +08:00
Torkel Ödegaard
b95d64e7a0
fix: fixed variable srv tests
2018-10-19 11:14:02 +02:00
Marcus Efraimsson
b124ba9a83
Merge pull request #13726 from mtanda/cw_unit_override
...
Allow unit overwrite if cloudwatch/stackdriver datasource response doesn't include unit
2018-10-19 11:02:42 +02:00
Erik Sundell
b2932058c7
stackdriver: only add unit to resonse obj if it has a value
2018-10-19 10:42:57 +02:00
Sven Klemm
215ca50cc1
make interpolateVariable arrow function
2018-10-19 10:19:33 +02:00
Torkel Ödegaard
936fe56080
fix: another set of fixes for refresh
2018-10-19 10:05:48 +02:00
Torkel Ödegaard
11f66bb909
fixed issue with template refresh
2018-10-19 09:43:54 +02:00
Torkel Ödegaard
dddbe62d6c
Merge branch 'master' into react-panels-step1
2018-10-19 09:15:37 +02:00
Sven Klemm
c4452ba335
Fix tslint errors
2018-10-18 20:01:40 +02:00
Sven Klemm
5d8826d034
Merge remote-tracking branch 'upstream/master' into mysql_query_builder
2018-10-18 19:28:52 +02:00
Torkel Ödegaard
5bd11744dd
Merge pull request #13670 from svenklemm/metrics-segment-xss
...
Escape values in metric segment and sql part
2018-10-18 17:24:47 +02:00
Erik Sundell
0f0763b6b8
stackdriver: fix failing tests
2018-10-18 16:45:46 +02:00
Erik Sundell
d1740f090a
stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made
2018-10-18 16:42:08 +02:00
Sven Klemm
2803cdca40
Fix variable highlighting
2018-10-18 15:04:54 +02:00
David Kaltschmidt
34ef5e77b7
Fixed yarn.lock (previous merge took out integrity)
2018-10-18 14:51:26 +02:00
Marcus Efraimsson
9f2bdea99d
changelog: add notes about closing #13710
...
[skip ci]
2018-10-18 14:50:00 +02:00
Torkel Ödegaard
5c95a01229
Merge branch 'master' of github.com:grafana/grafana
2018-10-18 14:38:43 +02:00
Torkel Ödegaard
0f592679f9
Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin
...
fix LDAP Grafana admin logic
2018-10-18 14:15:47 +02:00
Mitsuhiro Tanda
4687ce2f7b
allow unit override if cloudwatch response unit is none
2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
e465b2d53a
Revert "don't overwrite unit if user set"
...
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.
2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
287ba77abf
don't overwrite unit if user set
2018-10-18 20:51:46 +09:00
Marcus Efraimsson
d3c28a814a
changelog: add notes about closing #13674
...
[skip ci]
2018-10-18 13:45:50 +02:00
Marcus Efraimsson
77f23018a5
Merge pull request #13684 from mtanda/cw_concurrent_map
...
fix concurrent map writes
2018-10-18 13:41:39 +02:00
Torkel Ödegaard
0b490912bd
Merge pull request #13716 from grafana/davkal/13613-fix-split-layout
...
Explore: fix render issues in split view
2018-10-18 13:00:23 +02:00
David
bf1a0585ed
Merge pull request #13712 from grafana/davkal/explore-react-table
...
Explore: Use react-table as table component
2018-10-18 12:44:56 +02:00
Adrien Fillon
781e66ba3c
fix LDAP Grafana admin logic
...
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
2018-10-18 12:36:48 +02:00
Alexander Zobnin
5f712ab529
graph legend: remove unused code
2018-10-18 12:31:06 +03:00
Alexander Zobnin
fe0c5c73dd
graph legend: refactor
2018-10-18 12:30:34 +03:00
Leonard Gram
287d0e8333
docs: cleanup of how to build for docker.
...
[skip ci]
2018-10-18 11:10:39 +02:00
David Kaltschmidt
9e647590ac
Review feedback, increased height
2018-10-18 10:42:25 +02:00
Marcus Efraimsson
367a2af1c2
changelog: add notes about closing #12342
...
[skip ci]
2018-10-18 09:50:21 +02:00
Marcus Efraimsson
a776120bee
update changelog
...
[skip ci]
2018-10-18 09:47:18 +02:00
Marcus Efraimsson
1d0dee189c
Merge pull request #13705 from Yukinoshita-Yukino/master
...
Add socket support for mysql data source
2018-10-18 09:45:50 +02:00
Peter Holmberg
ab2be340f7
remove not used file
2018-10-18 09:34:51 +02:00
Peter Holmberg
02769b6d3c
Merge branch 'master' into datasource-dashboards-to-react
2018-10-18 08:34:31 +02:00
Yuan Liu
f640df7a2c
simplify code
2018-10-18 01:45:14 +08:00
David Kaltschmidt
a1410b54a5
Explore: fix render issues in split view
...
- avoid line wrap in row tools (add/remove/clear)
- avoid text overflow in query field
2018-10-17 17:59:03 +02:00
David
1d60c45a04
Merge pull request #13663 from miqh/fix/label-value-suggestions
...
Fix typeahead behaviour for QueryField
2018-10-17 16:56:02 +02:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
