maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Maps] do not display mapbox style inspector view unless turned on in kibana.yml (#30428)

Browse source 
* [Maps] do not display mapbox style inspector view unless turned on by kibana.yml

* use better name for config name
This commit is contained in:
Nathan Reese 2019-02-08 09:32:48 -07:00 committed by GitHub
parent 3e648084bd
commit 83b24e7e6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/maps/index.js
View file

@ -34,7 +34,8 @@ export function maps(kibana) {
const serverConfig = server.config();
const mapConfig = serverConfig.get('map');
return {
isEmsEnabled: mapConfig.includeElasticMapsService
showMapsInspectorAdapter: serverConfig.get('xpack.maps.showMapsInspectorAdapter'),
isEmsEnabled: mapConfig.includeElasticMapsService,
};
},
inspectorViews: [
@ -52,6 +53,7 @@ export function maps(kibana) {
config(Joi) {
return Joi.object({
enabled: Joi.boolean().default(true),
showMapsInspectorAdapter: Joi.boolean().default(false),
}).default();
},

2
x-pack/plugins/maps/public/components/map/mb/view.js
View file

@ -215,7 +215,7 @@ export class MBMapContainer extends React.Component {
};
_syncMbMapWithInspector = () => {
if (!this.props.isMapReady) {
if (!this.props.isMapReady || !inspectorAdapters.map) {
return;
}

6
x-pack/plugins/maps/public/kibana_services.js
View file

@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import chrome from 'ui/chrome';
import { uiModules } from 'ui/modules';
import { SearchSourceProvider } from 'ui/courier';
import { RequestAdapter } from 'ui/inspector/adapters';
@ -15,10 +16,13 @@ export const timeService = timefilter;
export let indexPatternService;
export let SearchSource;
export let emsServiceSettings;
export const inspectorAdapters = {
requests: new RequestAdapter(),
map: new MapAdapter(),
};
if (chrome.getInjected('showMapsInspectorAdapter', false)) {
inspectorAdapters.map = new MapAdapter();
}
export async function fetchSearchSourceAndRecordWithInspector({ searchSource, requestId, requestName, requestDesc }) {
const inspectorRequest = inspectorAdapters.requests.start(

1
x-pack/test/functional/config.js
View file

@ -159,6 +159,7 @@ export default async function ({ readConfigFile }) {
'--status.allowAnonymous=true',
'--server.uuid=5b2de169-2785-441b-ae8c-186a1936b17d',
'--xpack.xpack_main.telemetry.enabled=false',
'--xpack.maps.showMapsInspectorAdapter=true',
'--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"', // server restarts should not invalidate active sessions
],
},