Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-71791
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jul 15, 2020
2 parents 97fd0fd + 44b534c commit 8a765c3
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 25 deletions.
3 changes: 0 additions & 3 deletions x-pack/plugins/maps/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export interface MapsConfigType {
showMapVisualizationTypes: boolean;
showMapsInspectorAdapter: boolean;
preserveDrawingBuffer: boolean;
enableVectorTiles: boolean;
}

export const configSchema = schema.object({
Expand All @@ -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>;
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion x-pack/plugins/maps/public/kibana_services.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/maps/public/kibana_services.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/maps/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export const config: PluginConfigDescriptor<MapsXPackConfig> = {
enabled: true,
showMapVisualizationTypes: true,
showMapsInspectorAdapter: true,
enableVectorTiles: true,
preserveDrawingBuffer: true,
},
schema: configSchema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/fleet/agent_flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function (providerContext: FtrProviderContext) {
const supertestWithoutAuth = getSupertestWithoutAuth(providerContext);
const esClient = getService('es');

describe.skip('fleet_agent_flow', () => {
describe('fleet_agent_flow', () => {
before(async () => {
await esArchiver.load('empty_kibana');
});
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/api_integration/apis/fleet/agents/enroll.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ export default function (providerContext: FtrProviderContext) {
let apiKey: { id: string; api_key: string };
let kibanaVersion: string;

// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('fleet_agents_enroll', () => {
describe('fleet_agents_enroll', () => {
before(async () => {
await esArchiver.loadIfNeeded('fleet/agents');

Expand Down
4 changes: 3 additions & 1 deletion x-pack/test/api_integration/apis/fleet/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
*/

export default function loadTests({ loadTestFile }) {
describe('Fleet Endpoints', () => {
// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('Fleet Endpoints', () => {
loadTestFile(require.resolve('./setup'));
loadTestFile(require.resolve('./delete_agent'));
loadTestFile(require.resolve('./list_agent'));
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/api_integration/apis/fleet/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const es = getService('es');

// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('fleet_setup', () => {
describe('fleet_setup', () => {
beforeEach(async () => {
try {
await es.security.deleteUser({
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/api_integration/apis/fleet/unenroll_agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ export default function (providerContext: FtrProviderContext) {
const supertest = getService('supertest');
const esClient = getService('es');

// Temporarily skipped to promote snapshot: https://github.com/elastic/kibana/issues/68587
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('fleet_unenroll_agent', () => {
describe('fleet_unenroll_agent', () => {
let accessAPIKeyId: string;
let outputAPIKeyId: string;
before(async () => {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/test/functional/apps/monitoring/cluster/overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 8a765c3

Please sign in to comment.