enable goto explore from query panel editor for all datasources

This commit is contained in:
Erik Sundell 2018-12-17 16:44:57 +01:00
parent 3efaf52049
commit 18b39967fc
2 changed files with 13 additions and 11 deletions

View File

@ -57,12 +57,19 @@ export async function getExploreUrl(
} }
} }
if (exploreDatasource && exploreDatasource.meta.explore) { if (panelDatasource) {
const range = timeSrv.timeRangeForUrl(); const range = timeSrv.timeRangeForUrl();
const state = { let state: Partial<ExploreUrlState> = { range };
...exploreDatasource.getExploreState(exploreTargets), if (exploreDatasource.getExploreState) {
range, state = { ...state, ...exploreDatasource.getExploreState(exploreTargets) };
}; } else {
state = {
...state,
datasource: panelDatasource.name,
queries: exploreTargets.map(t => ({ ...t, datasource: panelDatasource.name })),
};
}
const exploreState = JSON.stringify(state); const exploreState = JSON.stringify(state);
url = renderUrl('/explore', { state: exploreState }); url = renderUrl('/explore', { state: exploreState });
} }

View File

@ -233,12 +233,7 @@ class MetricsPanelCtrl extends PanelCtrl {
getAdditionalMenuItems() { getAdditionalMenuItems() {
const items = []; const items = [];
if ( if (config.exploreEnabled && this.contextSrv.isEditor && this.datasource) {
config.exploreEnabled &&
this.contextSrv.isEditor &&
this.datasource &&
(this.datasource.meta.explore || this.datasource.meta.id === 'mixed')
) {
items.push({ items.push({
text: 'Explore', text: 'Explore',
click: 'ctrl.explore();', click: 'ctrl.explore();',