Commit Graph

3245 Commits

Author SHA1 Message Date
Peter Holmberg
cc7bf31c3e Merge remote-tracking branch 'origin/develop' into unit-picker 2018-11-16 16:54:02 +01:00
Torkel Ödegaard
e21a140fcc minor fixes 2018-11-16 07:41:40 +01:00
Torkel Ödegaard
c4ae05c5e5
Merge pull request #14078 from grafana/12759-description-n-links
12759 React-panel: description and links
2018-11-16 06:57:42 +01:00
Peter Holmberg
61a704a64e some progress on groups and options 2018-11-15 17:14:43 +01:00
Torkel Ödegaard
03040159ca Merge branch 'master' into develop 2018-11-15 17:00:03 +01:00
Torkel Ödegaard
f5b63fc65d Merge branch 'master' into develop 2018-11-15 16:56:21 +01:00
Johannes Schill
83073dea2f panel-header: Move the corner information in the panel header to its own component 2018-11-15 16:52:39 +01:00
Johannes Schill
0fa8ae4fac panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-15 14:30:59 +01:00
Marcus Efraimsson
b8539570d0
fix snapshot tests 2018-11-15 14:16:17 +01:00
Torkel Ödegaard
cf0db51659 Trying to reduce the amount of duplication with preferences 2018-11-15 13:37:29 +01:00
Johannes Schill
e73466a80d panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-15 12:47:32 +01:00
Torkel Ödegaard
2ff58d5241 Merge branch 'master' into 12550_team_preferences 2018-11-15 11:29:36 +01:00
Johannes Schill
0a5f920bf5 panel-header: Avoid undefined classNames and use the real panel description 2018-11-14 22:29:10 +01:00
Johannes Schill
e20eea978a panel-header: Display description in modal 2018-11-14 22:18:48 +01:00
Torkel Ödegaard
c0197bcb15 fix: added events to MetricsTabCtrl to closer mimic MetricsPanelCtrl 2018-11-14 16:04:34 +01:00
David
f00f347099
Merge pull request #14033 from grafana/davkal/explore-slow-ds-load
Explore: Dont set datasource in state if navigated away
2018-11-14 14:45:35 +00:00
Torkel Ödegaard
1eecda48f8 Moved query manipulations from metrics controller to metrics tab so they are more easily shared between angular and react panels 2018-11-14 14:40:03 +01:00
Torkel Ödegaard
888eb9d94c fixed panel focus for react panels 2018-11-14 13:31:40 +01:00
Torkel Ödegaard
080d611004 minor changes to react panels 2018-11-14 13:20:19 +01:00
Torkel Ödegaard
604add078b
Merge pull request #14066 from grafana/panel-size-refactor
Panel size refactor
2018-11-14 12:38:21 +01:00
Torkel Ödegaard
6d65432c8a Merge branch 'toggle-panel-menu-withreact' into develop 2018-11-14 12:24:30 +01:00
Torkel Ödegaard
90c41bb087 changed how size is calcualted and propagated and added proper interval calc to DataPanel 2018-11-14 12:03:25 +01:00
Peter Holmberg
e4e41474b1 first stuff 2018-11-14 11:06:02 +01:00
Torkel Ödegaard
dedeaf541e wip panel size handling 2018-11-13 18:50:12 +01:00
Peter Holmberg
655f4d0a8d fixed issue with save. 2018-11-13 18:23:35 +01:00
Peter Holmberg
03cf238fa7 fixed mutability issue in dashboard dropdowns 2018-11-13 18:23:00 +01:00
Torkel Ödegaard
8ad37ea926 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-11-13 17:25:11 +01:00
Peter Holmberg
a9b5cbf381 adced clickoutside wrapper 2018-11-13 17:00:28 +01:00
Torkel Ödegaard
2c6963fc6f Merge branch 'master' of github.com:grafana/grafana into develop 2018-11-13 16:26:46 +01:00
Torkel Ödegaard
6d91e06f4d refactoring back the interval calculation, needs to be different for react panels 2018-11-13 16:01:52 +01:00
Torkel Ödegaard
f026be3790 fix case where timeshift and time override is used 2018-11-13 15:23:13 +01:00
Torkel Ödegaard
f274195d81 wip: refactoring interval and time override handling 2018-11-13 15:05:07 +01:00
Marcus Efraimsson
69a57850c4
restore user profile preferences 2018-11-13 10:22:02 +01:00
Torkel Ödegaard
d49e857bc0 Merge branch 'develop' into 12759-timeshift 2018-11-13 09:56:58 +01:00
Torkel Ödegaard
81a9a3a3c1 Merge branch 'develop' into 12759-timeshift 2018-11-13 08:51:48 +01:00
Torkel Ödegaard
7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard
e331d24a38 removed console.log 2018-11-13 08:11:03 +01:00
Torkel Ödegaard
9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard
9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Mat Schaffer
f6313fe675
Clarify wording of playlist protip
Per discussion on 154fbe2413 (r31238888) it seemed like this wording might be easier to understand.
2018-11-13 14:56:32 +09:00
Marcus Efraimsson
1194ff282e
team preferences ui 2018-11-12 20:58:59 +01:00
David Kaltschmidt
9b48338d95 Explore: Dont set datasource in state if navigated away
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
2018-11-12 18:06:12 +00:00
Torkel Ödegaard
119e94f745 wip: panel plugin not found 2018-11-12 17:54:44 +01:00
Torkel Ödegaard
727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard
e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Torkel Ödegaard
a2a4458923
Merge pull request #14023 from grafana/gauge-panel
React Gauge Panel - first step
2018-11-12 15:58:54 +01:00
Johannes Schill
6d4d7c5032 wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state 2018-11-12 11:38:41 +01:00
Johannes Schill
e045169094 wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg 2018-11-12 11:31:33 +01:00
Johannes Schill
a3f1a1c6b3 wip: panel-header: Remove the TimeData type 2018-11-12 11:31:33 +01:00
Johannes Schill
8117a7559f wip: panel-header: Add proper typings to maxDataPoints and interval + remove code in comment 2018-11-12 11:31:33 +01:00