Torkel Ödegaard
16a2b207cc
fix: DataPanel isFirstLoad state fix
2018-10-22 09:54:43 +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
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
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
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
Torkel Ödegaard
5c95a01229
Merge branch 'master' of github.com:grafana/grafana
2018-10-18 14:38:43 +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
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
David Kaltschmidt
9e647590ac
Review feedback, increased height
2018-10-18 10:42:25 +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
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
Peter Holmberg
84bbfe11ca
tests
2018-10-17 16:14:45 +02:00
Michael Huynh
22e0ff8b9c
Update PromQueryField tests to address fixed bug
...
Related: #13484
2018-10-17 22:09:21 +08:00
Michael Huynh
a8c5ab76b3
Fix typeahead behaviour for QueryField
...
These changes were originally intended to address a bug whereby a
suggestion for an already selected label value continues to appear.
However, they also appear to fix several other problems in the area:
- Wrong suggestions when using negated label matching operators
- Misaligned label value suggestion replacements
Related: #13484
2018-10-17 22:09:03 +08:00
Peter Holmberg
c2c3e15022
hooked up actions
2018-10-17 15:56:34 +02:00
David Kaltschmidt
ff67213b42
Explore: Use react-table as table component
...
- adds react-table as dependency
- replaces custom table component in Explore
- vendors react-table styles and overrides them (currently in
explore.scss)
2018-10-17 14:58:04 +02:00
Peter Holmberg
f25a843a2c
created view
2018-10-17 14:36:18 +02:00
Marcus Efraimsson
cf93b1e700
Merge pull request #13708 from svenklemm/interpolateVariable
...
postgres: fix template variables error
2018-10-17 13:42:47 +02:00
Marcus Efraimsson
7b656097a7
postgres: use arrow function declaration of interpolateVariable
2018-10-17 13:30:07 +02:00
Sven Klemm
ec0fd96f08
Use closure for calling interpolateVariable
2018-10-17 12:30:07 +02:00
Marcus Efraimsson
62f21a254a
Merge pull request #12337 from mtanda/cw_regions
...
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00
Peter Holmberg
314fffeae1
Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react
2018-10-17 11:12:13 +02:00
Peter Holmberg
b7b0ce0107
remove addpermissions component
2018-10-17 11:07:17 +02:00
bergquist
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
Peter Holmberg
dd2fb7961f
removed snaps
2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288
Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise
2018-10-17 10:00:18 +02:00
Mitsuhiro Tanda
c64a5a6e0e
re-add hard coded region list
2018-10-17 14:02:02 +09:00
Dave Waters
e9b8051724
Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert
2018-10-16 17:43:26 -04:00
Marcus Efraimsson
3612a1c00e
Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option
...
Add encrypt setting to MSSQL data source.
2018-10-16 19:07:00 +02:00
Peter Holmberg
66311a065c
removing datasource permissions states from grafana
2018-10-16 15:36:33 +02:00
Dave Waters
18c73631ea
rename UI Option, align with control, update tests
2018-10-16 07:12:32 -04:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277
Merge branch 'master' into permissions-code-to-enterprise
2018-10-16 11:09:58 +02:00
Johannes Schill
2a82b57d93
Remove unwanted char
2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1
Fix incorrect alt text on logo
2018-10-16 07:50:44 +02:00
Mitsuhiro Tanda
fce50cf1b8
return default region list from backend
2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda
a417d6fa21
don't merge hard coded region list
2018-10-16 12:03:33 +09:00