Merge branch '7.x' into backport/7.x/pr-71794

elastic · Jul 15, 2020 · c487739 · c487739
2 parents ca63513 + 8305e62
commit c487739
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 14 deletions.
diff --git a/x-pack/plugins/maps/config.ts b/x-pack/plugins/maps/config.ts
@@ -11,7 +11,6 @@ export interface MapsConfigType {
   showMapVisualizationTypes: boolean;
   showMapsInspectorAdapter: boolean;
   preserveDrawingBuffer: boolean;
-  enableVectorTiles: boolean;
 }
 
 export const configSchema = schema.object({
@@ -21,8 +20,6 @@ export const configSchema = schema.object({
   showMapsInspectorAdapter: schema.boolean({ defaultValue: false }),
   // flag used in functional testing
   preserveDrawingBuffer: schema.boolean({ defaultValue: false }),
-  // flag used to enable/disable vector-tiles
-  enableVectorTiles: schema.boolean({ defaultValue: false }),
 });
 
 export type MapsXPackConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts b/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts
@@ -27,7 +27,6 @@ import { mvtVectorSourceWizardConfig } from '../sources/mvt_single_layer_vector_
 import { ObservabilityLayerWizardConfig } from './solution_layers/observability';
 import { SecurityLayerWizardConfig } from './solution_layers/security';
 import { choroplethLayerWizardConfig } from './choropleth_layer_wizard';
-import { getEnableVectorTiles } from '../../kibana_services';
 
 let registered = false;
 export function registerLayerWizards() {
@@ -60,10 +59,6 @@ export function registerLayerWizards() {
   // @ts-ignore
   registerLayerWizard(wmsLayerWizardConfig);
 
-  if (getEnableVectorTiles()) {
-    // eslint-disable-next-line no-console
-    console.warn('Vector tiles are an experimental feature and should not be used in production.');
-    registerLayerWizard(mvtVectorSourceWizardConfig);
-  }
+  registerLayerWizard(mvtVectorSourceWizardConfig);
   registered = true;
 }
diff --git a/x-pack/plugins/maps/public/kibana_services.d.ts b/x-pack/plugins/maps/public/kibana_services.d.ts
@@ -47,7 +47,6 @@ export function getEnabled(): boolean;
 export function getShowMapVisualizationTypes(): boolean;
 export function getShowMapsInspectorAdapter(): boolean;
 export function getPreserveDrawingBuffer(): boolean;
-export function getEnableVectorTiles(): boolean;
 export function getProxyElasticMapsServiceInMaps(): boolean;
 export function getIsGoldPlus(): boolean;
 

diff --git a/x-pack/plugins/maps/public/kibana_services.js b/x-pack/plugins/maps/public/kibana_services.js
@@ -152,7 +152,6 @@ export const getEnabled = () => getMapAppConfig().enabled;
 export const getShowMapVisualizationTypes = () => getMapAppConfig().showMapVisualizationTypes;
 export const getShowMapsInspectorAdapter = () => getMapAppConfig().showMapsInspectorAdapter;
 export const getPreserveDrawingBuffer = () => getMapAppConfig().preserveDrawingBuffer;
-export const getEnableVectorTiles = () => getMapAppConfig().enableVectorTiles;
 
 // map.* kibana.yml settings from maps_legacy plugin that are shared between OSS map visualizations and maps app
 let kibanaCommonConfig;

diff --git a/x-pack/plugins/maps/server/index.ts b/x-pack/plugins/maps/server/index.ts
@@ -15,7 +15,6 @@ export const config: PluginConfigDescriptor<MapsXPackConfig> = {
     enabled: true,
     showMapVisualizationTypes: true,
     showMapsInspectorAdapter: true,
-    enableVectorTiles: true,
     preserveDrawingBuffer: true,
   },
   schema: configSchema,

diff --git a/...ecurity_solution/public/detections/components/value_lists_management_modal/modal.test.tsx b/...ecurity_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
@@ -11,7 +11,8 @@ import { TestProviders } from '../../../common/mock';
 import { ValueListsModal } from './modal';
 import { waitForUpdates } from '../../../common/utils/test_utils';
 
-describe('ValueListsModal', () => {
+// TODO: These are occasionally timing out
+describe.skip('ValueListsModal', () => {
   it('renders nothing if showModal is false', () => {
     const container = mount(
       <TestProviders>

diff --git a/x-pack/test/functional/apps/monitoring/cluster/overview.js b/x-pack/test/functional/apps/monitoring/cluster/overview.js
@@ -10,7 +10,8 @@ import { getLifecycleMethods } from '../_get_lifecycle_methods';
 export default function ({ getService, getPageObjects }) {
   const overview = getService('monitoringClusterOverview');
 
-  describe('Cluster overview', () => {
+  // https://github.com/elastic/kibana/issues/71796
+  describe.skip('Cluster overview', () => {
     describe('for Green cluster with Gold license', () => {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);