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
5c95a01229
Merge branch 'master' of github.com:grafana/grafana
2018-10-18 14:38:43 +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
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
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
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
Dave Waters
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
Torkel Ödegaard
ae7a1bc139
Can render graph
2018-10-15 21:52:24 +02:00
Marcus Efraimsson
9f85a7494a
Merge pull request #13651 from grafana/13628_fix_dag
...
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
2018-10-15 11:42:59 +02:00
Torkel Ödegaard
a28c25a2e0
progress on react time series infra
2018-10-15 08:22:20 +02:00
Torkel Ödegaard
2fb721d3c6
various fixes to to queries tab (in react mode)
2018-10-14 21:14:11 +02:00
Torkel Ödegaard
8e85295b2b
react panels query processing
2018-10-14 18:19:49 +02:00
Torkel Ödegaard
543c67a297
react panels: got data
2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1
working on react data / query exectution
2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875
changed DataPanel from HOC to use render props
2018-10-14 12:41:09 +02:00
Torkel Ödegaard
0662b5f962
fixing unit tests
2018-10-14 11:13:04 +02:00
Torkel Ödegaard
a029492d91
Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue
...
Fix graph render blocked by annotations issue
2018-10-14 10:35:16 +02:00
Marcus Efraimsson
4b1a2d3b11
make sure to add all variable nodes to dag before linking variables
2018-10-12 14:15:44 +02:00
Torkel Ödegaard
8ba865bf57
Merge branch 'master' into react-panels-step1
2018-10-12 13:31:20 +02:00
Peter Holmberg
c9721bf8cc
fix route issue
2018-10-12 08:54:37 +02:00
Torkel Ödegaard
69e0311cbc
Merge branch '13425-team-picker-bug'
2018-10-11 12:52:48 -07:00
Peter Holmberg
6a35eda862
removed unsused function
2018-10-11 15:55:33 +02:00
Peter Holmberg
8ab2d8b0b9
fix mutability bug, removed unused constructor
2018-10-11 15:32:13 +02:00
Peter Holmberg
02e7d713a1
Added Loading state on org pages
2018-10-11 11:49:34 +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
037e9ad0bd
tests
2018-10-10 17:04:48 +02:00
David Kaltschmidt
dcee0771ad
Initialize Explore datasource correctly
2018-10-10 14:55:41 +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
be7ed3ebca
Upgrade Datasources-picker on Explore page #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
d9434ba1b1
wip: Upgrade react-select #13425
2018-10-10 14:15:25 +02:00
Peter Holmberg
8583788119
disable permissions
2018-10-10 13:50:42 +02:00
