From e12eadfb205b62137ce28ea9397f37265bab94de Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Tue, 14 Jul 2020 21:20:19 -0500 Subject: [PATCH 1/3] Skip jest tests that timeout waiting for react (#71801) --- .../components/value_lists_management_modal/modal.test.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx index daf1cbd68df91..ab2bc9b2e90e1 100644 --- a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx +++ b/x-pack/plugins/security_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( From 86e7afad0001ffb9ec814627da44310aebe5ef6b Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Tue, 14 Jul 2020 22:34:50 -0400 Subject: [PATCH 2/3] [Maps] Remove .mvt feature flag (#71779) (#71793) The layer wizard to add 3rd party .mvt tiles now shows by default. --- x-pack/plugins/maps/config.ts | 3 --- .../maps/public/classes/layers/load_layer_wizards.ts | 7 +------ x-pack/plugins/maps/public/kibana_services.d.ts | 1 - x-pack/plugins/maps/public/kibana_services.js | 1 - x-pack/plugins/maps/server/index.ts | 1 - 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/x-pack/plugins/maps/config.ts b/x-pack/plugins/maps/config.ts index 8bb0b7551b0e1..b97c09d9b86ba 100644 --- 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; 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 index 9af1684c0bac1..eaef7931b5e6c 100644 --- 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 index d4a7fa5d50af8..974bccf4942f3 100644 --- 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 index 97d7f0c66c629..53e128f94dfb6 100644 --- 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 index a73ba91098e90..19ab532262971 100644 --- a/x-pack/plugins/maps/server/index.ts +++ b/x-pack/plugins/maps/server/index.ts @@ -15,7 +15,6 @@ export const config: PluginConfigDescriptor = { enabled: true, showMapVisualizationTypes: true, showMapsInspectorAdapter: true, - enableVectorTiles: true, preserveDrawingBuffer: true, }, schema: configSchema, From 8305e6203c3eb89240a6c2cf02b5d16054364e2a Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 14 Jul 2020 19:43:44 -0700 Subject: [PATCH 3/3] [test] Skipped monitoring test Signed-off-by: Tyler Smalley --- x-pack/test/functional/apps/monitoring/cluster/overview.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/monitoring/cluster/overview.js b/x-pack/test/functional/apps/monitoring/cluster/overview.js index 0e608e9a055fa..94996d6ab40ab 100644 --- 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);