Torkel Ödegaard
|
f5b63fc65d
|
Merge branch 'master' into develop
|
2018-11-15 16:56:21 +01:00 |
|
Torkel Ödegaard
|
330a5c6496
|
minor panel options type fix
|
2018-11-14 12:03:05 -08:00 |
|
Marcus Efraimsson
|
b47a4954c9
|
Merge pull request #14074 from stop-cran/feature/14072
elasticsearch: do not set a placeholder to index name, if it's already specified
|
2018-11-14 09:21:15 -08:00 |
|
Marcus Efraimsson
|
0cba6da2b0
|
update changelog
[skip ci]
|
2018-11-14 18:16:41 +01:00 |
|
Marcus Efraimsson
|
75bc9b315d
|
changelog: add notes about closing #11977
[skip ci]
|
2018-11-14 18:15:02 +01:00 |
|
Marcus Efraimsson
|
2ae3b97299
|
changelog: add notes about closing #6367
[skip ci]
|
2018-11-14 18:12:46 +01:00 |
|
stop-cran
|
20214b3d6a
|
[elasticsearch] Do not set a placeholder to index name, if it's already specified.
|
2018-11-14 18:45:18 +02:00 |
|
Torkel Ödegaard
|
0a080149ae
|
Merge pull request #14054 from marefr/6367_raw_document_reset
Fix switching from es raw document metric breaks query editor
|
2018-11-14 16:46:47 +01:00 |
|
Torkel Ödegaard
|
fade3c47ca
|
Merge pull request #14071 from grafana/react-panels-query-editor-fixes
React panels query editor fixes
|
2018-11-14 16:37:50 +01:00 |
|
Torkel Ödegaard
|
c0197bcb15
|
fix: added events to MetricsTabCtrl to closer mimic MetricsPanelCtrl
|
2018-11-14 16:04:34 +01:00 |
|
David
|
19b3578bdd
|
Merge pull request #14048 from grafana/davkal/explore-table-pagination-styles
Explore: Fix table pagination styles
|
2018-11-14 14:45:51 +00: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
|
ebc5b3e693
|
minor css change
|
2018-11-14 15:17:28 +01:00 |
|
Torkel Ödegaard
|
18308bf584
|
Merge pull request #14069 from grafana/panel-focus-in-react
Panel focus in react
|
2018-11-14 14:40:18 +01: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
|
3ce7197c8e
|
Merge pull request #14067 from grafana/react-panels-minor-changes
minor changes to react panels
|
2018-11-14 13:30:45 +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 |
|
bergquist
|
aa340b9099
|
changelog: adds note about closing #14043
|
2018-11-14 11:30:19 +01:00 |
|
Torkel Ödegaard
|
dedeaf541e
|
wip panel size handling
|
2018-11-13 18:50:12 +01:00 |
|
Torkel Ödegaard
|
8ad37ea926
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2018-11-13 17:25:11 +01:00 |
|
Torkel Ödegaard
|
b530b9ce7f
|
Merge branch 'master' into develop
|
2018-11-13 17:24:51 +01:00 |
|
Torkel Ödegaard
|
f50dc4e99d
|
Merge pull request #14053 from grafana/singlestat-fix
fixed singlestat guage ceneterd dot rendering issue
|
2018-11-13 17:23:46 +01:00 |
|
Peter Holmberg
|
a9b5cbf381
|
adced clickoutside wrapper
|
2018-11-13 17:00:28 +01:00 |
|
Torkel Ödegaard
|
b5921ef287
|
fixed singlestat guage ceneterd dot rendering issue
|
2018-11-13 16:51:33 +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
|
51a95963f3
|
Merge pull request #14020 from grafana/12759-timeshift
12759 timeshift and panelTimeOverrides
|
2018-11-13 16:26:30 +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 |
|
Carl Bergquist
|
81a5b90022
|
Merge pull request #14043 from bergquist/upgrade_macaron_session
Upgrades the go-macaroon package
|
2018-11-13 14:42:06 +01:00 |
|
bergquist
|
a0496d554a
|
updates latest to 5.3.4
|
2018-11-13 14:04:28 +01:00 |
|
bergquist
|
3a672c6dc2
|
changelod: add release date for 5.3.3 and 5.3.4
|
2018-11-13 13:58:35 +01:00 |
|
David Kaltschmidt
|
7627de80f2
|
Explore: Fix table pagination styles
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
|
2018-11-13 11:00:32 +00:00 |
|
Marcus Efraimsson
|
aa47f80fd8
|
Merge pull request #14042 from grafana/restore_prefs_control
Restore user profile preferences
|
2018-11-13 01:42:51 -08:00 |
|
bergquist
|
5954ab2c0d
|
adds redis devenv block
|
2018-11-13 10:27:57 +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
|
700c9642db
|
Merge pull request #14039 from grafana/minor-react-panels-refactor
minor react panels refafactor
|
2018-11-13 09:55:48 +01:00 |
|
Marcus Efraimsson
|
97c6f3560c
|
changelog: add notes about closing #13328 #13949
[skip ci]
|
2018-11-13 09:44:35 +01:00 |
|
bergquist
|
d5555f123f
|
updates macaron session package
|
2018-11-13 09:41:36 +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
|
6b2a47f2af
|
Merge pull request #14038 from grafana/plugin-not-found
Plugin not found
|
2018-11-13 08:25:47 +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 |
|