Skip to content

Commit b3d8aac

Browse files
cqliu1cqliu1
committed
Merge branch 'main' of https://github.com/elastic/kibana into canvas/apply-embeddable-transforms
2 parents 2e43757 + 52968c7 commit b3d8aac

84 files changed

Lines changed: 1265 additions & 3345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ enabled:
268268
- x-pack/platform/test/functional/apps/reporting_management/config.ts
269269
- x-pack/platform/test/functional/apps/rollup_job/config.ts
270270
- x-pack/platform/test/functional/apps/saved_objects_management/config.ts
271-
- x-pack/platform/test/functional/apps/saved_query_management/config.ts
271+
- x-pack/platform/test/functional/apps/saved_query_management/group1/config.ts
272+
- x-pack/platform/test/functional/apps/saved_query_management/group2/config.ts
272273
- x-pack/platform/test/functional/apps/saved_query_management/config.v2.ts
273274
- x-pack/platform/test/functional/apps/security/config.ts
274275
- x-pack/platform/test/functional/apps/snapshot_restore/config.ts

‎src/platform/packages/shared/kbn-developer-toolbar/src/toolbar_items/console_error/console_monitor.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ export class ConsoleMonitor implements Monitor<ConsoleErrorInfo | null> {
2323
// We're ignoring this error until we migrate to React 18's createRoot API.
2424
// https://github.com/elastic/kibana/issues/199100
2525
'Warning: ReactDOM.render is no longer supported in React 18. Use createRoot instead.',
26+
/**
27+
* React 18 concurrent mode logs a “race-condition” warning on unmount of nested roots.
28+
* Tests show no real breakage, so we silence it for now.
29+
* Revisit if the warning ever surfaces as an actual bug.
30+
*/
31+
'Warning: Attempted to synchronously unmount a root while React was already rendering.',
2632
] as const;
2733

2834
private static readonly DEBOUNCE_DELAY = 100 as const; // ms

‎src/platform/packages/shared/kbn-management/settings/setting_ids/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ export const OBSERVABILITY_STREAMS_ENABLE_GROUP_STREAMS = 'observability:streams
150150
export const OBSERVABILITY_STREAMS_ENABLE_QUERY_STREAMS = 'observability:streamsEnableQueryStreams';
151151
export const OBSERVABILITY_STREAMS_ENABLE_CONTENT_PACKS = 'observability:streamsEnableContentPacks';
152152
export const OBSERVABILITY_STREAMS_ENABLE_ATTACHMENTS = 'observability:streamsEnableAttachments';
153+
export const OBSERVABILITY_STREAMS_ENABLE_WIRED_STREAM_VIEWS =
154+
'observability:streamsEnableWiredStreamViews';
153155
export const OBSERVABILITY_ENABLE_DIAGNOSTIC_MODE = 'observability:enableDiagnosticMode';
154156

155157
// Reporting settings

‎src/platform/packages/shared/kbn-workflows/index.ts‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,14 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
export * from './spec/lib/build_step_schema_for_agent';
1110
export * from './spec/lib/generate_yaml_schema_from_connectors';
1211
export * from './spec/lib/get_workflow_json_schema';
1312
export { getElasticsearchConnectors } from './spec/elasticsearch';
1413
export { getKibanaConnectors } from './spec/kibana';
1514
export * from './spec/schema';
1615
export { builtInStepDefinitions, getBuiltInStepDefinition } from './spec/builtin_step_definitions';
1716
export type { BuiltInStepDefinition } from './spec/builtin_step_definitions';
18-
export {
19-
builtInTriggerDefinitions,
20-
getBuiltInTriggerDefinition,
21-
} from './spec/builtin_trigger_definitions';
22-
export type {
23-
BaseTriggerDefinition,
24-
TriggerDocumentation,
25-
} from './spec/builtin_trigger_definitions';
26-
export {
27-
WORKFLOW_EXAMPLES,
28-
WORKFLOW_EXAMPLE_IDS,
29-
getWorkflowExamples,
30-
getWorkflowExample,
31-
getWorkflowExamplesDir,
32-
} from './spec/examples';
33-
export type { WorkflowExampleEntry } from './spec/examples';
34-
export { StepCategory, StepCategories } from './spec/step_definition_types';
17+
export { StepCategory } from './spec/step_definition_types';
3518
export type { BaseStepDefinition, StepDocumentation } from './spec/step_definition_types';
3619
export * from './types/latest';
3720
export * from './types/utils';

‎src/platform/packages/shared/kbn-workflows/server/examples.ts‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-workflows/server/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
export { ExecutionError } from './errors/execution_error';
11-
export { loadWorkflowExampleContent } from './examples';
1211
export {
1312
getStepExecutionsByIds,
1413
getStepExecutionsByWorkflowExecution,

‎src/platform/packages/shared/kbn-workflows/spec/builtin_trigger_definitions.test.ts‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-workflows/spec/builtin_trigger_definitions.ts‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-workflows/spec/examples/esql_to_index.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-workflows/spec/examples/example_merge.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: 1
2+
workflow:
3+
name: "Phishing Alert Investigation"
4+
description: "Investigate a reported phishing email with parallel analysis and AI summary."
5+
enabled: true
6+
triggers:
7+
- type: manual
8+
steps:
9+
- name: Parallel analysis
10+
type: parallel
11+
branches:
12+
- name: URL scan
13+
steps:
14+
- name: Scan URL
15+
type: url_scan
16+
- name: Classification
17+
steps:
18+
- name: Classify text
19+
type: classify_text
20+
- name: Merge results
21+
type: merge
22+
sources:
23+
- "Parallel analysis.URL scan"
24+
- "Parallel analysis.Classification"
25+
steps:
26+
- name: AI summary
27+
type: ai_summary
28+
- name: Decision
29+
type: if
30+
condition: "{{steps.ai_summary.is_malicious}}"
31+
steps:
32+
- name: Create case
33+
type: create_case
34+
- name: Add to case
35+
type: add_to_case
36+
else:
37+
- name: Add note
38+
type: add_note
39+
- name: Close alert
40+
type: close_alert

0 commit comments

Comments
 (0)