From cf6413ab2f97493a808ebd16f2a29ed6a5fc75a5 Mon Sep 17 00:00:00 2001 From: Marta Bondyra Date: Wed, 5 Aug 2020 18:25:16 +0200 Subject: [PATCH 01/21] [Lens] fix chart switching when on VisualizationDimensionEditor (#70689) --- .../config_panel/layer_panel.test.tsx | 75 ++++++++++++++++--- .../editor_frame/config_panel/layer_panel.tsx | 37 +++++---- 2 files changed, 82 insertions(+), 30 deletions(-) diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx index 9545bd3c840da30..b100c885466ab7c 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx @@ -24,6 +24,7 @@ jest.mock('../../../id_generator'); describe('LayerPanel', () => { let mockVisualization: jest.Mocked; + let mockVisualization2: jest.Mocked; let mockDatasource: DatasourceMock; function getDefaultProps() { @@ -36,6 +37,7 @@ describe('LayerPanel', () => { activeVisualizationId: 'vis1', visualizationMap: { vis1: mockVisualization, + vis2: mockVisualization2, }, activeDatasourceId: 'ds1', datasourceMap: { @@ -72,6 +74,18 @@ describe('LayerPanel', () => { ], }; + mockVisualization2 = { + ...createMockVisualization(), + id: 'testVis2', + visualizationTypes: [ + { + icon: 'empty', + id: 'testVis2', + label: 'TEST2', + }, + ], + }; + mockVisualization.getLayerIds.mockReturnValue(['first']); mockDatasource = createMockDatasource('ds1'); }); @@ -209,16 +223,6 @@ describe('LayerPanel', () => { const panel = mount(group.prop('panel')); expect(panel.find('EuiTabbedContent').prop('tabs')).toHaveLength(2); - act(() => { - panel.find('EuiTab#visualization').simulate('click'); - }); - expect(mockVisualization.renderDimensionEditor).toHaveBeenCalledWith( - expect.any(Element), - expect.objectContaining({ - groupId: 'a', - accessor: 'newid', - }) - ); }); it('should keep the popover open when configuring a new dimension', () => { @@ -267,5 +271,56 @@ describe('LayerPanel', () => { expect(component.find(EuiPopover).prop('isOpen')).toBe(true); }); + it('should close the popover when the active visualization changes', () => { + /** + * The ID generation system for new dimensions has been messy before, so + * this tests that the ID used in the first render is used to keep the popover + * open in future renders + */ + + (generateId as jest.Mock).mockReturnValueOnce(`newid`); + (generateId as jest.Mock).mockReturnValueOnce(`bad`); + mockVisualization.getConfiguration.mockReturnValueOnce({ + groups: [ + { + groupLabel: 'A', + groupId: 'a', + accessors: [], + filterOperations: () => true, + supportsMoreColumns: true, + dataTestSubj: 'lnsGroup', + }, + ], + }); + // Normally the configuration would change in response to a state update, + // but this test is updating it directly + mockVisualization.getConfiguration.mockReturnValueOnce({ + groups: [ + { + groupLabel: 'A', + groupId: 'a', + accessors: ['newid'], + filterOperations: () => true, + supportsMoreColumns: false, + dataTestSubj: 'lnsGroup', + }, + ], + }); + + const component = mountWithIntl(); + + const group = component.find('DimensionPopover'); + const triggerButton = mountWithIntl(group.prop('trigger')); + act(() => { + triggerButton.find('[data-test-subj="lns-empty-dimension"]').first().simulate('click'); + }); + component.update(); + expect(component.find(EuiPopover).prop('isOpen')).toBe(true); + act(() => { + component.setProps({ activeVisualizationId: 'vis2' }); + }); + component.update(); + expect(component.find(EuiPopover).prop('isOpen')).toBe(false); + }); }); }); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx index f72b1429967d25c..a384e339e8fbdbd 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import React, { useContext, useState } from 'react'; +import React, { useContext, useState, useEffect } from 'react'; import { EuiPanel, EuiSpacer, @@ -26,6 +26,13 @@ import { generateId } from '../../../id_generator'; import { ConfigPanelWrapperProps, DimensionPopoverState } from './types'; import { DimensionPopover } from './dimension_popover'; +const initialPopoverState = { + isOpen: false, + openId: null, + addingToGroupId: null, + tabId: null, +}; + export function LayerPanel( props: Exclude & { layerId: string; @@ -41,15 +48,15 @@ export function LayerPanel( } ) { const dragDropContext = useContext(DragContext); - const [popoverState, setPopoverState] = useState({ - isOpen: false, - openId: null, - addingToGroupId: null, - tabId: null, - }); + const [popoverState, setPopoverState] = useState(initialPopoverState); const { framePublicAPI, layerId, isOnlyLayer, onRemoveLayer } = props; const datasourcePublicAPI = framePublicAPI.datasourceLayers[layerId]; + + useEffect(() => { + setPopoverState(initialPopoverState); + }, [props.activeVisualizationId]); + if ( !datasourcePublicAPI || !props.activeVisualizationId || @@ -243,12 +250,7 @@ export function LayerPanel( suggestedPriority: group.suggestedPriority, togglePopover: () => { if (popoverState.isOpen) { - setPopoverState({ - isOpen: false, - openId: null, - addingToGroupId: null, - tabId: null, - }); + setPopoverState(initialPopoverState); } else { setPopoverState({ isOpen: true, @@ -264,7 +266,7 @@ export function LayerPanel( panel={ t.id === popoverState.tabId)} + selectedTab={tabs.find((t) => t.id === popoverState.tabId) || tabs[0]} size="s" onTabClick={(tab) => { setPopoverState({ @@ -358,12 +360,7 @@ export function LayerPanel( })} onClick={() => { if (popoverState.isOpen) { - setPopoverState({ - isOpen: false, - openId: null, - addingToGroupId: null, - tabId: null, - }); + setPopoverState(initialPopoverState); } else { setPopoverState({ isOpen: true, From 5c770e5930f3302ded04a62d4f3f0125bb4ce7fb Mon Sep 17 00:00:00 2001 From: Gidi Meir Morris Date: Wed, 5 Aug 2020 17:35:38 +0100 Subject: [PATCH 02/21] [Task Manager] Correctly handle `running` tasks when calling RunNow and reduce flakiness in related tests (#73244) This PR addresses two issues which caused several tests to be flaky in TM. When `runNow` was introduced to TM we added a pinned query which returned specific tasks by ID. This query does not have the filter applied to it which causes task to return when they're already marked as `running` but we didn't address these correctly which caused flakyness in the tests. This didn't cause a broken beahviour, but it did cause beahviour that was hard to reason about - we now address them correctly. It seems that sometimes, especially if the ES queue is overworked, it can take some time for the update to the underlying task to be visible (we don't user `refresh:true` on purpose), so adding a wait for the index to refresh to make sure the task is updated in time for the next stage of the test. --- x-pack/plugins/alerts/server/alerts_client.ts | 17 ++- .../task_manager/server/task_events.ts | 6 +- .../task_manager/server/task_manager.test.ts | 31 ++-- .../task_manager/server/task_manager.ts | 104 +++++++------ .../task_manager/server/task_store.test.ts | 142 +++++++++++++++--- .../plugins/task_manager/server/task_store.ts | 37 ++++- .../task_manager_fixture/server/plugin.ts | 20 ++- .../sample_task_plugin/server/init_routes.ts | 15 ++ .../task_manager/task_manager_integration.js | 34 ++++- 9 files changed, 316 insertions(+), 90 deletions(-) diff --git a/x-pack/plugins/alerts/server/alerts_client.ts b/x-pack/plugins/alerts/server/alerts_client.ts index 256cae24e519f3c..dd66ccc7a0256d5 100644 --- a/x-pack/plugins/alerts/server/alerts_client.ts +++ b/x-pack/plugins/alerts/server/alerts_client.ts @@ -387,11 +387,18 @@ export class AlertsClient { updateResult.scheduledTaskId && !isEqual(alertSavedObject.attributes.schedule, updateResult.schedule) ) { - this.taskManager.runNow(updateResult.scheduledTaskId).catch((err: Error) => { - this.logger.error( - `Alert update failed to run its underlying task. TaskManager runNow failed with Error: ${err.message}` - ); - }); + this.taskManager + .runNow(updateResult.scheduledTaskId) + .then(() => { + this.logger.debug( + `Alert update has rescheduled the underlying task: ${updateResult.scheduledTaskId}` + ); + }) + .catch((err: Error) => { + this.logger.error( + `Alert update failed to run its underlying task. TaskManager runNow failed with Error: ${err.message}` + ); + }); } })(), ]); diff --git a/x-pack/plugins/task_manager/server/task_events.ts b/x-pack/plugins/task_manager/server/task_events.ts index b17a3636c173001..e1dd85f868cdd27 100644 --- a/x-pack/plugins/task_manager/server/task_events.ts +++ b/x-pack/plugins/task_manager/server/task_events.ts @@ -4,6 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Option } from 'fp-ts/lib/Option'; + import { ConcreteTaskInstance } from './task'; import { Result, Err } from './lib/result_type'; @@ -22,7 +24,7 @@ export interface TaskEvent { } export type TaskMarkRunning = TaskEvent; export type TaskRun = TaskEvent; -export type TaskClaim = TaskEvent; +export type TaskClaim = TaskEvent>; export type TaskRunRequest = TaskEvent; export function asTaskMarkRunningEvent( @@ -46,7 +48,7 @@ export function asTaskRunEvent(id: string, event: Result + event: Result> ): TaskClaim { return { id, diff --git a/x-pack/plugins/task_manager/server/task_manager.test.ts b/x-pack/plugins/task_manager/server/task_manager.test.ts index 80215ffa7abbad8..7035971ad606108 100644 --- a/x-pack/plugins/task_manager/server/task_manager.test.ts +++ b/x-pack/plugins/task_manager/server/task_manager.test.ts @@ -7,6 +7,7 @@ import _ from 'lodash'; import sinon from 'sinon'; import { Subject } from 'rxjs'; +import { none } from 'fp-ts/lib/Option'; import { asTaskMarkRunningEvent, @@ -297,7 +298,9 @@ describe('TaskManager', () => { events$.next(asTaskMarkRunningEvent(id, asOk(task))); events$.next(asTaskRunEvent(id, asErr(new Error('some thing gone wrong')))); - return expect(result).rejects.toEqual(new Error('some thing gone wrong')); + return expect(result).rejects.toMatchInlineSnapshot( + `[Error: Failed to run task "01ddff11-e88a-4d13-bc4e-256164e755e2": Error: some thing gone wrong]` + ); }); test('rejects when the task mark as running fails', () => { @@ -311,7 +314,9 @@ describe('TaskManager', () => { events$.next(asTaskClaimEvent(id, asOk(task))); events$.next(asTaskMarkRunningEvent(id, asErr(new Error('some thing gone wrong')))); - return expect(result).rejects.toEqual(new Error('some thing gone wrong')); + return expect(result).rejects.toMatchInlineSnapshot( + `[Error: Failed to run task "01ddff11-e88a-4d13-bc4e-256164e755e2": Error: some thing gone wrong]` + ); }); test('when a task claim fails we ensure the task exists', async () => { @@ -321,7 +326,7 @@ describe('TaskManager', () => { const result = awaitTaskRunResult(id, events$, getLifecycle); - events$.next(asTaskClaimEvent(id, asErr(new Error('failed to claim')))); + events$.next(asTaskClaimEvent(id, asErr(none))); await expect(result).rejects.toEqual( new Error(`Failed to run task "${id}" as it does not exist`) @@ -337,7 +342,7 @@ describe('TaskManager', () => { const result = awaitTaskRunResult(id, events$, getLifecycle); - events$.next(asTaskClaimEvent(id, asErr(new Error('failed to claim')))); + events$.next(asTaskClaimEvent(id, asErr(none))); await expect(result).rejects.toEqual( new Error(`Failed to run task "${id}" as it is currently running`) @@ -353,7 +358,7 @@ describe('TaskManager', () => { const result = awaitTaskRunResult(id, events$, getLifecycle); - events$.next(asTaskClaimEvent(id, asErr(new Error('failed to claim')))); + events$.next(asTaskClaimEvent(id, asErr(none))); await expect(result).rejects.toEqual( new Error(`Failed to run task "${id}" as it is currently running`) @@ -386,9 +391,11 @@ describe('TaskManager', () => { const result = awaitTaskRunResult(id, events$, getLifecycle); - events$.next(asTaskClaimEvent(id, asErr(new Error('failed to claim')))); + events$.next(asTaskClaimEvent(id, asErr(none))); - await expect(result).rejects.toEqual(new Error('failed to claim')); + await expect(result).rejects.toMatchInlineSnapshot( + `[Error: Failed to run task "01ddff11-e88a-4d13-bc4e-256164e755e2" for unknown reason (Current Task Lifecycle is "idle")]` + ); expect(getLifecycle).toHaveBeenCalledWith(id); }); @@ -400,9 +407,11 @@ describe('TaskManager', () => { const result = awaitTaskRunResult(id, events$, getLifecycle); - events$.next(asTaskClaimEvent(id, asErr(new Error('failed to claim')))); + events$.next(asTaskClaimEvent(id, asErr(none))); - await expect(result).rejects.toEqual(new Error('failed to claim')); + await expect(result).rejects.toMatchInlineSnapshot( + `[Error: Failed to run task "01ddff11-e88a-4d13-bc4e-256164e755e2" for unknown reason (Current Task Lifecycle is "failed")]` + ); expect(getLifecycle).toHaveBeenCalledWith(id); }); @@ -424,7 +433,9 @@ describe('TaskManager', () => { events$.next(asTaskRunEvent(id, asErr(new Error('some thing gone wrong')))); - return expect(result).rejects.toEqual(new Error('some thing gone wrong')); + return expect(result).rejects.toMatchInlineSnapshot( + `[Error: Failed to run task "01ddff11-e88a-4d13-bc4e-256164e755e2": Error: some thing gone wrong]` + ); }); }); }); diff --git a/x-pack/plugins/task_manager/server/task_manager.ts b/x-pack/plugins/task_manager/server/task_manager.ts index 35ca439bb913057..7165fd28678c163 100644 --- a/x-pack/plugins/task_manager/server/task_manager.ts +++ b/x-pack/plugins/task_manager/server/task_manager.ts @@ -9,13 +9,14 @@ import { filter } from 'rxjs/operators'; import { performance } from 'perf_hooks'; import { pipe } from 'fp-ts/lib/pipeable'; -import { Option, some, map as mapOptional } from 'fp-ts/lib/Option'; +import { Option, some, map as mapOptional, getOrElse } from 'fp-ts/lib/Option'; + import { SavedObjectsSerializer, ILegacyScopedClusterClient, ISavedObjectsRepository, } from '../../../../src/core/server'; -import { Result, asErr, either, map, mapErr, promiseResult } from './lib/result_type'; +import { Result, asOk, asErr, either, map, mapErr, promiseResult } from './lib/result_type'; import { TaskManagerConfig } from './config'; import { Logger } from './types'; @@ -405,7 +406,9 @@ export async function claimAvailableTasks( if (docs.length !== claimedTasks) { logger.warn( - `[Task Ownership error]: (${claimedTasks}) tasks were claimed by Kibana, but (${docs.length}) tasks were fetched` + `[Task Ownership error]: ${claimedTasks} tasks were claimed by Kibana, but ${ + docs.length + } task(s) were fetched (${docs.map((doc) => doc.id).join(', ')})` ); } return docs; @@ -437,48 +440,65 @@ export async function awaitTaskRunResult( // listen for all events related to the current task .pipe(filter(({ id }: TaskLifecycleEvent) => id === taskId)) .subscribe((taskEvent: TaskLifecycleEvent) => { - either( - taskEvent.event, - (taskInstance: ConcreteTaskInstance) => { - // resolve if the task has run sucessfully - if (isTaskRunEvent(taskEvent)) { - subscription.unsubscribe(); - resolve({ id: taskInstance.id }); - } - }, - async (error: Error) => { + if (isTaskClaimEvent(taskEvent)) { + mapErr(async (error: Option) => { // reject if any error event takes place for the requested task subscription.unsubscribe(); - if (isTaskRunRequestEvent(taskEvent)) { - return reject( - new Error( - `Failed to run task "${taskId}" as Task Manager is at capacity, please try again later` - ) - ); - } else if (isTaskClaimEvent(taskEvent)) { - reject( - map( - // if the error happened in the Claim phase - we try to provide better insight - // into why we failed to claim by getting the task's current lifecycle status - await promiseResult(getLifecycle(taskId)), - (taskLifecycleStatus: TaskLifecycle) => { - if (taskLifecycleStatus === TaskLifecycleResult.NotFound) { - return new Error(`Failed to run task "${taskId}" as it does not exist`); - } else if ( - taskLifecycleStatus === TaskStatus.Running || - taskLifecycleStatus === TaskStatus.Claiming - ) { - return new Error(`Failed to run task "${taskId}" as it is currently running`); - } - return error; - }, - () => error - ) - ); + return reject( + map( + await pipe( + error, + mapOptional(async (taskReturnedBySweep) => asOk(taskReturnedBySweep.status)), + getOrElse(() => + // if the error happened in the Claim phase - we try to provide better insight + // into why we failed to claim by getting the task's current lifecycle status + promiseResult(getLifecycle(taskId)) + ) + ), + (taskLifecycleStatus: TaskLifecycle) => { + if (taskLifecycleStatus === TaskLifecycleResult.NotFound) { + return new Error(`Failed to run task "${taskId}" as it does not exist`); + } else if ( + taskLifecycleStatus === TaskStatus.Running || + taskLifecycleStatus === TaskStatus.Claiming + ) { + return new Error(`Failed to run task "${taskId}" as it is currently running`); + } + return new Error( + `Failed to run task "${taskId}" for unknown reason (Current Task Lifecycle is "${taskLifecycleStatus}")` + ); + }, + (getLifecycleError: Error) => + new Error( + `Failed to run task "${taskId}" and failed to get current Status:${getLifecycleError}` + ) + ) + ); + }, taskEvent.event); + } else { + either>( + taskEvent.event, + (taskInstance: ConcreteTaskInstance) => { + // resolve if the task has run sucessfully + if (isTaskRunEvent(taskEvent)) { + subscription.unsubscribe(); + resolve({ id: taskInstance.id }); + } + }, + async (error: Error | Option) => { + // reject if any error event takes place for the requested task + subscription.unsubscribe(); + if (isTaskRunRequestEvent(taskEvent)) { + return reject( + new Error( + `Failed to run task "${taskId}" as Task Manager is at capacity, please try again later` + ) + ); + } + return reject(new Error(`Failed to run task "${taskId}": ${error}`)); } - return reject(error); - } - ); + ); + } }); }); } diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts index 771b4e2d7d9cb6a..d65c39f4f454d67 100644 --- a/x-pack/plugins/task_manager/server/task_store.test.ts +++ b/x-pack/plugins/task_manager/server/task_store.test.ts @@ -8,6 +8,7 @@ import _ from 'lodash'; import sinon from 'sinon'; import uuid from 'uuid'; import { filter } from 'rxjs/operators'; +import { Option, some, none } from 'fp-ts/lib/Option'; import { TaskDictionary, @@ -972,7 +973,7 @@ if (doc['task.runAt'].size()!=0) { const runAt = new Date(); const tasks = [ { - _id: 'aaa', + _id: 'claimed-by-id', _source: { type: 'task', task: { @@ -980,7 +981,7 @@ if (doc['task.runAt'].size()!=0) { taskType: 'foo', schedule: undefined, attempts: 0, - status: 'idle', + status: 'claiming', params: '{ "hello": "world" }', state: '{ "baby": "Henhen" }', user: 'jimbo', @@ -996,7 +997,31 @@ if (doc['task.runAt'].size()!=0) { sort: ['a', 1], }, { - _id: 'bbb', + _id: 'claimed-by-schedule', + _source: { + type: 'task', + task: { + runAt, + taskType: 'bar', + schedule: { interval: '5m' }, + attempts: 2, + status: 'claiming', + params: '{ "shazm": 1 }', + state: '{ "henry": "The 8th" }', + user: 'dabo', + scope: ['reporting', 'ceo'], + ownerId: taskManagerId, + startedAt: null, + retryAt: null, + scheduledAt: new Date(), + }, + }, + _seq_no: 3, + _primary_term: 4, + sort: ['b', 2], + }, + { + _id: 'already-running', _source: { type: 'task', task: { @@ -1045,19 +1070,24 @@ if (doc['task.runAt'].size()!=0) { }); const sub = store.events - .pipe(filter((event: TaskEvent) => event.id === 'aaa')) + .pipe( + filter( + (event: TaskEvent>) => + event.id === 'claimed-by-id' + ) + ) .subscribe({ - next: (event: TaskEvent) => { + next: (event: TaskEvent>) => { expect(event).toMatchObject( asTaskClaimEvent( - 'aaa', + 'claimed-by-id', asOk({ - id: 'aaa', + id: 'claimed-by-id', runAt, taskType: 'foo', schedule: undefined, attempts: 0, - status: 'idle' as TaskStatus, + status: 'claiming' as TaskStatus, params: { hello: 'world' }, state: { baby: 'Henhen' }, user: 'jimbo', @@ -1075,7 +1105,7 @@ if (doc['task.runAt'].size()!=0) { }); await store.claimAvailableTasks({ - claimTasksById: ['aaa'], + claimTasksById: ['claimed-by-id'], claimOwnershipUntil: new Date(), size: 10, }); @@ -1102,19 +1132,24 @@ if (doc['task.runAt'].size()!=0) { }); const sub = store.events - .pipe(filter((event: TaskEvent) => event.id === 'bbb')) + .pipe( + filter( + (event: TaskEvent>) => + event.id === 'claimed-by-schedule' + ) + ) .subscribe({ - next: (event: TaskEvent) => { + next: (event: TaskEvent>) => { expect(event).toMatchObject( asTaskClaimEvent( - 'bbb', + 'claimed-by-schedule', asOk({ - id: 'bbb', + id: 'claimed-by-schedule', runAt, taskType: 'bar', schedule: { interval: '5m' }, attempts: 2, - status: 'running' as TaskStatus, + status: 'claiming' as TaskStatus, params: { shazm: 1 }, state: { henry: 'The 8th' }, user: 'dabo', @@ -1132,14 +1167,14 @@ if (doc['task.runAt'].size()!=0) { }); await store.claimAvailableTasks({ - claimTasksById: ['aaa'], + claimTasksById: ['claimed-by-id'], claimOwnershipUntil: new Date(), size: 10, }); }); test('emits an event when the store fails to claim a required task by id', async (done) => { - const { taskManagerId, tasks } = generateTasks(); + const { taskManagerId, runAt, tasks } = generateTasks(); const callCluster = sinon.spy(async (name: string, params?: unknown) => name === 'updateByQuery' ? { @@ -1159,11 +1194,36 @@ if (doc['task.runAt'].size()!=0) { }); const sub = store.events - .pipe(filter((event: TaskEvent) => event.id === 'ccc')) + .pipe( + filter( + (event: TaskEvent>) => + event.id === 'already-running' + ) + ) .subscribe({ - next: (event: TaskEvent) => { + next: (event: TaskEvent>) => { expect(event).toMatchObject( - asTaskClaimEvent('ccc', asErr(new Error(`failed to claim task 'ccc'`))) + asTaskClaimEvent( + 'already-running', + asErr( + some({ + id: 'already-running', + runAt, + taskType: 'bar', + schedule: { interval: '5m' }, + attempts: 2, + status: 'running' as TaskStatus, + params: { shazm: 1 }, + state: { henry: 'The 8th' }, + user: 'dabo', + scope: ['reporting', 'ceo'], + ownerId: taskManagerId, + startedAt: null, + retryAt: null, + scheduledAt: new Date(), + }) + ) + ) ); sub.unsubscribe(); done(); @@ -1171,7 +1231,49 @@ if (doc['task.runAt'].size()!=0) { }); await store.claimAvailableTasks({ - claimTasksById: ['ccc'], + claimTasksById: ['already-running'], + claimOwnershipUntil: new Date(), + size: 10, + }); + }); + + test('emits an event when the store fails to find a task which was required by id', async (done) => { + const { taskManagerId, tasks } = generateTasks(); + const callCluster = sinon.spy(async (name: string, params?: unknown) => + name === 'updateByQuery' + ? { + total: tasks.length, + updated: tasks.length, + } + : { hits: { hits: tasks } } + ); + const store = new TaskStore({ + callCluster, + maxAttempts: 2, + definitions: taskDefinitions, + serializer, + savedObjectsRepository: savedObjectsClient, + taskManagerId, + index: '', + }); + + const sub = store.events + .pipe( + filter( + (event: TaskEvent>) => + event.id === 'unknown-task' + ) + ) + .subscribe({ + next: (event: TaskEvent>) => { + expect(event).toMatchObject(asTaskClaimEvent('unknown-task', asErr(none))); + sub.unsubscribe(); + done(); + }, + }); + + await store.claimAvailableTasks({ + claimTasksById: ['unknown-task'], claimOwnershipUntil: new Date(), size: 10, }); diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts index cac37db72202d54..a18fb57b35b3d7b 100644 --- a/x-pack/plugins/task_manager/server/task_store.ts +++ b/x-pack/plugins/task_manager/server/task_store.ts @@ -9,7 +9,9 @@ */ import apm from 'elastic-apm-node'; import { Subject, Observable } from 'rxjs'; -import { omit, difference, defaults } from 'lodash'; +import { omit, difference, partition, map, defaults } from 'lodash'; + +import { some, none } from 'fp-ts/lib/Option'; import { SearchResponse, UpdateDocumentByQueryResponse } from 'elasticsearch'; import { @@ -31,6 +33,7 @@ import { TaskLifecycle, TaskLifecycleResult, SerializedConcreteTaskInstance, + TaskStatus, } from './task'; import { TaskClaim, asTaskClaimEvent } from './task_events'; @@ -221,13 +224,35 @@ export class TaskStore { // emit success/fail events for claimed tasks by id if (claimTasksById && claimTasksById.length) { - this.emitEvents(docs.map((doc) => asTaskClaimEvent(doc.id, asOk(doc)))); + const [documentsReturnedById, documentsClaimedBySchedule] = partition(docs, (doc) => + claimTasksById.includes(doc.id) + ); + + const [documentsClaimedById, documentsRequestedButNotClaimed] = partition( + documentsReturnedById, + // we filter the schduled tasks down by status is 'claiming' in the esearch, + // but we do not apply this limitation on tasks claimed by ID so that we can + // provide more detailed error messages when we fail to claim them + (doc) => doc.status === TaskStatus.Claiming + ); + + const documentsRequestedButNotReturned = difference( + claimTasksById, + map(documentsReturnedById, 'id') + ); + + this.emitEvents( + [...documentsClaimedById, ...documentsClaimedBySchedule].map((doc) => + asTaskClaimEvent(doc.id, asOk(doc)) + ) + ); + + this.emitEvents( + documentsRequestedButNotClaimed.map((doc) => asTaskClaimEvent(doc.id, asErr(some(doc)))) + ); this.emitEvents( - difference( - claimTasksById, - docs.map((doc) => doc.id) - ).map((id) => asTaskClaimEvent(id, asErr(new Error(`failed to claim task '${id}'`)))) + documentsRequestedButNotReturned.map((id) => asTaskClaimEvent(id, asErr(none))) ); } diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts index 18fdd5f9c3ac377..0833dd0425894f0 100644 --- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts +++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts @@ -51,7 +51,8 @@ export class SampleTaskManagerFixturePlugin .toPromise(); public setup(core: CoreSetup) { - core.http.createRouter().get( + const router = core.http.createRouter(); + router.get( { path: '/api/alerting_tasks/{taskId}', validate: { @@ -77,6 +78,23 @@ export class SampleTaskManagerFixturePlugin } } ); + + router.get( + { + path: `/api/ensure_tasks_index_refreshed`, + validate: {}, + }, + async function ( + context: RequestHandlerContext, + req: KibanaRequest, + res: KibanaResponseFactory + ): Promise> { + await core.elasticsearch.legacy.client.callAsInternalUser('indices.refresh', { + index: '.kibana_task_manager', + }); + return res.ok({ body: {} }); + } + ); } public start(core: CoreStart, { taskManager }: SampleTaskManagerFixtureStartDeps) { diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts index f35d6baac8f5ae4..266e66b5a1a452d 100644 --- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts +++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts @@ -223,6 +223,21 @@ export function initRoutes( } ); + router.get( + { + path: `/api/ensure_tasks_index_refreshed`, + validate: {}, + }, + async function ( + context: RequestHandlerContext, + req: KibanaRequest, + res: KibanaResponseFactory + ): Promise> { + await ensureIndexIsRefreshed(); + return res.ok({ body: {} }); + } + ); + router.delete( { path: `/api/sample_tasks`, diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js index 165e79fb311ead3..c87a5039360b8f2 100644 --- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js +++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js @@ -28,8 +28,7 @@ export default function ({ getService }) { const testHistoryIndex = '.kibana_task_manager_test_result'; const supertest = supertestAsPromised(url.format(config.get('servers.kibana'))); - // FLAKY: https://github.com/elastic/kibana/issues/71390 - describe.skip('scheduling and running tasks', () => { + describe('scheduling and running tasks', () => { beforeEach( async () => await supertest.delete('/api/sample_tasks').set('kbn-xsrf', 'xxx').expect(200) ); @@ -69,6 +68,14 @@ export default function ({ getService }) { .then((response) => response.body); } + function ensureTasksIndexRefreshed() { + return supertest + .get(`/api/ensure_tasks_index_refreshed`) + .send({}) + .expect(200) + .then((response) => response.body); + } + function historyDocs(taskId) { return es .search({ @@ -404,7 +411,7 @@ export default function ({ getService }) { const originalTask = await scheduleTask({ taskType: 'sampleTask', schedule: { interval: `30m` }, - params: { failWith: 'error on run now', failOn: 3 }, + params: { failWith: 'this task was meant to fail!', failOn: 3 }, }); await retry.try(async () => { @@ -415,11 +422,14 @@ export default function ({ getService }) { const task = await currentTask(originalTask.id); expect(task.state.count).to.eql(1); + expect(task.status).to.eql('idle'); // ensure this task shouldnt run for another half hour expectReschedule(Date.parse(originalTask.runAt), task, 30 * 60000); }); + await ensureTasksIndexRefreshed(); + // second run should still be successful const successfulRunNowResult = await runTaskNow({ id: originalTask.id, @@ -429,14 +439,20 @@ export default function ({ getService }) { await retry.try(async () => { const task = await currentTask(originalTask.id); expect(task.state.count).to.eql(2); + expect(task.status).to.eql('idle'); }); + await ensureTasksIndexRefreshed(); + // third run should fail const failedRunNowResult = await runTaskNow({ id: originalTask.id, }); - expect(failedRunNowResult).to.eql({ id: originalTask.id, error: `Error: error on run now` }); + expect(failedRunNowResult).to.eql({ + id: originalTask.id, + error: `Error: Failed to run task \"${originalTask.id}\": Error: this task was meant to fail!`, + }); await retry.try(async () => { expect( @@ -479,8 +495,13 @@ export default function ({ getService }) { expect( docs.filter((taskDoc) => taskDoc._source.taskId === longRunningTask.id).length ).to.eql(1); + + const task = await currentTask(longRunningTask.id); + expect(task.status).to.eql('running'); }); + await ensureTasksIndexRefreshed(); + // first runNow should fail const failedRunNowResult = await runTaskNow({ id: longRunningTask.id, @@ -496,8 +517,13 @@ export default function ({ getService }) { await retry.try(async () => { const tasks = (await currentTasks()).docs; expect(getTaskById(tasks, longRunningTask.id).state.count).to.eql(1); + + const task = await currentTask(longRunningTask.id); + expect(task.status).to.eql('idle'); }); + await ensureTasksIndexRefreshed(); + // second runNow should be successful const successfulRunNowResult = runTaskNow({ id: longRunningTask.id, From 4150a234c8f4517725b79ead280285b49890e17c Mon Sep 17 00:00:00 2001 From: Melissa Alvarez Date: Wed, 5 Aug 2020 12:43:58 -0400 Subject: [PATCH 03/21] update empty prompt in analytics list (#74174) --- .../components/analytics_list/analytics_list.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx index 7b5c714c236b39d..90e24f6da5d0a1d 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { Direction, - EuiButtonEmpty, + EuiButton, EuiCallOut, EuiEmptyPrompt, EuiFlexGroup, @@ -147,25 +147,29 @@ export const DataFrameAnalyticsList: FC = ({ return ( <> {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptTitle', { - defaultMessage: 'No data frame analytics jobs found', + defaultMessage: 'Create your first data frame analytics job', })} } actions={ !isManagementTable ? [ - setIsSourceIndexModalVisible(true)} isDisabled={disabled} + color="primary" + iconType="plusInCircle" + fill data-test-subj="mlAnalyticsCreateFirstButton" > {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptButtonText', { - defaultMessage: 'Create your first data frame analytics job', + defaultMessage: 'Create job', })} - , + , ] : [] } From 47b9aba3bf0ce6a5a867fa144701ad1841020f7c Mon Sep 17 00:00:00 2001 From: Constance Date: Wed, 5 Aug 2020 10:12:25 -0700 Subject: [PATCH 04/21] [Enterprise Search] Fix/DRY out plugin i18n strings (#74323) * i18n refactor - DRY out plugin details to constants and correctly i18n-ize front-end-facing strings * DRY out new i18n constants - refactor instances of i18n.translate to use new constants * Fix non-i18n'd breadcrumb strings * PR feedback: swap out more plugin ID strings for constants --- .../enterprise_search/common/constants.ts | 34 +++++++++++++++++++ .../components/setup_guide/setup_guide.tsx | 11 +++--- .../generate_breadcrumbs.ts | 18 ++++++++-- .../components/error_state/error_state.tsx | 8 ++--- .../components/setup_guide/setup_guide.tsx | 12 ++++--- .../enterprise_search/public/plugin.ts | 31 ++++++++--------- .../enterprise_search/server/plugin.ts | 15 +++++--- 7 files changed, 90 insertions(+), 39 deletions(-) diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts index fc9a47717871b29..c5839df4c603b30 100644 --- a/x-pack/plugins/enterprise_search/common/constants.ts +++ b/x-pack/plugins/enterprise_search/common/constants.ts @@ -4,6 +4,40 @@ * you may not use this file except in compliance with the Elastic License. */ +import { i18n } from '@kbn/i18n'; + +export const ENTERPRISE_SEARCH_PLUGIN = { + ID: 'enterpriseSearch', + NAME: i18n.translate('xpack.enterpriseSearch.productName', { + defaultMessage: 'Enterprise Search', + }), + URL: '/app/enterprise_search', +}; + +export const APP_SEARCH_PLUGIN = { + ID: 'appSearch', + NAME: i18n.translate('xpack.enterpriseSearch.appSearch.productName', { + defaultMessage: 'App Search', + }), + DESCRIPTION: i18n.translate('xpack.enterpriseSearch.appSearch.productDescription', { + defaultMessage: + 'Leverage dashboards, analytics, and APIs for advanced application search made simple.', + }), + URL: '/app/enterprise_search/app_search', +}; + +export const WORKPLACE_SEARCH_PLUGIN = { + ID: 'workplaceSearch', + NAME: i18n.translate('xpack.enterpriseSearch.workplaceSearch.productName', { + defaultMessage: 'Workplace Search', + }), + DESCRIPTION: i18n.translate('xpack.enterpriseSearch.workplaceSearch.productDescription', { + defaultMessage: + 'Search all documents, files, and sources available across your virtual workplace.', + }), + URL: '/app/enterprise_search/workplace_search', +}; + export const JSON_HEADER = { 'Content-Type': 'application/json' }; // This needs specific casing or Chrome throws a 415 error export const ENGINES_PAGE_SIZE = 10; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx index df278bf938a690b..f899423319afc9d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx @@ -9,6 +9,7 @@ import { EuiSpacer, EuiTitle, EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; +import { APP_SEARCH_PLUGIN } from '../../../../../common/constants'; import { SetupGuide as SetupGuideLayout } from '../../../shared/setup_guide'; import { SetAppSearchBreadcrumbs as SetBreadcrumbs } from '../../../shared/kibana_breadcrumbs'; import { SendAppSearchTelemetry as SendTelemetry } from '../../../shared/telemetry'; @@ -16,14 +17,16 @@ import GettingStarted from '../../assets/getting_started.png'; export const SetupGuide: React.FC = () => ( - + ( breadcrumbs: TBreadcrumbs = [] ) => [ - generateBreadcrumb({ text: 'Enterprise Search' }), + generateBreadcrumb({ text: ENTERPRISE_SEARCH_PLUGIN.NAME }), ...breadcrumbs.map(({ text, path }: IGenerateBreadcrumbProps) => generateBreadcrumb({ text, path, history }) ), ]; export const appSearchBreadcrumbs = (history: History) => (breadcrumbs: TBreadcrumbs = []) => - enterpriseSearchBreadcrumbs(history)([{ text: 'App Search', path: '/' }, ...breadcrumbs]); + enterpriseSearchBreadcrumbs(history)([ + { text: APP_SEARCH_PLUGIN.NAME, path: '/' }, + ...breadcrumbs, + ]); export const workplaceSearchBreadcrumbs = (history: History) => (breadcrumbs: TBreadcrumbs = []) => - enterpriseSearchBreadcrumbs(history)([{ text: 'Workplace Search', path: '/' }, ...breadcrumbs]); + enterpriseSearchBreadcrumbs(history)([ + { text: WORKPLACE_SEARCH_PLUGIN.NAME, path: '/' }, + ...breadcrumbs, + ]); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx index 9fa508d599425e6..a1bc17e05dc056e 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx @@ -6,8 +6,8 @@ import React from 'react'; import { EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; +import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants'; import { ErrorStatePrompt } from '../../../shared/error_state'; import { SetWorkplaceSearchBreadcrumbs as SetBreadcrumbs } from '../../../shared/kibana_breadcrumbs'; import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry'; @@ -20,11 +20,7 @@ export const ErrorState: React.FC = () => { - + diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx index 5b5d067d23eb8fb..e96d114c67c5d5b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx @@ -9,8 +9,8 @@ import { EuiSpacer, EuiTitle, EuiText, EuiButton } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; +import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants'; import { SetupGuide as SetupGuideLayout } from '../../../shared/setup_guide'; - import { SetWorkplaceSearchBreadcrumbs as SetBreadcrumbs } from '../../../shared/kibana_breadcrumbs'; import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry'; import GettingStarted from '../../assets/getting_started.png'; @@ -21,14 +21,16 @@ const GETTING_STARTED_LINK_URL = export const SetupGuide: React.FC = () => { return ( - + diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts index fc95828a3f4a4f6..66d2ae82fe3ce68 100644 --- a/x-pack/plugins/enterprise_search/public/plugin.ts +++ b/x-pack/plugins/enterprise_search/public/plugin.ts @@ -20,6 +20,7 @@ import { import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public'; import { LicensingPluginSetup } from '../../licensing/public'; +import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../common/constants'; import { getPublicUrl } from './applications/shared/enterprise_search_url'; import AppSearchLogo from './applications/app_search/assets/logo.svg'; import WorkplaceSearchLogo from './applications/workplace_search/assets/logo.svg'; @@ -44,9 +45,9 @@ export class EnterpriseSearchPlugin implements Plugin { const config = { host: this.config.host }; core.application.register({ - id: 'appSearch', - title: 'App Search', - appRoute: '/app/enterprise_search/app_search', + id: APP_SEARCH_PLUGIN.ID, + title: APP_SEARCH_PLUGIN.NAME, + appRoute: APP_SEARCH_PLUGIN.URL, category: DEFAULT_APP_CATEGORIES.enterpriseSearch, mount: async (params: AppMountParameters) => { const [coreStart] = await core.getStartServices(); @@ -61,9 +62,9 @@ export class EnterpriseSearchPlugin implements Plugin { }); core.application.register({ - id: 'workplaceSearch', - title: 'Workplace Search', - appRoute: '/app/enterprise_search/workplace_search', + id: WORKPLACE_SEARCH_PLUGIN.ID, + title: WORKPLACE_SEARCH_PLUGIN.NAME, + appRoute: WORKPLACE_SEARCH_PLUGIN.URL, category: DEFAULT_APP_CATEGORIES.enterpriseSearch, mount: async (params: AppMountParameters) => { const [coreStart] = await core.getStartServices(); @@ -76,23 +77,21 @@ export class EnterpriseSearchPlugin implements Plugin { }); plugins.home.featureCatalogue.register({ - id: 'appSearch', - title: 'App Search', + id: APP_SEARCH_PLUGIN.ID, + title: APP_SEARCH_PLUGIN.NAME, icon: AppSearchLogo, - description: - 'Leverage dashboards, analytics, and APIs for advanced application search made simple.', - path: '/app/enterprise_search/app_search', + description: APP_SEARCH_PLUGIN.DESCRIPTION, + path: APP_SEARCH_PLUGIN.URL, category: FeatureCatalogueCategory.DATA, showOnHomePage: true, }); plugins.home.featureCatalogue.register({ - id: 'workplaceSearch', - title: 'Workplace Search', + id: WORKPLACE_SEARCH_PLUGIN.ID, + title: WORKPLACE_SEARCH_PLUGIN.NAME, icon: WorkplaceSearchLogo, - description: - 'Search all documents, files, and sources available across your virtual workplace.', - path: '/app/enterprise_search/workplace_search', + description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION, + path: WORKPLACE_SEARCH_PLUGIN.URL, category: FeatureCatalogueCategory.DATA, showOnHomePage: true, }); diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts index a7bd68f92f78b9f..6de6671337797dd 100644 --- a/x-pack/plugins/enterprise_search/server/plugin.ts +++ b/x-pack/plugins/enterprise_search/server/plugin.ts @@ -19,6 +19,11 @@ import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; import { SecurityPluginSetup } from '../../security/server'; import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server'; +import { + ENTERPRISE_SEARCH_PLUGIN, + APP_SEARCH_PLUGIN, + WORKPLACE_SEARCH_PLUGIN, +} from '../common/constants'; import { ConfigType } from './'; import { checkAccess } from './lib/check_access'; import { registerPublicUrlRoute } from './routes/enterprise_search/public_url'; @@ -64,13 +69,13 @@ export class EnterpriseSearchPlugin implements Plugin { * Register space/feature control */ features.registerFeature({ - id: 'enterpriseSearch', - name: 'Enterprise Search', + id: ENTERPRISE_SEARCH_PLUGIN.ID, + name: ENTERPRISE_SEARCH_PLUGIN.NAME, order: 0, icon: 'logoEnterpriseSearch', - navLinkId: 'appSearch', // TODO - remove this once functional tests no longer rely on navLinkId - app: ['kibana', 'appSearch', 'workplaceSearch'], // TODO: 'enterpriseSearch' - catalogue: ['appSearch', 'workplaceSearch'], // TODO: 'enterpriseSearch' + navLinkId: APP_SEARCH_PLUGIN.ID, // TODO - remove this once functional tests no longer rely on navLinkId + app: ['kibana', APP_SEARCH_PLUGIN.ID, WORKPLACE_SEARCH_PLUGIN.ID], + catalogue: [APP_SEARCH_PLUGIN.ID, WORKPLACE_SEARCH_PLUGIN.ID], privileges: null, }); From 41e3128ecd2ec33c4823aa98b9ae0b3a31125564 Mon Sep 17 00:00:00 2001 From: Gidi Meir Morris Date: Wed, 5 Aug 2020 18:48:09 +0100 Subject: [PATCH 05/21] [Alerting] Reload the Alerts List when alerts are deleted (#73715) Reloads the entire Alerts list when alerts are deleted through the UI. --- .../alerts_list/components/alerts_list.tsx | 19 ++++++--------- .../apps/triggers_actions_ui/alerts.ts | 24 +++++++++++++++---- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx index 2b2897a2181b11e..3d55c51e4528136 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx @@ -152,6 +152,10 @@ export const AlertsList: React.FunctionComponent = () => { data: alertsResponse.data, totalItemCount: alertsResponse.total, }); + + if (!alertsResponse.data?.length && page.index > 0) { + setPage({ ...page, index: 0 }); + } } catch (e) { toastNotifications.addDanger({ title: i18n.translate( @@ -399,18 +403,9 @@ export const AlertsList: React.FunctionComponent = () => { return (
{ - if (selectedIds.length === 0 || selectedIds.length === deleted.length) { - const updatedAlerts = alertsState.data.filter( - (alert) => alert.id && !alertsToDelete.includes(alert.id) - ); - setAlertsState({ - isLoading: false, - data: updatedAlerts, - totalItemCount: alertsState.totalItemCount - deleted.length, - }); - setSelectedIds([]); - } + onDeleted={async (deleted: string[]) => { + loadAlertsData(); + setSelectedIds([]); setAlertsToDelete([]); }} onErrors={async () => { diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts index fa714e8374ec78c..56952919e416a5b 100644 --- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts +++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts @@ -5,6 +5,7 @@ */ import uuid from 'uuid'; +import { times } from 'lodash'; import expect from '@kbn/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -361,11 +362,22 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }); it('should delete all selection', async () => { - const createdAlert = await createAlert(); + const namePrefix = generateUniqueKey(); + let count = 0; + const createdAlertsFirstPage = await Promise.all( + times(10, () => createAlert({ name: `${namePrefix}-0${count++}` })) + ); + + const createdAlertsSecondPage = await Promise.all( + times(2, () => createAlert({ name: `${namePrefix}-1${count++}` })) + ); + await pageObjects.common.navigateToApp('triggersActions'); - await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name); + await pageObjects.triggersActionsUI.searchAlerts(namePrefix); - await testSubjects.click(`checkboxSelectRow-${createdAlert.id}`); + for (const createdAlert of createdAlertsFirstPage) { + await testSubjects.click(`checkboxSelectRow-${createdAlert.id}`); + } await testSubjects.click('bulkAction'); @@ -377,9 +389,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await pageObjects.common.closeToast(); await pageObjects.common.navigateToApp('triggersActions'); - await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name); + await pageObjects.triggersActionsUI.searchAlerts(namePrefix); const searchResultsAfterDelete = await pageObjects.triggersActionsUI.getAlertsList(); - expect(searchResultsAfterDelete.length).to.eql(0); + expect(searchResultsAfterDelete).to.have.length(2); + expect(searchResultsAfterDelete[0].name).to.eql(createdAlertsSecondPage[0].name); + expect(searchResultsAfterDelete[1].name).to.eql(createdAlertsSecondPage[1].name); }); }); }; From c8597ec84bebcd7c51a760bd1a13455aad8d8612 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Wed, 5 Aug 2020 19:52:00 +0200 Subject: [PATCH 06/21] Change experimental message for visualizations (#74354) --- .../components/experimental_vis_info.tsx | 20 +++++++++++++------ .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/plugins/visualize/public/application/components/experimental_vis_info.tsx b/src/plugins/visualize/public/application/components/experimental_vis_info.tsx index 51abb3ca530a4c9..5f08bea60e53820 100644 --- a/src/plugins/visualize/public/application/components/experimental_vis_info.tsx +++ b/src/plugins/visualize/public/application/components/experimental_vis_info.tsx @@ -26,12 +26,20 @@ export const InfoComponent = () => { <> {' '} - - GitHub - - {'.'} + defaultMessage="This visualization is experimental and is not subject to the support SLA of official GA features. + For feedback, please create an issue in {githubLink}." + values={{ + githubLink: ( + + GitHub + + ), + }} + /> ); diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 7e1ce610a194848..8218904f77df9e1 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -4529,7 +4529,6 @@ "visualize.createVisualization.noVisTypeErrorMessage": "有効なビジュアライゼーションタイプを指定してください", "visualize.editor.createBreadcrumb": "作成", "visualize.error.title": "ビジュアライゼーションエラー", - "visualize.experimentalVisInfoText": "このビジュアライゼーションは実験的なものです。フィードバックがありますか？で問題を報告してください。", "visualize.helpMenu.appName": "可視化", "visualize.linkedToSearch.unlinkSuccessNotificationText": "保存された検索「{searchTitle}」からリンクが解除されました", "visualize.listing.betaTitle": "ベータ", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index e82ba7cc1d60f4d..21a42362bcdd3ea 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -4530,7 +4530,6 @@ "visualize.createVisualization.noVisTypeErrorMessage": "必须提供有效的可视化类型", "visualize.editor.createBreadcrumb": "创建", "visualize.error.title": "可视化错误", - "visualize.experimentalVisInfoText": "此可视化标记为“实验性”。想反馈？请在以下位置创建问题：", "visualize.helpMenu.appName": "Visualize", "visualize.linkedToSearch.unlinkSuccessNotificationText": "已取消与已保存搜索“{searchTitle}”的链接", "visualize.listing.betaTitle": "公测版", From c0bb5375e037e5c1b83d354fa3835731cd3e2337 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Wed, 5 Aug 2020 20:01:52 +0200 Subject: [PATCH 07/21] [Ingest Manager] Update package registry for testing to f6b01d (#74341) Many changes went into the registry and the packages recently. This is updating to the most recent version of the registry distribution currently in production. Co-authored-by: Sonja Krause-Harder --- .../ingest_manager_api_integration/apis/epm/list.ts | 2 +- .../0.1.0/dataset/test_logs/fields/fields.yml | 12 ++++++------ .../0.1.0/dataset/test_metrics/fields/fields.yml | 12 ++++++------ .../0.1.0/dataset/test/fields/fields.yml | 12 ++++++------ .../0.2.0/dataset/test/fields/fields.yml | 12 ++++++------ .../0.3.0/dataset/test/fields/fields.yml | 12 ++++++------ .../overrides/0.1.0/dataset/test/fields/fields.yml | 12 ++++++------ .../apis/package_config/create.ts | 4 ++-- x-pack/test/ingest_manager_api_integration/config.ts | 2 +- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts index 20414fcb90521b5..0b6a37d77387e69 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts +++ b/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts @@ -29,7 +29,7 @@ export default function ({ getService }: FtrProviderContext) { return response.body; }; const listResponse = await fetchPackageList(); - expect(listResponse.response.length).to.be(14); + expect(listResponse.response.length).to.be(8); } else { warnAndSkipTest(this, log); } diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.1.0/dataset/test/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.1.0/dataset/test/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.1.0/dataset/test/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.1.0/dataset/test/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.2.0/dataset/test/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.2.0/dataset/test/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.2.0/dataset/test/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.2.0/dataset/test/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.3.0/dataset/test/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.3.0/dataset/test/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.3.0/dataset/test/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.3.0/dataset/test/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/overrides/0.1.0/dataset/test/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/overrides/0.1.0/dataset/test/fields/fields.yml index 12a9a03c1337b4a..6e003ed0ad14769 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/overrides/0.1.0/dataset/test/fields/fields.yml +++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/overrides/0.1.0/dataset/test/fields/fields.yml @@ -1,15 +1,15 @@ -- name: dataset.type +- name: data_stream.type type: constant_keyword description: > - Dataset type. -- name: dataset.name + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Dataset name. -- name: dataset.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Dataset namespace. + Data stream namespace. - name: '@timestamp' type: date description: > diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts index cae4ff79bdef6c2..a2c2b99364d5097 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts +++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts @@ -100,7 +100,7 @@ export default function ({ getService }: FtrProviderContext) { package: { name: 'endpoint', title: 'Endpoint', - version: '0.8.0', + version: '0.13.0', }, }) .expect(200); @@ -118,7 +118,7 @@ export default function ({ getService }: FtrProviderContext) { package: { name: 'endpoint', title: 'Endpoint', - version: '0.8.0', + version: '0.13.0', }, }) .expect(500); diff --git a/x-pack/test/ingest_manager_api_integration/config.ts b/x-pack/test/ingest_manager_api_integration/config.ts index 85d1c20c7f15540..08d5da148b51e4f 100644 --- a/x-pack/test/ingest_manager_api_integration/config.ts +++ b/x-pack/test/ingest_manager_api_integration/config.ts @@ -12,7 +12,7 @@ import { defineDockerServersConfig } from '@kbn/test'; // Docker image to use for Ingest Manager API integration tests. // This hash comes from the commit hash here: https://github.com/elastic/package-storage/commit export const dockerImage = - 'docker.elastic.co/package-registry/distribution:80e93ade87f65e18d487b1c407406825915daba8'; + 'docker.elastic.co/package-registry/distribution:f6b01daec8cfe355101e366de9941d35a4c3763e'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts')); From 1c428ffed780495a327c15fcd33dcf3759e6087c Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 5 Aug 2020 14:11:27 -0400 Subject: [PATCH 08/21] fixing encoding issue with \ for enroll command (#74379) --- .../components/enrollment_instructions/manual/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx index 8ea236b2dd6c301..9efc95b0a04cf14 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx @@ -36,8 +36,8 @@ export const ManualInstructions: React.FunctionComponent = ({ systemctl enable elastic-agent systemctl start elastic-agent`; - const windowsCommand = `.\elastic-agent enroll ${enrollArgs} -./install-service-elastic-agent.ps1`; + const windowsCommand = `.\\elastic-agent enroll ${enrollArgs} +.\\install-service-elastic-agent.ps1`; return ( <> From 0737241decd6bfc30e3c98abd47344befa856ee7 Mon Sep 17 00:00:00 2001 From: Zacqary Adam Xeper Date: Wed, 5 Aug 2020 13:13:22 -0500 Subject: [PATCH 09/21] [Metrics UI] Fix validating Metrics Explorer URL (#74311) --- ...metrics_explorer_options_url_state.test.ts | 70 ++++++++++++++ ...ith_metrics_explorer_options_url_state.tsx | 65 ++----------- .../hooks/use_metrics_explorer_options.ts | 94 +++++++++++++------ 3 files changed, 140 insertions(+), 89 deletions(-) create mode 100644 x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.test.ts diff --git a/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.test.ts b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.test.ts new file mode 100644 index 000000000000000..8be34b4498c3fa5 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.test.ts @@ -0,0 +1,70 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { omit } from 'lodash'; +import { mapToUrlState } from './with_metrics_explorer_options_url_state'; + +describe('WithMetricsExplorerOptionsUrlState', () => { + describe('mapToUrlState', () => { + it('loads a valid URL state', () => { + expect(mapToUrlState(validState)).toEqual(validState); + }); + it('discards invalid properties and loads valid properties into the URL', () => { + expect(mapToUrlState(invalidState)).toEqual(omit(invalidState, 'options')); + }); + }); +}); + +const validState = { + chartOptions: { + stack: false, + type: 'line', + yAxisMode: 'fromZero', + }, + options: { + aggregation: 'avg', + filterQuery: '', + groupBy: ['host.hostname'], + metrics: [ + { + aggregation: 'avg', + color: 'color0', + field: 'system.cpu.user.pct', + }, + { + aggregation: 'avg', + color: 'color1', + field: 'system.load.1', + }, + ], + source: 'url', + }, + timerange: { + from: 'now-1h', + interval: '>=10s', + to: 'now', + }, +}; + +const invalidState = { + chartOptions: { + stack: false, + type: 'line', + yAxisMode: 'fromZero', + }, + options: { + aggregation: 'avg', + filterQuery: '', + groupBy: ['host.hostname'], + metrics: 'this is the wrong data type', + source: 'url', + }, + timerange: { + from: 'now-1h', + interval: '>=10s', + to: 'now', + }, +}; diff --git a/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx index 35fb66b2620d605..c263d0f68a45e23 100644 --- a/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx +++ b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx @@ -5,19 +5,17 @@ */ import { set } from '@elastic/safer-lodash-set'; -import { values } from 'lodash'; import React, { useContext, useMemo } from 'react'; -import * as t from 'io-ts'; import { ThrowReporter } from 'io-ts/lib/ThrowReporter'; -import { MetricsExplorerColor } from '../../../common/color_palette'; import { UrlStateContainer } from '../../utils/url_state'; import { MetricsExplorerOptions, MetricsExplorerOptionsContainer, MetricsExplorerTimeOptions, - MetricsExplorerYAxisMode, - MetricsExplorerChartType, MetricsExplorerChartOptions, + metricExplorerOptionsRT, + metricsExplorerChartOptionsRT, + metricsExplorerTimeOptionsRT, } from '../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options'; interface MetricsExplorerUrlState { @@ -74,36 +72,7 @@ export const WithMetricsExplorerOptionsUrlState = () => { }; function isMetricExplorerOptions(subject: any): subject is MetricsExplorerOptions { - const MetricRequired = t.type({ - aggregation: t.string, - }); - - const MetricOptional = t.partial({ - field: t.string, - rate: t.boolean, - color: t.keyof( - Object.fromEntries(values(MetricsExplorerColor).map((c) => [c, null])) as Record - ), - label: t.string, - }); - - const Metric = t.intersection([MetricRequired, MetricOptional]); - - const OptionsRequired = t.type({ - aggregation: t.string, - metrics: t.array(Metric), - }); - - const OptionsOptional = t.partial({ - limit: t.number, - groupBy: t.string, - filterQuery: t.string, - source: t.string, - }); - - const Options = t.intersection([OptionsRequired, OptionsOptional]); - - const result = Options.decode(subject); + const result = metricExplorerOptionsRT.decode(subject); try { ThrowReporter.report(result); @@ -114,22 +83,7 @@ function isMetricExplorerOptions(subject: any): subject is MetricsExplorerOption } function isMetricExplorerChartOptions(subject: any): subject is MetricsExplorerChartOptions { - const ChartOptions = t.type({ - yAxisMode: t.keyof( - Object.fromEntries(values(MetricsExplorerYAxisMode).map((v) => [v, null])) as Record< - string, - null - > - ), - type: t.keyof( - Object.fromEntries(values(MetricsExplorerChartType).map((v) => [v, null])) as Record< - string, - null - > - ), - stack: t.boolean, - }); - const result = ChartOptions.decode(subject); + const result = metricsExplorerChartOptionsRT.decode(subject); try { ThrowReporter.report(result); @@ -140,12 +94,7 @@ function isMetricExplorerChartOptions(subject: any): subject is MetricsExplorerC } function isMetricExplorerTimeOption(subject: any): subject is MetricsExplorerTimeOptions { - const TimeRange = t.type({ - from: t.string, - to: t.string, - interval: t.string, - }); - const result = TimeRange.decode(subject); + const result = metricsExplorerTimeOptionsRT.decode(subject); try { ThrowReporter.report(result); return true; @@ -154,7 +103,7 @@ function isMetricExplorerTimeOption(subject: any): subject is MetricsExplorerTim } } -const mapToUrlState = (value: any): MetricsExplorerUrlState | undefined => { +export const mapToUrlState = (value: any): MetricsExplorerUrlState | undefined => { const finalState = {}; if (value) { if (value.options && isMetricExplorerOptions(value.options)) { diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts index fa103ce15e3e8f4..299231f1821f081 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts +++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts @@ -4,19 +4,29 @@ * you may not use this file except in compliance with the Elastic License. */ +import * as t from 'io-ts'; +import { values } from 'lodash'; import createContainer from 'constate'; import { useState, useEffect, useMemo, Dispatch, SetStateAction } from 'react'; import { useAlertPrefillContext } from '../../../../alerting/use_alert_prefill'; import { MetricsExplorerColor } from '../../../../../common/color_palette'; -import { - MetricsExplorerAggregation, - MetricsExplorerMetric, -} from '../../../../../common/http_api/metrics_explorer'; - -export type MetricsExplorerOptionsMetric = MetricsExplorerMetric & { - color?: MetricsExplorerColor; - label?: string; -}; +import { metricsExplorerMetricRT } from '../../../../../common/http_api/metrics_explorer'; + +const metricsExplorerOptionsMetricRT = t.intersection([ + metricsExplorerMetricRT, + t.partial({ + rate: t.boolean, + color: t.keyof( + Object.fromEntries(values(MetricsExplorerColor).map((c) => [c, null])) as Record< + MetricsExplorerColor, + null + > + ), + label: t.string, + }), +]); + +export type MetricsExplorerOptionsMetric = t.TypeOf; export enum MetricsExplorerChartType { line = 'line', @@ -29,28 +39,50 @@ export enum MetricsExplorerYAxisMode { auto = 'auto', } -export interface MetricsExplorerChartOptions { - type: MetricsExplorerChartType; - yAxisMode: MetricsExplorerYAxisMode; - stack: boolean; -} - -export interface MetricsExplorerOptions { - metrics: MetricsExplorerOptionsMetric[]; - limit?: number; - groupBy?: string | string[]; - filterQuery?: string; - aggregation: MetricsExplorerAggregation; - forceInterval?: boolean; - dropLastBucket?: boolean; - source?: string; -} - -export interface MetricsExplorerTimeOptions { - from: string; - to: string; - interval: string; -} +export const metricsExplorerChartOptionsRT = t.type({ + yAxisMode: t.keyof( + Object.fromEntries(values(MetricsExplorerYAxisMode).map((v) => [v, null])) as Record< + MetricsExplorerYAxisMode, + null + > + ), + type: t.keyof( + Object.fromEntries(values(MetricsExplorerChartType).map((v) => [v, null])) as Record< + MetricsExplorerChartType, + null + > + ), + stack: t.boolean, +}); + +export type MetricsExplorerChartOptions = t.TypeOf; + +const metricExplorerOptionsRequiredRT = t.type({ + aggregation: t.string, + metrics: t.array(metricsExplorerOptionsMetricRT), +}); + +const metricExplorerOptionsOptionalRT = t.partial({ + limit: t.number, + groupBy: t.union([t.string, t.array(t.string)]), + filterQuery: t.string, + source: t.string, + forceInterval: t.boolean, + dropLastBucket: t.boolean, +}); +export const metricExplorerOptionsRT = t.intersection([ + metricExplorerOptionsRequiredRT, + metricExplorerOptionsOptionalRT, +]); + +export type MetricsExplorerOptions = t.TypeOf; + +export const metricsExplorerTimeOptionsRT = t.type({ + from: t.string, + to: t.string, + interval: t.string, +}); +export type MetricsExplorerTimeOptions = t.TypeOf; export const DEFAULT_TIMERANGE: MetricsExplorerTimeOptions = { from: 'now-1h', From 057cab725c1e5c09d2a3aa531221fffc826e7090 Mon Sep 17 00:00:00 2001 From: Spencer Date: Wed, 5 Aug 2020 12:05:17 -0700 Subject: [PATCH 10/21] [Jenkins] run CI when plugin readmes change (#74388) Co-authored-by: spalger --- .ci/pipeline-library/src/test/prChanges.groovy | 13 +++++++++++++ vars/prChanges.groovy | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.ci/pipeline-library/src/test/prChanges.groovy b/.ci/pipeline-library/src/test/prChanges.groovy index f149340517ff0ad..0f354e7687246ab 100644 --- a/.ci/pipeline-library/src/test/prChanges.groovy +++ b/.ci/pipeline-library/src/test/prChanges.groovy @@ -97,4 +97,17 @@ class PrChangesTest extends KibanaBasePipelineTest { assertFalse(prChanges.areChangesSkippable()) } + + @Test + void 'areChangesSkippable() with plugin readme changes'() { + props([ + githubPrs: [ + getChanges: { [ + [filename: 'src/plugins/foo/README.asciidoc'], + ] }, + ], + ]) + + assertFalse(prChanges.areChangesSkippable()) + } } diff --git a/vars/prChanges.groovy b/vars/prChanges.groovy index adaacf952b5b6ee..a7fe46e7bf014f2 100644 --- a/vars/prChanges.groovy +++ b/vars/prChanges.groovy @@ -22,6 +22,8 @@ def getNotSkippablePaths() { return [ // this file is auto-generated and changes to it need to be validated with CI /^docs\/developer\/architecture\/code-exploration.asciidoc$/, + // don't skip CI on prs with changes to plugin readme files (?i) is for case-insensitive matching + /(?i)\/plugins\/[^\/]+\/readme\.(md|asciidoc)$/, ] } From c655f50950693f3d0ec32dcf8167135d0c9781ec Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Wed, 5 Aug 2020 12:51:58 -0700 Subject: [PATCH 11/21] Rename agent configs SO to agent policies (#74397) --- .../ingest_manager/common/constants/agent_config.ts | 2 +- .../test/functional/es_archives/fleet/agents/data.json | 6 +++--- .../functional/es_archives/fleet/agents/mappings.json | 4 ++-- x-pack/test/functional/es_archives/lists/mappings.json | 6 +++--- .../reporting/canvas_disallowed_url/mappings.json | 9 ++++----- .../es_archives/export_rule/mappings.json | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts index 30ca92f5f32f392..aa6399b73f14edf 100644 --- a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts +++ b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts @@ -5,7 +5,7 @@ */ import { AgentConfigStatus, DefaultPackages } from '../types'; -export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'ingest-agent-configs'; +export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'ingest-agent-policies'; export const DEFAULT_AGENT_CONFIG = { name: 'Default config', diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json index b3d49199b0d9eba..c94b87f6ad1ec6a 100644 --- a/x-pack/test/functional/es_archives/fleet/agents/data.json +++ b/x-pack/test/functional/es_archives/fleet/agents/data.json @@ -203,11 +203,11 @@ { "type": "doc", "value": { - "id": "ingest-agent-configs:config1", + "id": "ingest-agent-policies:config1", "index": ".kibana", "source": { - "type": "ingest-agent-configs", - "ingest-agent-configs": { + "type": "ingest-agent-policies", + "ingest-agent-policies": { "name": "Test config", "namespace": "default", "description": "Config 1", diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json index 1f0aa2f24d6df27..acc32c3e2cbb58b 100644 --- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json +++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json @@ -58,7 +58,7 @@ "siem-ui-timeline": "f2d929253ecd06ffbac78b4047f45a86", "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3", - "ingest-agent-configs": "f4bdc17427437537ca1754d5d5057ad5", + "ingest-agent-policies": "f4bdc17427437537ca1754d5d5057ad5", "url": "b675c3be8d76ecf029294d51dc7ec65d", "migrationVersion": "4a1746014a75ade3a714e1db5763276f", "index-pattern": "66eccb05066c5a89924f48a9e9736499", @@ -1797,7 +1797,7 @@ } } }, - "ingest-agent-configs": { + "ingest-agent-policies": { "properties": { "package_configs": { "type": "keyword" diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json index c1b277b8183a334..2fc1f1a3111a7af 100644 --- a/x-pack/test/functional/es_archives/lists/mappings.json +++ b/x-pack/test/functional/es_archives/lists/mappings.json @@ -61,7 +61,7 @@ "siem-ui-timeline": "94bc38c7a421d15fbfe8ea565370a421", "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3", - "ingest-agent-configs": "9326f99c977fd2ef5ab24b6336a0675c", + "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c", "url": "c7f66a0df8b1b52f17c28c4adb111105", "endpoint:user-artifact-manifest": "67c28185da541c1404e7852d30498cd6", "migrationVersion": "4a1746014a75ade3a714e1db5763276f", @@ -1210,7 +1210,7 @@ } } }, - "ingest-agent-configs": { + "ingest-agent-policies": { "properties": { "description": { "type": "text" @@ -2488,4 +2488,4 @@ } } } -} \ No newline at end of file +} diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json index 1432a53b45461f9..1fd338fbb0ffb91 100644 --- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json +++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json @@ -2,8 +2,7 @@ "type": "index", "value": { "aliases": { - ".kibana": { - } + ".kibana": {} }, "index": ".kibana_1", "mappings": { @@ -38,7 +37,7 @@ "fleet-enrollment-api-keys": "28b91e20b105b6f928e2012600085d8f", "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1", "index-pattern": "66eccb05066c5a89924f48a9e9736499", - "ingest-agent-configs": "9326f99c977fd2ef5ab24b6336a0675c", + "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c", "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3", "ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad", "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09", @@ -1149,7 +1148,7 @@ } } }, - "ingest-agent-configs": { + "ingest-agent-policies": { "properties": { "description": { "type": "text" @@ -2213,4 +2212,4 @@ } } } -} \ No newline at end of file +} diff --git a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json index 2cfa0bde4e97724..dc92d23a618d33b 100644 --- a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json +++ b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json @@ -39,7 +39,7 @@ "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1", "index-pattern": "66eccb05066c5a89924f48a9e9736499", "infrastructure-ui-source": "2b2809653635caf490c93f090502d04c", - "ingest-agent-configs": "9326f99c977fd2ef5ab24b6336a0675c", + "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c", "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3", "ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad", "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09", @@ -1222,7 +1222,7 @@ } } }, - "ingest-agent-configs": { + "ingest-agent-policies": { "properties": { "description": { "type": "text" From af358c94a3e17aeb2c78c0edd50c233a4e3558c0 Mon Sep 17 00:00:00 2001 From: Melissa Alvarez Date: Wed, 5 Aug 2020 17:58:40 -0400 Subject: [PATCH 12/21] [ML] DF Analytics: adds functional tests for edit form (#73885) * add edit analytics functional test * adds edit test service * update edit test wording for clarity * check flyout closes after edit * rename testSubj for consitency --- .../action_edit/edit_button_flyout.tsx | 4 +- .../components/analytics_list/use_columns.tsx | 1 + .../classification_creation.ts | 31 ++++++++ .../outlier_detection_creation.ts | 31 ++++++++ .../regression_creation.ts | 31 ++++++++ .../services/ml/data_frame_analytics_edit.ts | 71 +++++++++++++++++++ .../services/ml/data_frame_analytics_table.ts | 6 ++ x-pack/test/functional/services/ml/index.ts | 3 + 8 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 x-pack/test/functional/services/ml/data_frame_analytics_edit.ts diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx index 86b1c879417bbff..14b743997f30a22 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx @@ -133,7 +133,7 @@ export const EditButtonFlyout: FC> = ({ closeFlyout, item } onClose={closeFlyout} hideCloseButton aria-labelledby="analyticsEditFlyoutTitle" - data-test-subj="analyticsEditFlyout" + data-test-subj="mlAnalyticsEditFlyout" > @@ -297,7 +297,7 @@ export const EditButtonFlyout: FC> = ({ closeFlyout, item } { @@ -179,6 +180,36 @@ export default function ({ getService }: FtrProviderContext) { }); }); + it('should open the edit form for the created job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId); + }); + + it('should input the description in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription); + }); + + it('should input the model memory limit in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb'); + }); + + it('should submit the edit job form', async () => { + await ml.dataFrameAnalyticsEdit.updateAnalyticsJob(); + }); + + it('displays details for the edited job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, { + id: testData.jobId, + description: editedDescription, + sourceIndex: testData.source, + destinationIndex: testData.destinationIndex, + type: testData.expected.row.type, + status: testData.expected.row.status, + progress: testData.expected.row.progress, + }); + }); + it('creates the destination index and writes results to it', async () => { await ml.api.assertIndicesExist(testData.destinationIndex); await ml.api.assertIndicesNotEmpty(testData.destinationIndex); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index 0320354b99ff00a..5b89cec49db3e44 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -10,6 +10,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); + const editedDescription = 'Edited description'; describe('outlier detection creation', function () { before(async () => { @@ -197,6 +198,36 @@ export default function ({ getService }: FtrProviderContext) { }); }); + it('should open the edit form for the created job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId); + }); + + it('should input the description in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription); + }); + + it('should input the model memory limit in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb'); + }); + + it('should submit the edit job form', async () => { + await ml.dataFrameAnalyticsEdit.updateAnalyticsJob(); + }); + + it('displays details for the edited job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, { + id: testData.jobId, + description: editedDescription, + sourceIndex: testData.source, + destinationIndex: testData.destinationIndex, + type: testData.expected.row.type, + status: testData.expected.row.status, + progress: testData.expected.row.progress, + }); + }); + it('creates the destination index and writes results to it', async () => { await ml.api.assertIndicesExist(testData.destinationIndex); await ml.api.assertIndicesNotEmpty(testData.destinationIndex); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts index 1aa505e26e1e9a4..a67a34832334793 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts @@ -10,6 +10,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); + const editedDescription = 'Edited description'; describe('regression creation', function () { before(async () => { @@ -179,6 +180,36 @@ export default function ({ getService }: FtrProviderContext) { }); }); + it('should open the edit form for the created job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId); + }); + + it('should input the description in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription); + }); + + it('should input the model memory limit in the edit form', async () => { + await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists(); + await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb'); + }); + + it('should submit the edit job form', async () => { + await ml.dataFrameAnalyticsEdit.updateAnalyticsJob(); + }); + + it('displays details for the edited job in the analytics table', async () => { + await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, { + id: testData.jobId, + description: editedDescription, + sourceIndex: testData.source, + destinationIndex: testData.destinationIndex, + type: testData.expected.row.type, + status: testData.expected.row.status, + progress: testData.expected.row.progress, + }); + }); + it('creates the destination index and writes results to it', async () => { await ml.api.assertIndicesExist(testData.destinationIndex); await ml.api.assertIndicesNotEmpty(testData.destinationIndex); diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts new file mode 100644 index 000000000000000..fd06dd24d6f8bea --- /dev/null +++ b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts @@ -0,0 +1,71 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import expect from '@kbn/expect'; + +import { FtrProviderContext } from '../../ftr_provider_context'; +import { MlCommon } from './common'; + +export function MachineLearningDataFrameAnalyticsEditProvider( + { getService }: FtrProviderContext, + mlCommon: MlCommon +) { + const testSubjects = getService('testSubjects'); + const retry = getService('retry'); + + return { + async assertJobDescriptionEditInputExists() { + await testSubjects.existOrFail('mlAnalyticsEditFlyoutDescriptionInput'); + }, + async assertJobDescriptionEditValue(expectedValue: string) { + const actualJobDescription = await testSubjects.getAttribute( + 'mlAnalyticsEditFlyoutDescriptionInput', + 'value' + ); + expect(actualJobDescription).to.eql( + expectedValue, + `Job description edit should be '${expectedValue}' (got '${actualJobDescription}')` + ); + }, + async assertJobMmlEditInputExists() { + await testSubjects.existOrFail('mlAnalyticsEditFlyoutmodelMemoryLimitInput'); + }, + async assertJobMmlEditValue(expectedValue: string) { + const actualMml = await testSubjects.getAttribute( + 'mlAnalyticsEditFlyoutmodelMemoryLimitInput', + 'value' + ); + expect(actualMml).to.eql( + expectedValue, + `Job model memory limit edit should be '${expectedValue}' (got '${actualMml}')` + ); + }, + async setJobDescriptionEdit(jobDescription: string) { + await mlCommon.setValueWithChecks('mlAnalyticsEditFlyoutDescriptionInput', jobDescription, { + clearWithKeyboard: true, + }); + await this.assertJobDescriptionEditValue(jobDescription); + }, + + async setJobMmlEdit(mml: string) { + await mlCommon.setValueWithChecks('mlAnalyticsEditFlyoutmodelMemoryLimitInput', mml, { + clearWithKeyboard: true, + }); + await this.assertJobMmlEditValue(mml); + }, + + async assertAnalyticsEditFlyoutMissing() { + await testSubjects.missingOrFail('mlAnalyticsEditFlyout'); + }, + + async updateAnalyticsJob() { + await testSubjects.existOrFail('mlAnalyticsEditFlyoutUpdateButton'); + await testSubjects.click('mlAnalyticsEditFlyoutUpdateButton'); + await retry.tryForTime(5000, async () => { + await this.assertAnalyticsEditFlyoutMissing(); + }); + }, + }; +} diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts index d315f9eb772104b..608a1f2bee3e10e 100644 --- a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts +++ b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts @@ -88,6 +88,12 @@ export function MachineLearningDataFrameAnalyticsTableProvider({ getService }: F await testSubjects.existOrFail('mlAnalyticsJobViewButton'); } + public async openEditFlyout(analyticsId: string) { + await this.openRowActions(analyticsId); + await testSubjects.click('mlAnalyticsJobEditButton'); + await testSubjects.existOrFail('mlAnalyticsEditFlyout', { timeout: 5000 }); + } + async assertAnalyticsSearchInputValue(expectedSearchValue: string) { const searchBarInput = await this.getAnalyticsSearchInput(); const actualSearchValue = await searchBarInput.getAttribute('value'); diff --git a/x-pack/test/functional/services/ml/index.ts b/x-pack/test/functional/services/ml/index.ts index fbf31e40a242a2d..fd36bb0f47f95d5 100644 --- a/x-pack/test/functional/services/ml/index.ts +++ b/x-pack/test/functional/services/ml/index.ts @@ -13,6 +13,7 @@ import { MachineLearningCommonProvider } from './common'; import { MachineLearningCustomUrlsProvider } from './custom_urls'; import { MachineLearningDataFrameAnalyticsProvider } from './data_frame_analytics'; import { MachineLearningDataFrameAnalyticsCreationProvider } from './data_frame_analytics_creation'; +import { MachineLearningDataFrameAnalyticsEditProvider } from './data_frame_analytics_edit'; import { MachineLearningDataFrameAnalyticsTableProvider } from './data_frame_analytics_table'; import { MachineLearningDataVisualizerProvider } from './data_visualizer'; import { MachineLearningDataVisualizerFileBasedProvider } from './data_visualizer_file_based'; @@ -47,6 +48,7 @@ export function MachineLearningProvider(context: FtrProviderContext) { common, api ); + const dataFrameAnalyticsEdit = MachineLearningDataFrameAnalyticsEditProvider(context, common); const dataFrameAnalyticsTable = MachineLearningDataFrameAnalyticsTableProvider(context); const dataVisualizer = MachineLearningDataVisualizerProvider(context); const dataVisualizerFileBased = MachineLearningDataVisualizerFileBasedProvider(context, common); @@ -76,6 +78,7 @@ export function MachineLearningProvider(context: FtrProviderContext) { customUrls, dataFrameAnalytics, dataFrameAnalyticsCreation, + dataFrameAnalyticsEdit, dataFrameAnalyticsTable, dataVisualizer, dataVisualizerFileBased, From b001301f5ad44757fa83bffc7f4dac1f007c18b6 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 16 Jul 2020 08:47:23 -0700 Subject: [PATCH 13/21] skip flaky suite (#71390) (cherry picked from commit d0afbd887dc547ebbc564f77edf2ef04750fc653) --- .../test_suites/task_manager/task_manager_integration.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js index c87a5039360b8f2..ea95eb42dd6ff5b 100644 --- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js +++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js @@ -28,7 +28,8 @@ export default function ({ getService }) { const testHistoryIndex = '.kibana_task_manager_test_result'; const supertest = supertestAsPromised(url.format(config.get('servers.kibana'))); - describe('scheduling and running tasks', () => { + // FLAKY: https://github.com/elastic/kibana/issues/71390 + describe.skip('scheduling and running tasks', () => { beforeEach( async () => await supertest.delete('/api/sample_tasks').set('kbn-xsrf', 'xxx').expect(200) ); From 4b3326d6fbafb09bb6eb8552c0a17505af50aabe Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 5 Aug 2020 15:08:38 -0700 Subject: [PATCH 14/21] [DOCS] Add Kibana alerts to Stack Monitoring (#73762) Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../images/monitoring-kibana-alerts.png | Bin 0 -> 113426 bytes docs/user/monitoring/index.asciidoc | 1 + docs/user/monitoring/kibana-alerts.asciidoc | 36 ++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 docs/user/monitoring/images/monitoring-kibana-alerts.png create mode 100644 docs/user/monitoring/kibana-alerts.asciidoc diff --git a/docs/user/monitoring/images/monitoring-kibana-alerts.png b/docs/user/monitoring/images/monitoring-kibana-alerts.png new file mode 100644 index 0000000000000000000000000000000000000000..43edcb45041400ea128a9b6ee397df9188dff82f GIT binary patch literal 113426 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 literal 0 HcmV?d00001 diff --git a/docs/user/monitoring/index.asciidoc b/docs/user/monitoring/index.asciidoc index ab773657073badd..514988792d214e6 100644 --- a/docs/user/monitoring/index.asciidoc +++ b/docs/user/monitoring/index.asciidoc @@ -2,6 +2,7 @@ include::xpack-monitoring.asciidoc[] include::beats-details.asciidoc[leveloffset=+1] include::cluster-alerts.asciidoc[leveloffset=+1] include::elasticsearch-details.asciidoc[leveloffset=+1] +include::kibana-alerts.asciidoc[leveloffset=+1] include::kibana-details.asciidoc[leveloffset=+1] include::logstash-details.asciidoc[leveloffset=+1] include::monitoring-troubleshooting.asciidoc[leveloffset=+1] diff --git a/docs/user/monitoring/kibana-alerts.asciidoc b/docs/user/monitoring/kibana-alerts.asciidoc new file mode 100644 index 000000000000000..1ac5c385f8ed505 --- /dev/null +++ b/docs/user/monitoring/kibana-alerts.asciidoc @@ -0,0 +1,36 @@ +[role="xpack"] +[[kibana-alerts]] += {kib} Alerts + +The {stack} {monitor-features} provide +<> out-of-the box to notify you of +potential issues in the {stack}. These alerts are preconfigured based on the +best practices recommended by Elastic. However, you can tailor them to meet your +specific needs. + +When you open *{stack-monitor-app}*, the preconfigured {kib} alerts are +created automatically. If you collect monitoring data from multiple clusters, +these alerts can search, detect, and notify on various conditions across the +clusters. The alerts are visible alongside your existing {watcher} cluster +alerts. You can view details about the alerts that are active and view health +and performance data for {es}, {ls}, and Beats in real time, as well as +analyze past performance. You can also modify active alerts. + +[role="screenshot"] +image::user/monitoring/images/monitoring-kibana-alerts.png["Kibana alerts in the Stack Monitoring app"] + +To review and modify all the available alerts, use +<> in *{stack-manage-app}*. + +[discrete] +[[kibana-alerts-cpu-threshold]] +== CPU threshold + +This alert is triggered when a node runs a consistently high CPU load. By +default, the trigger condition is set at 85% or more averaged over the last 5 +minutes. The alert is grouped across all the nodes of the cluster by running +checks on a schedule time of 1 minute with a re-notify internal of 1 day. + +NOTE: Some action types are subscription features, while others are free. +For a comparison of the Elastic subscription levels, see the alerting section of +the {subscriptions}[Subscriptions page]. From 9ef04e7fb21306456e182c4feb422bf09a7113a0 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Wed, 5 Aug 2020 15:28:03 -0700 Subject: [PATCH 15/21] Rename package configs SO to package policies (#74422) --- .../plugins/ingest_manager/common/constants/package_config.ts | 2 +- .../services/artifacts/manifest_manager/manifest_manager.ts | 2 +- x-pack/test/functional/es_archives/fleet/agents/mappings.json | 4 ++-- x-pack/test/functional/es_archives/lists/mappings.json | 4 ++-- .../es_archives/reporting/canvas_disallowed_url/mappings.json | 4 ++-- .../es_archives/export_rule/mappings.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/ingest_manager/common/constants/package_config.ts b/x-pack/plugins/ingest_manager/common/constants/package_config.ts index e7d5ef67f7253f4..48fee967a3d3d63 100644 --- a/x-pack/plugins/ingest_manager/common/constants/package_config.ts +++ b/x-pack/plugins/ingest_manager/common/constants/package_config.ts @@ -4,4 +4,4 @@ * you may not use this file except in compliance with the Elastic License. */ -export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-configs'; +export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-policies'; diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts index c20aaed10f3f88f..9d15b4464c19176 100644 --- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts +++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts @@ -237,7 +237,7 @@ export class ManifestManager { const { items, total } = await this.packageConfigService.list(this.savedObjectsClient, { page, perPage: 20, - kuery: 'ingest-package-configs.package.name:endpoint', + kuery: 'ingest-package-policies.package.name:endpoint', }); for (const packageConfig of items) { diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json index acc32c3e2cbb58b..23b404a53703f42 100644 --- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json +++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json @@ -28,7 +28,7 @@ "application_usage_transactional": "965839e75f809fefe04f92dc4d99722a", "action_task_params": "a9d49f184ee89641044be0ca2950fa3a", "fleet-agent-events": "3231653fafe4ef3196fe3b32ab774bf2", - "ingest-package-configs": "2346514df03316001d56ed4c8d46fa94", + "ingest-package-policies": "2346514df03316001d56ed4c8d46fa94", "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd", "inventory-view": "5299b67717e96502c77babf1c16fd4d3", "upgrade-assistant-reindex-operation": "296a89039fc4260292be36b1b005d8f2", @@ -1834,7 +1834,7 @@ } } }, - "ingest-package-configs": { + "ingest-package-policies": { "properties": { "config_id": { "type": "keyword" diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json index 2fc1f1a3111a7af..3b4d915cc1ca5af 100644 --- a/x-pack/test/functional/es_archives/lists/mappings.json +++ b/x-pack/test/functional/es_archives/lists/mappings.json @@ -70,7 +70,7 @@ "maps-telemetry": "5ef305b18111b77789afefbd36b66171", "namespace": "2f4316de49999235636386fe51dc06c1", "cases-user-actions": "32277330ec6b721abe3b846cfd939a71", - "ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad", + "ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad", "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf", "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29", "config": "c63748b75f39d0c54de12d12c1ccbc20", @@ -1274,7 +1274,7 @@ } } }, - "ingest-package-configs": { + "ingest-package-policies": { "properties": { "config_id": { "type": "keyword" diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json index 1fd338fbb0ffb91..3519103d0681481 100644 --- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json +++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json @@ -39,7 +39,7 @@ "index-pattern": "66eccb05066c5a89924f48a9e9736499", "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c", "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3", - "ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad", + "ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad", "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09", "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", "lens": "d33c68a69ff1e78c9888dedd2164ac22", @@ -1212,7 +1212,7 @@ } } }, - "ingest-package-configs": { + "ingest-package-policies": { "properties": { "config_id": { "type": "keyword" diff --git a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json index dc92d23a618d33b..bb63d29503663a8 100644 --- a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json +++ b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json @@ -41,7 +41,7 @@ "infrastructure-ui-source": "2b2809653635caf490c93f090502d04c", "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c", "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3", - "ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad", + "ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad", "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09", "inventory-view": "88fc7e12fd1b45b6f0787323ce4f18d2", "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", @@ -1286,7 +1286,7 @@ } } }, - "ingest-package-configs": { + "ingest-package-policies": { "properties": { "config_id": { "type": "keyword" From 4ae6746c0bd5ffd34d70720b641506088d768840 Mon Sep 17 00:00:00 2001 From: Kevin Logan <56395104+kevinlog@users.noreply.github.com> Date: Wed, 5 Aug 2020 18:32:22 -0400 Subject: [PATCH 16/21] [SECURITY_SOLUTION] add z-index to get over nav bar (#74427) --- .../management/pages/endpoint_hosts/view/details/index.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx index b22ff406a1605e1..69dabeeb616a0e0 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx @@ -70,7 +70,12 @@ export const HostDetailsFlyout = memo(() => { }, [error, toasts]); return ( - +

From dfad75ff1a9e9849c413dfe665229c7f7405d5c6 Mon Sep 17 00:00:00 2001 From: Brent Kimmel Date: Wed, 5 Aug 2020 18:46:56 -0400 Subject: [PATCH 17/21] [Security Solution][Test] Enzyme test for related events button (#74411) Co-authored-by: Elastic Machine --- .../mocks/one_ancestor_two_children.ts | 46 +++++++++----- .../resolver/store/mocks/related_event.ts | 36 +++++++++++ .../resolver/store/mocks/resolver_tree.ts | 53 ++++++++++++++++ .../test_utilities/simulator/index.tsx | 22 +++++++ .../resolver/view/clickthrough.test.tsx | 62 +++++++++++++++++-- .../public/resolver/view/submenu.tsx | 1 + 6 files changed, 198 insertions(+), 22 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts index be0bc1b812a0b43..94c176d343d177f 100644 --- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts +++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts @@ -10,7 +10,10 @@ import { ResolverEntityIndex, } from '../../../../common/endpoint/types'; import { mockEndpointEvent } from '../../store/mocks/endpoint_event'; -import { mockTreeWithNoAncestorsAnd2Children } from '../../store/mocks/resolver_tree'; +import { + mockTreeWithNoAncestorsAnd2Children, + withRelatedEventsOnOrigin, +} from '../../store/mocks/resolver_tree'; import { DataAccessLayer } from '../../types'; interface Metadata { @@ -40,11 +43,24 @@ interface Metadata { /** * A simple mock dataAccessLayer possible that returns a tree with 0 ancestors and 2 direct children. 1 related event is returned. The parameter to `entities` is ignored. */ -export function oneAncestorTwoChildren(): { dataAccessLayer: DataAccessLayer; metadata: Metadata } { +export function oneAncestorTwoChildren( + { withRelatedEvents }: { withRelatedEvents: Iterable<[string, string]> | null } = { + withRelatedEvents: null, + } +): { dataAccessLayer: DataAccessLayer; metadata: Metadata } { const metadata: Metadata = { databaseDocumentID: '_id', entityIDs: { origin: 'origin', firstChild: 'firstChild', secondChild: 'secondChild' }, }; + const baseTree = mockTreeWithNoAncestorsAnd2Children({ + originID: metadata.entityIDs.origin, + firstChildID: metadata.entityIDs.firstChild, + secondChildID: metadata.entityIDs.secondChild, + }); + const composedTree = withRelatedEvents + ? withRelatedEventsOnOrigin(baseTree, withRelatedEvents) + : baseTree; + return { metadata, dataAccessLayer: { @@ -54,13 +70,17 @@ export function oneAncestorTwoChildren(): { dataAccessLayer: DataAccessLayer; me relatedEvents(entityID: string): Promise { return Promise.resolve({ entityID, - events: [ - mockEndpointEvent({ - entityID, - name: 'event', - timestamp: 0, - }), - ], + events: + /* Respond with the mocked related events when the origin's related events are fetched*/ withRelatedEvents && + entityID === metadata.entityIDs.origin + ? composedTree.relatedEvents.events + : [ + mockEndpointEvent({ + entityID, + name: 'event', + timestamp: 0, + }), + ], nextEvent: null, }); }, @@ -69,13 +89,7 @@ export function oneAncestorTwoChildren(): { dataAccessLayer: DataAccessLayer; me * Fetch a ResolverTree for a entityID */ resolverTree(): Promise { - return Promise.resolve( - mockTreeWithNoAncestorsAnd2Children({ - originID: metadata.entityIDs.origin, - firstChildID: metadata.entityIDs.firstChild, - secondChildID: metadata.entityIDs.secondChild, - }) - ); + return Promise.resolve(composedTree); }, /** diff --git a/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts b/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts new file mode 100644 index 000000000000000..1e0c460a3a711db --- /dev/null +++ b/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { EndpointEvent } from '../../../../common/endpoint/types'; + +/** + * Simple mock related event. + */ +export function mockRelatedEvent({ + entityID, + timestamp, + category, + type, + id, +}: { + entityID: string; + timestamp: number; + category: string; + type: string; + id?: string; +}): EndpointEvent { + return { + '@timestamp': timestamp, + event: { + kind: 'event', + type, + category, + id: id ?? 'xyz', + }, + process: { + entity_id: entityID, + }, + } as EndpointEvent; +} diff --git a/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts b/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts index 6a8ab61ccf9b647..21d0309501aa88c 100644 --- a/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts +++ b/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts @@ -5,6 +5,7 @@ */ import { mockEndpointEvent } from './endpoint_event'; +import { mockRelatedEvent } from './related_event'; import { ResolverTree, ResolverEvent } from '../../../../common/endpoint/types'; export function mockTreeWith2AncestorsAndNoChildren({ @@ -109,6 +110,58 @@ export function mockTreeWithAllProcessesTerminated({ } as unknown) as ResolverTree; } +/** + * A valid category for a related event. E.g. "registry", "network", "file" + */ +type RelatedEventCategory = string; +/** + * A valid type for a related event. E.g. "start", "end", "access" + */ +type RelatedEventType = string; + +/** + * Add/replace related event info (on origin node) for any mock ResolverTree + * + * @param treeToAddRelatedEventsTo the ResolverTree to modify + * @param relatedEventsToAddByCategoryAndType Iterable of `[category, type]` pairs describing related events. e.g. [['dns','info'],['registry','access']] + */ +export function withRelatedEventsOnOrigin( + treeToAddRelatedEventsTo: ResolverTree, + relatedEventsToAddByCategoryAndType: Iterable<[RelatedEventCategory, RelatedEventType]> +): ResolverTree { + const events = []; + const byCategory: Record = {}; + const stats = { + totalAlerts: 0, + events: { + total: 0, + byCategory, + }, + }; + for (const [category, type] of relatedEventsToAddByCategoryAndType) { + events.push( + mockRelatedEvent({ + entityID: treeToAddRelatedEventsTo.entityID, + timestamp: 1, + category, + type, + }) + ); + stats.events.total++; + stats.events.byCategory[category] = stats.events.byCategory[category] + ? stats.events.byCategory[category] + 1 + : 1; + } + return { + ...treeToAddRelatedEventsTo, + stats, + relatedEvents: { + events, + nextEvent: null, + }, + }; +} + export function mockTreeWithNoAncestorsAnd2Children({ originID, firstChildID, diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx index 2a2354921a3d41c..ed30643ed871e4e 100644 --- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx +++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx @@ -220,6 +220,28 @@ export class Simulator { ); } + /** + * Dump all contents of the outer ReactWrapper (to be `console.log`ged as appropriate) + * This will include both DOM (div, span, etc.) and React/JSX (MyComponent, MyGrid, etc.) + */ + public debugWrapper() { + return this.wrapper.debug(); + } + + /** + * Return an Enzyme ReactWrapper that includes the Related Events host button for a given process node + * + * @param entityID The entity ID of the proocess node to select in + */ + public processNodeRelatedEventButton(entityID: string): ReactWrapper { + return this.processNodeElements({ entityID }).findWhere( + (wrapper) => + // Filter out React components + typeof wrapper.type() === 'string' && + wrapper.prop('data-test-subj') === 'resolver:submenu:button' + ); + } + /** * Return the selected node query string values. */ diff --git a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx index f339d128944cc11..c819491dd28f0d6 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx @@ -9,14 +9,14 @@ import { Simulator } from '../test_utilities/simulator'; // Extend jest with a custom matcher import '../test_utilities/extend_jest'; -describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', () => { - let simulator: Simulator; - let databaseDocumentID: string; - let entityIDs: { origin: string; firstChild: string; secondChild: string }; +let simulator: Simulator; +let databaseDocumentID: string; +let entityIDs: { origin: string; firstChild: string; secondChild: string }; - // the resolver component instance ID, used by the react code to distinguish piece of global state from those used by other resolver instances - const resolverComponentInstanceID = 'resolverComponentInstanceID'; +// the resolver component instance ID, used by the react code to distinguish piece of global state from those used by other resolver instances +const resolverComponentInstanceID = 'resolverComponentInstanceID'; +describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', () => { beforeEach(async () => { // create a mock data access layer const { metadata: dataAccessLayerMetadata, dataAccessLayer } = oneAncestorTwoChildren(); @@ -79,6 +79,7 @@ describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', ( simulator .processNodeElements({ entityID: entityIDs.secondChild }) .find('button') + .first() .simulate('click'); }); it('should render the second child node as selected, and the first child not as not selected, and the query string should indicate that the second child is selected', async () => { @@ -107,3 +108,52 @@ describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', ( }); }); }); + +describe('Resolver, when analyzing a tree that has some related events', () => { + beforeEach(async () => { + // create a mock data access layer with related events + const { metadata: dataAccessLayerMetadata, dataAccessLayer } = oneAncestorTwoChildren({ + withRelatedEvents: [ + ['registry', 'access'], + ['registry', 'access'], + ], + }); + + // save a reference to the entity IDs exposed by the mock data layer + entityIDs = dataAccessLayerMetadata.entityIDs; + + // save a reference to the `_id` supported by the mock data layer + databaseDocumentID = dataAccessLayerMetadata.databaseDocumentID; + + // create a resolver simulator, using the data access layer and an arbitrary component instance ID + simulator = new Simulator({ databaseDocumentID, dataAccessLayer, resolverComponentInstanceID }); + }); + + describe('when it has loaded', () => { + beforeEach(async () => { + await expect( + simulator.mapStateTransitions(() => ({ + graphElements: simulator.graphElement().length, + graphLoadingElements: simulator.graphLoadingElement().length, + graphErrorElements: simulator.graphErrorElement().length, + originNode: simulator.processNodeElements({ entityID: entityIDs.origin }).length, + })) + ).toYieldEqualTo({ + graphElements: 1, + graphLoadingElements: 0, + graphErrorElements: 0, + originNode: 1, + }); + }); + + it('should render a related events button', async () => { + await expect( + simulator.mapStateTransitions(() => ({ + relatedEventButtons: simulator.processNodeRelatedEventButton(entityIDs.origin).length, + })) + ).toYieldEqualTo({ + relatedEventButtons: 1, + }); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx index 6a9ab184e9bab08..7f0ba244146fd6e 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx @@ -233,6 +233,7 @@ const NodeSubMenuComponents = React.memo( iconType={menuIsOpen ? 'arrowUp' : 'arrowDown'} iconSide="right" tabIndex={-1} + data-test-subj="resolver:submenu:button" > {count ? : ''} {menuTitle} From f5c9aa8860f813b88d910370e735a22ab988e688 Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Wed, 5 Aug 2020 18:55:23 -0500 Subject: [PATCH 18/21] Filter out non-security jobs when collecting Detections telemetry (#74456) Our jobs summary call returns all installed jobs regardless of group; passing groups as jobIds does not perform group filtering. This adds a helper predicate function on which to filter these results, and updates tests accordingly. --- .../security_solution/common/constants.ts | 7 +++++ .../machine_learning/is_security_job.test.ts | 30 +++++++++++++++++++ .../machine_learning/is_security_job.ts | 11 +++++++ .../usage/detections/detections.mocks.ts | 15 +++++++++- .../usage/detections/detections_helpers.ts | 7 ++--- 5 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts create mode 100644 x-pack/plugins/security_solution/common/machine_learning/is_security_job.ts diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts index c74cf888a2db667..0fc42895050a531 100644 --- a/x-pack/plugins/security_solution/common/constants.ts +++ b/x-pack/plugins/security_solution/common/constants.ts @@ -140,6 +140,13 @@ export const UNAUTHENTICATED_USER = 'Unauthenticated'; */ export const MINIMUM_ML_LICENSE = 'platinum'; +/* + Machine Learning constants + */ +export const ML_GROUP_ID = 'security'; +export const LEGACY_ML_GROUP_ID = 'siem'; +export const ML_GROUP_IDS = [ML_GROUP_ID, LEGACY_ML_GROUP_ID]; + /* Rule notifications options */ diff --git a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts new file mode 100644 index 000000000000000..abb0c790584af7e --- /dev/null +++ b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MlSummaryJob } from '../../../ml/common/types/anomaly_detection_jobs'; +import { isSecurityJob } from './is_security_job'; + +describe('isSecurityJob', () => { + it('counts a job with a group of "siem"', () => { + const job = { groups: ['siem', 'other'] } as MlSummaryJob; + expect(isSecurityJob(job)).toEqual(true); + }); + + it('counts a job with a group of "security"', () => { + const job = { groups: ['security', 'other'] } as MlSummaryJob; + expect(isSecurityJob(job)).toEqual(true); + }); + + it('counts a job in both "security" and "siem"', () => { + const job = { groups: ['siem', 'security'] } as MlSummaryJob; + expect(isSecurityJob(job)).toEqual(true); + }); + + it('does not count a job in a related group', () => { + const job = { groups: ['auditbeat', 'process'] } as MlSummaryJob; + expect(isSecurityJob(job)).toEqual(false); + }); +}); diff --git a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.ts b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.ts new file mode 100644 index 000000000000000..43cfa4ad599640c --- /dev/null +++ b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MlSummaryJob } from '../../../ml/common/types/anomaly_detection_jobs'; +import { ML_GROUP_IDS } from '../constants'; + +export const isSecurityJob = (job: MlSummaryJob): boolean => + job.groups.some((group) => ML_GROUP_IDS.includes(group)); diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts index e59b1092978dafd..7afc185ae07fd1d 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts @@ -41,7 +41,7 @@ export const getMockJobSummaryResponse = () => [ { id: 'other_job', description: 'a job that is custom', - groups: ['auditbeat', 'process'], + groups: ['auditbeat', 'process', 'security'], processed_record_count: 0, memory_status: 'ok', jobState: 'closed', @@ -54,6 +54,19 @@ export const getMockJobSummaryResponse = () => [ { id: 'another_job', description: 'another job that is custom', + groups: ['auditbeat', 'process', 'security'], + processed_record_count: 0, + memory_status: 'ok', + jobState: 'opened', + hasDatafeed: true, + datafeedId: 'datafeed-another', + datafeedIndices: ['auditbeat-*'], + datafeedState: 'started', + isSingleMetricViewerJob: true, + }, + { + id: 'irrelevant_job', + description: 'a non-security job', groups: ['auditbeat', 'process'], processed_record_count: 0, memory_status: 'ok', diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts index 80a9dba26df8edf..a6d4dc7a38e14af 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts @@ -15,6 +15,7 @@ import { MlPluginSetup } from '../../../../ml/server'; import { SIGNALS_ID, INTERNAL_IMMUTABLE_KEY } from '../../../common/constants'; import { DetectionRulesUsage, MlJobsUsage } from './index'; import { isJobStarted } from '../../../common/machine_learning/helpers'; +import { isSecurityJob } from '../../../common/machine_learning/is_security_job'; interface DetectionsMetric { isElastic: boolean; @@ -182,11 +183,9 @@ export const getMlJobsUsage = async (ml: MlPluginSetup | undefined): Promise module.jobs); - const jobs = await ml - .jobServiceProvider(internalMlClient, fakeRequest) - .jobsSummary(['siem', 'security']); + const jobs = await ml.jobServiceProvider(internalMlClient, fakeRequest).jobsSummary(); - jobsUsage = jobs.reduce((usage, job) => { + jobsUsage = jobs.filter(isSecurityJob).reduce((usage, job) => { const isElastic = moduleJobs.some((moduleJob) => moduleJob.id === job.id); const isEnabled = isJobStarted(job.jobState, job.datafeedState); From aa75f80afd853960ace1cf2b2e526395635828dd Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Thu, 6 Aug 2020 08:07:19 +0200 Subject: [PATCH 19/21] Skip "space with index pattern management disabled" functional test for cloud env (#74073) * Skipped due to occasional flakiness in cloud env, cause by ingest management tests --- .../apps/discover/feature_controls/discover_spaces.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts index 767dad74c23d72b..f8dc2f3b0aeb8a3 100644 --- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts +++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts @@ -137,7 +137,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); }); - describe('space with index pattern management disabled', () => { + describe('space with index pattern management disabled', function () { + // unskipped because of flakiness in cloud, caused be ingest management tests + // should be unskipped when https://github.com/elastic/kibana/issues/74353 was resolved + this.tags(['skipCloud']); before(async () => { await spacesService.create({ id: 'custom_space_no_index_patterns', From 626fbc294857a565afdd19dbd7262b7452e3ca7f Mon Sep 17 00:00:00 2001 From: Marta Bondyra Date: Thu, 6 Aug 2020 10:10:09 +0200 Subject: [PATCH 20/21] [Lens] Clean and inline disabling of react-hooks/exhaustive-deps eslint rule (#70010) --- .eslintrc.js | 6 - x-pack/plugins/lens/public/app_plugin/app.tsx | 114 +++++----- .../datatable_visualization/expression.tsx | 5 +- .../debounced_component.tsx | 8 +- .../config_panel/config_panel.tsx | 12 +- .../editor_frame/data_panel_wrapper.tsx | 7 +- .../editor_frame/editor_frame.tsx | 210 ++++++++++-------- .../editor_frame/suggestion_panel.tsx | 4 +- .../workspace_panel/chart_switch.tsx | 1 + .../workspace_panel/workspace_panel.tsx | 96 ++++---- .../indexpattern_datasource/datapanel.tsx | 11 +- .../dimension_panel/field_select.tsx | 4 +- x-pack/plugins/lens/public/loader.tsx | 44 ++-- .../xy_visualization/xy_config_panel.tsx | 2 +- .../public/xy_visualization/xy_expression.tsx | 2 +- 15 files changed, 285 insertions(+), 241 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b3d29c986641146..5a03552ba3a51bd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -132,12 +132,6 @@ module.exports = { 'react-hooks/rules-of-hooks': 'off', }, }, - { - files: ['x-pack/plugins/lens/**/*.{js,mjs,ts,tsx}'], - rules: { - 'react-hooks/exhaustive-deps': 'off', - }, - }, { files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'], rules: { diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx index ab4c4820315ac93..4a8694862642b5c 100644 --- a/x-pack/plugins/lens/public/app_plugin/app.tsx +++ b/x-pack/plugins/lens/public/app_plugin/app.tsx @@ -163,7 +163,13 @@ export function App({ filterSubscription.unsubscribe(); timeSubscription.unsubscribe(); }; - }, [data.query.filterManager, data.query.timefilter.timefilter]); + }, [ + data.query.filterManager, + data.query.timefilter.timefilter, + core.uiSettings, + data.query, + history, + ]); useEffect(() => { onAppLeave((actions) => { @@ -210,57 +216,61 @@ export function App({ ]); }, [core.application, core.chrome, core.http.basePath, state.persistedDoc]); - useEffect(() => { - if (docId && (!state.persistedDoc || state.persistedDoc.id !== docId)) { - setState((s) => ({ ...s, isLoading: true })); - docStorage - .load(docId) - .then((doc) => { - getAllIndexPatterns( - doc.state.datasourceMetaData.filterableIndexPatterns, - data.indexPatterns, - core.notifications - ) - .then((indexPatterns) => { - // Don't overwrite any pinned filters - data.query.filterManager.setAppFilters(doc.state.filters); - setState((s) => ({ - ...s, - isLoading: false, - persistedDoc: doc, - lastKnownDoc: doc, - query: doc.state.query, - indexPatternsForTopNav: indexPatterns, - })); - }) - .catch(() => { - setState((s) => ({ ...s, isLoading: false })); - - redirectTo(); - }); - }) - .catch(() => { - setState((s) => ({ ...s, isLoading: false })); - - core.notifications.toasts.addDanger( - i18n.translate('xpack.lens.app.docLoadingError', { - defaultMessage: 'Error loading saved document', - }) - ); - - redirectTo(); - }); - } - }, [ - core.notifications, - data.indexPatterns, - data.query.filterManager, - docId, - // TODO: These dependencies are changing too often - // docStorage, - // redirectTo, - // state.persistedDoc, - ]); + useEffect( + () => { + if (docId && (!state.persistedDoc || state.persistedDoc.id !== docId)) { + setState((s) => ({ ...s, isLoading: true })); + docStorage + .load(docId) + .then((doc) => { + getAllIndexPatterns( + doc.state.datasourceMetaData.filterableIndexPatterns, + data.indexPatterns, + core.notifications + ) + .then((indexPatterns) => { + // Don't overwrite any pinned filters + data.query.filterManager.setAppFilters(doc.state.filters); + setState((s) => ({ + ...s, + isLoading: false, + persistedDoc: doc, + lastKnownDoc: doc, + query: doc.state.query, + indexPatternsForTopNav: indexPatterns, + })); + }) + .catch(() => { + setState((s) => ({ ...s, isLoading: false })); + + redirectTo(); + }); + }) + .catch(() => { + setState((s) => ({ ...s, isLoading: false })); + + core.notifications.toasts.addDanger( + i18n.translate('xpack.lens.app.docLoadingError', { + defaultMessage: 'Error loading saved document', + }) + ); + + redirectTo(); + }); + } + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [ + core.notifications, + data.indexPatterns, + data.query.filterManager, + docId, + // TODO: These dependencies are changing too often + // docStorage, + // redirectTo, + // state.persistedDoc, + ] + ); const runSave = async ( saveProps: Omit & { diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx index 143bec227ebeebd..02186ecf09b4bc5 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx @@ -160,6 +160,7 @@ export function DatatableComponent(props: DatatableRenderProps) { formatters[column.id] = props.formatFactory(column.formatHint); }); + const { onClickValue } = props; const handleFilterClick = useMemo( () => (field: string, value: unknown, colIndex: number, negate: boolean = false) => { const col = firstTable.columns[colIndex]; @@ -180,9 +181,9 @@ export function DatatableComponent(props: DatatableRenderProps) { ], timeFieldName, }; - props.onClickValue(desanitizeFilterContext(data)); + onClickValue(desanitizeFilterContext(data)); }, - [firstTable] + [firstTable, onClickValue] ); const bucketColumns = firstTable.columns diff --git a/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx b/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx index 08f55850b119ecc..0e148798cdf75ed 100644 --- a/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx +++ b/x-pack/plugins/lens/public/debounced_component/debounced_component.tsx @@ -17,13 +17,11 @@ export function debouncedComponent(component: FunctionComponent, return (props: TProps) => { const [cachedProps, setCachedProps] = useState(props); - const debouncePropsChange = debounce(setCachedProps, delay); - const delayRender = useMemo(() => debouncePropsChange, []); + const debouncePropsChange = useMemo(() => debounce(setCachedProps, delay), [setCachedProps]); // cancel debounced prop change if component has been unmounted in the meantime - useEffect(() => () => debouncePropsChange.cancel(), []); - - delayRender(props); + useEffect(() => () => debouncePropsChange.cancel(), [debouncePropsChange]); + debouncePropsChange(props); return React.createElement(MemoizedComponent, cachedProps); }; diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx index 73126b814f25677..5f041a8d8562f19 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx @@ -39,29 +39,29 @@ function LayerPanels( } = props; const setVisualizationState = useMemo( () => (newState: unknown) => { - props.dispatch({ + dispatch({ type: 'UPDATE_VISUALIZATION_STATE', visualizationId: activeVisualization.id, newState, clearStagedPreview: false, }); }, - [props.dispatch, activeVisualization] + [dispatch, activeVisualization] ); const updateDatasource = useMemo( () => (datasourceId: string, newState: unknown) => { - props.dispatch({ + dispatch({ type: 'UPDATE_DATASOURCE_STATE', updater: () => newState, datasourceId, clearStagedPreview: false, }); }, - [props.dispatch] + [dispatch] ); const updateAll = useMemo( () => (datasourceId: string, newDatasourceState: unknown, newVisualizationState: unknown) => { - props.dispatch({ + dispatch({ type: 'UPDATE_STATE', subType: 'UPDATE_ALL_STATES', updater: (prevState) => { @@ -83,7 +83,7 @@ function LayerPanels( }, }); }, - [props.dispatch] + [dispatch] ); const layerIds = activeVisualization.getLayerIds(visualizationState); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx index 0f74abe97c418c3..5a92f7b5ed5248c 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx @@ -27,16 +27,17 @@ interface DataPanelWrapperProps { } export const DataPanelWrapper = memo((props: DataPanelWrapperProps) => { + const { dispatch, activeDatasource } = props; const setDatasourceState: StateSetter = useMemo( () => (updater) => { - props.dispatch({ + dispatch({ type: 'UPDATE_DATASOURCE_STATE', updater, - datasourceId: props.activeDatasource!, + datasourceId: activeDatasource!, clearStagedPreview: true, }); }, - [props.dispatch, props.activeDatasource] + [dispatch, activeDatasource] ); const datasourceProps: DatasourceDataPanelProps = { diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx index bcceb1222ce0364..48a3511a8f35945 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx @@ -62,34 +62,38 @@ export function EditorFrame(props: EditorFrameProps) { ); // Initialize current datasource and all active datasources - useEffect(() => { - // prevents executing dispatch on unmounted component - let isUnmounted = false; - if (!allLoaded) { - Object.entries(props.datasourceMap).forEach(([datasourceId, datasource]) => { - if ( - state.datasourceStates[datasourceId] && - state.datasourceStates[datasourceId].isLoading - ) { - datasource - .initialize(state.datasourceStates[datasourceId].state || undefined) - .then((datasourceState) => { - if (!isUnmounted) { - dispatch({ - type: 'UPDATE_DATASOURCE_STATE', - updater: datasourceState, - datasourceId, - }); - } - }) - .catch(onError); - } - }); - } - return () => { - isUnmounted = true; - }; - }, [allLoaded]); + useEffect( + () => { + // prevents executing dispatch on unmounted component + let isUnmounted = false; + if (!allLoaded) { + Object.entries(props.datasourceMap).forEach(([datasourceId, datasource]) => { + if ( + state.datasourceStates[datasourceId] && + state.datasourceStates[datasourceId].isLoading + ) { + datasource + .initialize(state.datasourceStates[datasourceId].state || undefined) + .then((datasourceState) => { + if (!isUnmounted) { + dispatch({ + type: 'UPDATE_DATASOURCE_STATE', + updater: datasourceState, + datasourceId, + }); + } + }) + .catch(onError); + } + }); + } + return () => { + isUnmounted = true; + }; + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [allLoaded, onError] + ); const datasourceLayers: Record = {}; Object.keys(props.datasourceMap) @@ -156,83 +160,95 @@ export function EditorFrame(props: EditorFrameProps) { }, }; - useEffect(() => { - if (props.doc) { - dispatch({ - type: 'VISUALIZATION_LOADED', - doc: props.doc, - }); - } else { - dispatch({ - type: 'RESET', - state: getInitialState(props), - }); - } - }, [props.doc]); + useEffect( + () => { + if (props.doc) { + dispatch({ + type: 'VISUALIZATION_LOADED', + doc: props.doc, + }); + } else { + dispatch({ + type: 'RESET', + state: getInitialState(props), + }); + } + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [props.doc] + ); // Initialize visualization as soon as all datasources are ready - useEffect(() => { - if (allLoaded && state.visualization.state === null && activeVisualization) { - const initialVisualizationState = activeVisualization.initialize(framePublicAPI); - dispatch({ - type: 'UPDATE_VISUALIZATION_STATE', - visualizationId: activeVisualization.id, - newState: initialVisualizationState, - }); - } - }, [allLoaded, activeVisualization, state.visualization.state]); + useEffect( + () => { + if (allLoaded && state.visualization.state === null && activeVisualization) { + const initialVisualizationState = activeVisualization.initialize(framePublicAPI); + dispatch({ + type: 'UPDATE_VISUALIZATION_STATE', + visualizationId: activeVisualization.id, + newState: initialVisualizationState, + }); + } + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [allLoaded, activeVisualization, state.visualization.state] + ); // The frame needs to call onChange every time its internal state changes - useEffect(() => { - const activeDatasource = - state.activeDatasourceId && !state.datasourceStates[state.activeDatasourceId].isLoading - ? props.datasourceMap[state.activeDatasourceId] - : undefined; + useEffect( + () => { + const activeDatasource = + state.activeDatasourceId && !state.datasourceStates[state.activeDatasourceId].isLoading + ? props.datasourceMap[state.activeDatasourceId] + : undefined; - if (!activeDatasource || !activeVisualization) { - return; - } + if (!activeDatasource || !activeVisualization) { + return; + } - const indexPatterns: DatasourceMetaData['filterableIndexPatterns'] = []; - Object.entries(props.datasourceMap) - .filter(([id, datasource]) => { - const stateWrapper = state.datasourceStates[id]; - return ( - stateWrapper && - !stateWrapper.isLoading && - datasource.getLayers(stateWrapper.state).length > 0 - ); - }) - .forEach(([id, datasource]) => { - indexPatterns.push( - ...datasource.getMetaData(state.datasourceStates[id].state).filterableIndexPatterns - ); - }); + const indexPatterns: DatasourceMetaData['filterableIndexPatterns'] = []; + Object.entries(props.datasourceMap) + .filter(([id, datasource]) => { + const stateWrapper = state.datasourceStates[id]; + return ( + stateWrapper && + !stateWrapper.isLoading && + datasource.getLayers(stateWrapper.state).length > 0 + ); + }) + .forEach(([id, datasource]) => { + indexPatterns.push( + ...datasource.getMetaData(state.datasourceStates[id].state).filterableIndexPatterns + ); + }); - const doc = getSavedObjectFormat({ - activeDatasources: Object.keys(state.datasourceStates).reduce( - (datasourceMap, datasourceId) => ({ - ...datasourceMap, - [datasourceId]: props.datasourceMap[datasourceId], - }), - {} - ), - visualization: activeVisualization, - state, - framePublicAPI, - }); + const doc = getSavedObjectFormat({ + activeDatasources: Object.keys(state.datasourceStates).reduce( + (datasourceMap, datasourceId) => ({ + ...datasourceMap, + [datasourceId]: props.datasourceMap[datasourceId], + }), + {} + ), + visualization: activeVisualization, + state, + framePublicAPI, + }); - props.onChange({ filterableIndexPatterns: indexPatterns, doc }); - }, [ - activeVisualization, - state.datasourceStates, - state.visualization, - props.query, - props.dateRange, - props.filters, - props.savedQuery, - state.title, - ]); + props.onChange({ filterableIndexPatterns: indexPatterns, doc }); + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [ + activeVisualization, + state.datasourceStates, + state.visualization, + props.query, + props.dateRange, + props.filters, + props.savedQuery, + state.title, + ] + ); return ( diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx index 7efaecb125c8ee3..aba8b70945129aa 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx @@ -205,6 +205,7 @@ export function SuggestionPanel({ return { suggestions: newSuggestions, currentStateExpression: newStateExpression }; }, [ + frame, currentDatasourceStates, currentVisualizationState, currentVisualizationId, @@ -217,7 +218,7 @@ export function SuggestionPanel({ return (props: ReactExpressionRendererProps) => ( ); - }, [plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$, ExpressionRendererComponent]); + }, [plugins.data.query.timefilter.timefilter]); const [lastSelectedSuggestion, setLastSelectedSuggestion] = useState(-1); @@ -228,6 +229,7 @@ export function SuggestionPanel({ if (!stagedPreview && lastSelectedSuggestion !== -1) { setLastSelectedSuggestion(-1); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [stagedPreview]); if (!activeDatasourceId) { diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx index a0d803d05d98b85..88b791a7875efe8 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx @@ -188,6 +188,7 @@ export function ChartSwitch(props: Props) { ...visualizationType, selection: getSelection(visualizationType.visualizationId, visualizationType.id), })), + // eslint-disable-next-line react-hooks/exhaustive-deps [ flyoutOpen, props.visualizationMap, diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx index 9f5b6665b31d3cb..b3a12271f377b2e 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx @@ -85,29 +85,33 @@ export function InnerWorkspacePanel({ const dragDropContext = useContext(DragContext); - const suggestionForDraggedField = useMemo(() => { - if (!dragDropContext.dragging || !activeDatasourceId) { - return; - } + const suggestionForDraggedField = useMemo( + () => { + if (!dragDropContext.dragging || !activeDatasourceId) { + return; + } - const hasData = Object.values(framePublicAPI.datasourceLayers).some( - (datasource) => datasource.getTableSpec().length > 0 - ); + const hasData = Object.values(framePublicAPI.datasourceLayers).some( + (datasource) => datasource.getTableSpec().length > 0 + ); - const suggestions = getSuggestions({ - datasourceMap: { [activeDatasourceId]: datasourceMap[activeDatasourceId] }, - datasourceStates, - visualizationMap: - hasData && activeVisualizationId - ? { [activeVisualizationId]: visualizationMap[activeVisualizationId] } - : visualizationMap, - activeVisualizationId, - visualizationState, - field: dragDropContext.dragging, - }); + const suggestions = getSuggestions({ + datasourceMap: { [activeDatasourceId]: datasourceMap[activeDatasourceId] }, + datasourceStates, + visualizationMap: + hasData && activeVisualizationId + ? { [activeVisualizationId]: visualizationMap[activeVisualizationId] } + : visualizationMap, + activeVisualizationId, + visualizationState, + field: dragDropContext.dragging, + }); - return suggestions.find((s) => s.visualizationId === activeVisualizationId) || suggestions[0]; - }, [dragDropContext.dragging]); + return suggestions.find((s) => s.visualizationId === activeVisualizationId) || suggestions[0]; + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [dragDropContext.dragging] + ); const [localState, setLocalState] = useState({ expressionBuildError: undefined as string | undefined, @@ -117,28 +121,32 @@ export function InnerWorkspacePanel({ const activeVisualization = activeVisualizationId ? visualizationMap[activeVisualizationId] : null; - const expression = useMemo(() => { - try { - return buildExpression({ - visualization: activeVisualization, - visualizationState, - datasourceMap, - datasourceStates, - framePublicAPI, - }); - } catch (e) { - // Most likely an error in the expression provided by a datasource or visualization - setLocalState((s) => ({ ...s, expressionBuildError: e.toString() })); - } - }, [ - activeVisualization, - visualizationState, - datasourceMap, - datasourceStates, - framePublicAPI.dateRange, - framePublicAPI.query, - framePublicAPI.filters, - ]); + const expression = useMemo( + () => { + try { + return buildExpression({ + visualization: activeVisualization, + visualizationState, + datasourceMap, + datasourceStates, + framePublicAPI, + }); + } catch (e) { + // Most likely an error in the expression provided by a datasource or visualization + setLocalState((s) => ({ ...s, expressionBuildError: e.toString() })); + } + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + [ + activeVisualization, + visualizationState, + datasourceMap, + datasourceStates, + framePublicAPI.dateRange, + framePublicAPI.query, + framePublicAPI.filters, + ] + ); const onEvent = useCallback( (event: ExpressionRendererEvent) => { @@ -162,7 +170,7 @@ export function InnerWorkspacePanel({ const autoRefreshFetch$ = useMemo( () => plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$(), - [plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$] + [plugins.data.query.timefilter.timefilter] ); useEffect(() => { @@ -173,7 +181,7 @@ export function InnerWorkspacePanel({ expressionBuildError: undefined, })); } - }, [expression]); + }, [expression, localState.expressionBuildError]); function onDrop() { if (suggestionForDraggedField) { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx index bb564214e4fabf0..bdcce52314634ae 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx @@ -409,7 +409,16 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({ filters, chartsThemeService: charts.theme, }), - [core, data, currentIndexPattern, dateRange, query, filters, localState.nameFilter] + [ + core, + data, + currentIndexPattern, + dateRange, + query, + filters, + localState.nameFilter, + charts.theme, + ] ); return ( diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx index b8f868a8694ddfd..4c85a55ad60119e 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx @@ -139,10 +139,10 @@ export function FieldSelect({ }, [ incompatibleSelectedOperationType, selectedColumnOperationType, - selectedColumnSourceField, - operationFieldSupportMatrix, currentIndexPattern, fieldMap, + operationByField, + existingFields, ]); return ( diff --git a/x-pack/plugins/lens/public/loader.tsx b/x-pack/plugins/lens/public/loader.tsx index ebbb006d837b045..f6e179e9a6aa69f 100644 --- a/x-pack/plugins/lens/public/loader.tsx +++ b/x-pack/plugins/lens/public/loader.tsx @@ -16,28 +16,32 @@ export function Loader(props: { load: () => Promise; loadDeps: unknown[ const prevRequest = useRef | undefined>(undefined); const nextRequest = useRef<(() => void) | undefined>(undefined); - useEffect(function performLoad() { - if (prevRequest.current) { - nextRequest.current = performLoad; - return; - } + useEffect( + function performLoad() { + if (prevRequest.current) { + nextRequest.current = performLoad; + return; + } - setIsProcessing(true); - prevRequest.current = props - .load() - .catch(() => {}) - .then(() => { - const reload = nextRequest.current; - prevRequest.current = undefined; - nextRequest.current = undefined; + setIsProcessing(true); + prevRequest.current = props + .load() + .catch(() => {}) + .then(() => { + const reload = nextRequest.current; + prevRequest.current = undefined; + nextRequest.current = undefined; - if (reload) { - reload(); - } else { - setIsProcessing(false); - } - }); - }, props.loadDeps); + if (reload) { + reload(); + } else { + setIsProcessing(false); + } + }); + }, + // eslint-disable-next-line react-hooks/exhaustive-deps + props.loadDeps + ); if (!isProcessing) { return null; diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx index 59c4b393df467a4..6d5bc7808a678fc 100644 --- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx +++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx @@ -379,7 +379,7 @@ const ColorPicker = ({ } setState(updateLayer(state, { ...layer, yConfig: newYConfigs }, index)); }, 256), - [state, layer, accessor, index] + [state, setState, layer, accessor, index] ); const colorPicker = ( diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx index 871b626d6256081..a3468e109e75bc8 100644 --- a/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx +++ b/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx @@ -180,7 +180,7 @@ export function XYChartReportable(props: XYChartRenderProps) { // reporting from printing a blank chart placeholder. useEffect(() => { setState({ isReady: true }); - }, []); + }, [setState]); return ( From 13fd9e39ea92a53169f2664c0bbfc2e98ebbcc6c Mon Sep 17 00:00:00 2001 From: Oliver Gupte Date: Thu, 6 Aug 2020 01:12:48 -0700 Subject: [PATCH 21/21] Observability Overview fix extra basepath prepend for alerting fetch (#74465) --- .../public/services/get_observability_alerts.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.ts index 602e4cf2bdd13e0..cff6726e47df984 100644 --- a/x-pack/plugins/observability/public/services/get_observability_alerts.ts +++ b/x-pack/plugins/observability/public/services/get_observability_alerts.ts @@ -11,15 +11,12 @@ const allowedConsumers = ['apm', 'uptime', 'logs', 'metrics', 'alerts']; export async function getObservabilityAlerts({ core }: { core: AppMountContext['core'] }) { try { - const { data = [] }: { data: Alert[] } = await core.http.get( - core.http.basePath.prepend('/api/alerts/_find'), - { - query: { - page: 1, - per_page: 20, - }, - } - ); + const { data = [] }: { data: Alert[] } = await core.http.get('/api/alerts/_find', { + query: { + page: 1, + per_page: 20, + }, + }); return data.filter(({ consumer }) => allowedConsumers.includes(consumer)); } catch (e) {