Skip to content

Commit

Permalink
Merge branch 'main' into RAM-add-maintenance-window-banner
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Aug 15, 2023
2 parents cfcee29 + aef652f commit ffa44c8
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 15 deletions.
3 changes: 3 additions & 0 deletions docs/management/advanced-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ preview:[] Sorts services without anomaly detection rules on the APM Service inv
[[observability-default-service-env]]`observability:apmDefaultServiceEnvironment`::
Set the default environment for the APM app. When left empty, data from all environments will be displayed by default.

[[observability-apm-enable-profiling]]`observability:apmEnableProfilingIntegration`::
Enable the Universal Profiling integration in APM.

[[observability-enable-aws-lambda-metrics]]`observability:enableAwsLambdaMetrics`::
preview:[] Display Amazon Lambda metrics in the service metrics tab.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,28 @@

import { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';

import { OPTIONS_LIST_CONTROL } from '../../../common';
import { ControlOutput } from '../../types';
import { ControlGroupInput } from '../types';
import { pluginServices } from '../../services';
import { DeleteControlAction } from './delete_control_action';
import { OptionsListEmbeddableInput } from '../../options_list';
import { controlGroupInputBuilder } from '../external_api/control_group_input_builder';
import { ControlGroupContainer } from '../embeddable/control_group_container';
import { OptionsListEmbeddableFactory } from '../../options_list/embeddable/options_list_embeddable_factory';
import { OptionsListEmbeddable } from '../../options_list/embeddable/options_list_embeddable';
import { mockedReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public/mocks';

let container: ControlGroupContainer;
let embeddable: OptionsListEmbeddable;

beforeAll(async () => {
pluginServices.getServices().controls.getControlFactory = jest
.fn()
.mockImplementation((type: string) => {
if (type === OPTIONS_LIST_CONTROL) return new OptionsListEmbeddableFactory();
});

const controlGroupInput = { chainingSystem: 'NONE', panels: {} } as ControlGroupInput;
controlGroupInputBuilder.addOptionsListControl(controlGroupInput, {
dataViewId: 'test-data-view',
Expand All @@ -34,6 +42,7 @@ beforeAll(async () => {
await container.untilInitialized();

embeddable = container.getChild(container.getChildIds()[0]);
expect(embeddable.type).toBe(OPTIONS_LIST_CONTROL);
});

test('Action is incompatible with Error Embeddables', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';

import { OPTIONS_LIST_CONTROL } from '../../../common';
import { ControlOutput } from '../../types';
import { ControlGroupInput } from '../types';
import { pluginServices } from '../../services';
Expand Down Expand Up @@ -55,13 +56,14 @@ test('Action is compatible with embeddables that are editable', async () => {
const editControlAction = new EditControlAction(deleteControlAction);
const emptyContainer = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
await emptyContainer.untilInitialized();
await emptyContainer.addOptionsListControl({
const control = await emptyContainer.addOptionsListControl({
dataViewId: 'test-data-view',
title: 'test',
fieldName: 'test-field',
width: 'medium',
grow: false,
});
expect(emptyContainer.getInput().panels[control.getInput().id].type).toBe(OPTIONS_LIST_CONTROL);

expect(
await editControlAction.isCompatible({
Expand All @@ -88,18 +90,16 @@ test('Execute should open a flyout', async () => {

const emptyContainer = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
await emptyContainer.untilInitialized();
await emptyContainer.addOptionsListControl({
const control = (await emptyContainer.addOptionsListControl({
dataViewId: 'test-data-view',
title: 'test',
fieldName: 'test-field',
width: 'medium',
grow: false,
});
const embeddable: OptionsListEmbeddable = emptyContainer.getChild(
emptyContainer.getChildIds()[0]
);
})) as OptionsListEmbeddable;
expect(emptyContainer.getInput().panels[control.getInput().id].type).toBe(OPTIONS_LIST_CONTROL);

const editControlAction = new EditControlAction(deleteControlAction);
await editControlAction.execute({ embeddable });
await editControlAction.execute({ embeddable: control });
expect(spyOn).toHaveBeenCalled();
});
3 changes: 2 additions & 1 deletion test/functional/apps/discover/group2/_sql_view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'discover:enableSql': true,
};

describe('discover sql view', async function () {
// Failing: See https://github.com/elastic/kibana/issues/159194
describe.skip('discover sql view', async function () {
before(async () => {
await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
log.debug('load kibana index with default index pattern');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { waitForFleetSetup } from './helpers';

const logFilePath = path.join(__dirname, 'logs.log');

describe('fleet usage telemetry', () => {
// Failing ES promotion: https://github.com/elastic/kibana/issues/156245
describe.skip('fleet usage telemetry', () => {
let core: any;
let esServer: TestElasticsearchUtils;
let kbnServer: TestKibanaUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export const reportingScreenshotShareProvider = ({
let capabilityHasDashboardScreenshotReporting = false;
let capabilityHasVisualizeScreenshotReporting = false;
if (usesUiCapabilities) {
// TODO: add abstractions in ExportTypeRegistry to use here?
capabilityHasDashboardScreenshotReporting =
application.capabilities.dashboard?.generateScreenshot === true;
capabilityHasVisualizeScreenshotReporting =
Expand All @@ -106,7 +105,11 @@ export const reportingScreenshotShareProvider = ({
return [];
}

if (isSupportedType && !capabilityHasVisualizeScreenshotReporting) {
if (
isSupportedType &&
!capabilityHasVisualizeScreenshotReporting &&
!capabilityHasDashboardScreenshotReporting
) {
return [];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { UptimeUrlParams } from '../../../lib/helper/url_params';
const SAMPLE_ES_FILTERS = `{"bool":{"should":[{"match_phrase":{"monitor.id":"NodeServer"}}],"minimum_should_match":1}}`;

// FLAKY: https://github.com/elastic/kibana/issues/112677
describe.skip('useQueryBar', () => {
describe('useQueryBar', () => {
let DEFAULT_URL_PARAMS: UptimeUrlParams;
let wrapper: any;
let useUrlParamsSpy: jest.SpyInstance<[URL.GetUrlParams, URL.UpdateUrlParams]>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default ({ getPageObjects }: FtrProviderContext) => {
const PageObjects = getPageObjects(['common', 'findings', 'header']);

describe('Findings Page onboarding', function () {
// Failing: See https://github.com/elastic/kibana/issues/163950
describe.skip('Findings Page onboarding', function () {
this.tags(['cloud_security_posture_findings_onboarding']);
let findings: typeof PageObjects.findings;
let notInstalledVulnerabilities: typeof findings.notInstalledVulnerabilities;
Expand Down
6 changes: 4 additions & 2 deletions x-pack/test/functional/apps/lens/group4/tsdb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
log.info(`Indexed ${res.items.length} test data docs.`);
};

describe('lens tsdb', function () {
// Failing ES promotion: https://github.com/elastic/kibana/issues/163970
describe.skip('lens tsdb', function () {
const tsdbIndex = 'kibana_sample_data_logstsdb';
const tsdbDataView = tsdbIndex;
const tsdbEsArchive = 'test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb';
Expand Down Expand Up @@ -384,7 +385,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});

describe('for rolled up metric (downsampled)', () => {
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/163971
describe.skip('for rolled up metric (downsampled)', () => {
it('defaults to average for rolled up metric', async () => {
await PageObjects.lens.switchDataPanelIndexPattern(downsampleDataView.dataView);
await PageObjects.lens.removeLayer();
Expand Down

0 comments on commit ffa44c8

Please sign in to comment.