Merge branch 'main' into unskip-test/195144

config/serverless.yml

@@ -113,6 +113,9 @@ xpack.index_management.enableTogglingDataRetention: false
 # Disable project level rentention checks in DSL form from Index Management UI
 xpack.index_management.enableProjectLevelRetentionChecks: false
 
+# Disable Manage Processors UI in Ingest Pipelines
+xpack.ingest_pipelines.enableManageProcessors: false
+
 # Keep deeplinks visible so that they are shown in the sidenav
 dev_tools.deeplinks.navLinkStatus: visible
 management.deeplinks.navLinkStatus: visible

package.json

@@ -1292,6 +1292,7 @@
     "xstate": "^4.38.2",
     "xstate5": "npm:xstate@^5.18.1",
     "xterm": "^5.1.0",
+    "yaml": "^2.5.1",
     "yauzl": "^2.10.0",
     "yazl": "^2.5.1",
     "zod": "^3.22.3"

src/cli/cli.js

@@ -19,8 +19,7 @@ const program = new Command('bin/kibana');
 program
   .version(pkg.version)
   .description(
-    'Kibana is an open and free, browser ' +
-      'based analytics and search dashboard for Elasticsearch.'
+    'Kibana is an open source, browser based analytics and search dashboard for Elasticsearch.'
   );
 
 // attach commands

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

@@ -60,7 +60,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "action_task_params": "b50cb5c8a493881474918e8d4985e61374ca4c30",
         "ad_hoc_run_params": "d4e3c5c794151d0a4f5c71e886b2aa638da73ad2",
         "alert": "05b07040b12ff45ab642f47464e8a6c903cf7b86",
-        "api_key_pending_invalidation": "1399e87ca37b3d3a65d269c924eda70726cfe886",
+        "api_key_pending_invalidation": "8f5554d1984854011b8392d9a6f7ef985bcac03c",
         "apm-custom-dashboards": "b67128f78160c288bd7efe25b2da6e2afd5e82fc",
         "apm-indices": "8a2d68d415a4b542b26b0d292034a28ffac6fed4",
         "apm-server-schema": "58a8c6468edae3d1dc520f0134f59cf3f4fd7eff",
@@ -83,7 +83,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "cloud-security-posture-settings": "e0f61c68bbb5e4cfa46ce8994fa001e417df51ca",
         "config": "179b3e2bc672626aafce3cf92093a113f456af38",
         "config-global": "8e8a134a2952df700d7d4ec51abb794bbd4cf6da",
-        "connector_token": "5a9ac29fe9c740eb114e9c40517245c71706b005",
+        "connector_token": "79977ea2cb1530ba7e315b95c1b5a524b622a6b3",
         "core-usage-stats": "b3c04da317c957741ebcdedfea4524049fdc79ff",
         "csp-rule-template": "c151324d5f85178169395eecb12bac6b96064654",
         "dashboard": "211e9ca30f5a95d5f3c27b1bf2b58e6cfa0c9ae9",
@@ -131,7 +131,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "lens": "5cfa2c52b979b4f8df56dd13c477e152183468b9",
         "lens-ui-telemetry": "8c47a9e393861f76e268345ecbadfc8a5fb1e0bd",
         "links": "1dd432cc94619a513b75cec43660a50be7aadc90",
-        "maintenance-window": "d893544460abad56ff7a0e25b78f78776dfe10d1",
+        "maintenance-window": "bf36863f5577c2d22625258bdad906eeb4cccccc",
         "map": "76c71023bd198fb6b1163b31bafd926fe2ceb9da",
         "metrics-data-source": "81b69dc9830699d9ead5ac8dcb9264612e2a3c89",
         "metrics-explorer-view": "98cf395d0e87b89ab63f173eae16735584a8ff42",
@@ -147,7 +147,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "policy-settings-protection-updates-note": "33924bb246f9e5bcb876109cc83e3c7a28308352",
         "query": "501bece68f26fe561286a488eabb1a8ab12f1137",
         "risk-engine-configuration": "bab237d09c2e7189dddddcb1b28f19af69755efb",
-        "rules-settings": "892a2918ebaeba809a612b8d97cec0b07c800b5f",
+        "rules-settings": "ba57ef1881b3dcbf48fbfb28902d8f74442190b2",
         "sample-data-telemetry": "37441b12f5b0159c2d6d5138a494c9f440e950b5",
         "search": "0aa6eefb37edd3145be340a8b67779c2ca578b22",
         "search-session": "b2fcd840e12a45039ada50b1355faeafa39876d1",

src/dev/build/tasks/clean_tasks.ts

@@ -56,6 +56,7 @@ export const CleanExtraFilesFromModules: Task = {
 
           // docs
           '**/doc',
+          '!**/yaml/dist/**/doc', // yaml package store code under doc https://github.com/eemeli/yaml/issues/384
           '**/docs',
           '**/README',
           '**/CONTRIBUTING.md',

src/dev/yarn_deduplicate/index.ts

@@ -17,7 +17,7 @@ const yarnLock = readFileSync(yarnLockFile, 'utf-8');
 const output = fixDuplicates(yarnLock, {
   useMostCommon: false,
   excludeScopes: ['@types'],
-  excludePackages: ['axe-core', '@babel/types', 'csstype'],
+  excludePackages: ['axe-core', '@babel/types', 'csstype', 'yaml'],
 });
 
 writeFileSync(yarnLockFile, output);

src/plugins/presentation_util/public/components/expression_input/autocomplete.ts

@@ -439,7 +439,7 @@ function maybeQuote(value: any) {
     if (value.match(/^\{.*\}$/)) {
       return value;
     }
-    return `"${value.replace(/"/g, '\\"')}"`;
+    return `"${value.replace(/[\\"]/g, '\\$&')}"`;
   }
   return value;
 }

src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview_degraded_fields.tsx

@@ -270,13 +270,12 @@ const DatasetQualityLink = React.memo(
     urlService: BrowserUrlService;
     dataStream: string | undefined;
   }) => {
-    if (!dataStream) {
-      return null;
-    }
     const locator = urlService.locators.get<DataQualityDetailsLocatorParams>(
       DATA_QUALITY_DETAILS_LOCATOR_ID
     );
 
+    if (!locator || !dataStream) return null;
+
     const datasetQualityUrl = locator?.getRedirectUrl({ dataStream });
 
     const navigateToDatasetQuality = () => {

test/plugin_functional/test_suites/core_plugins/rendering.ts

@@ -314,6 +314,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.ml.nlp.modelDeployment.vCPURange.medium.static (number?)',
         'xpack.osquery.actionEnabled (boolean?)',
         'xpack.remote_clusters.ui.enabled (boolean?)',
+        'xpack.ingest_pipelines.enableManageProcessors (boolean?|never)',
         /**
          * NOTE: The Reporting plugin is currently disabled in functional tests (see test/functional/config.base.js).
          * It will be re-enabled once #102552 is completed.

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/attack_discovery/common_attributes.gen.ts

@@ -39,7 +39,7 @@ export const AttackDiscovery = z.object({
   /**
    * A short (no more than a sentence) summary of the attack discovery featuring only the host.name and user.name fields (when they are applicable), using the same syntax
    */
-  entitySummaryMarkdown: z.string().optional(),
+  entitySummaryMarkdown: z.string(),
   /**
    * An array of MITRE ATT&CK tactic for the attack discovery
    */
@@ -55,7 +55,7 @@ export const AttackDiscovery = z.object({
   /**
    * The time the attack discovery was generated
    */
-  timestamp: NonEmptyString.optional(),
+  timestamp: NonEmptyString,
 });
 
 /**

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/attack_discovery/common_attributes.schema.yaml

@@ -12,7 +12,9 @@ components:
       required:
         - 'alertIds'
         - 'detailsMarkdown'
+        - 'entitySummaryMarkdown'
         - 'summaryMarkdown'
+        - 'timestamp'
         - 'title'
       properties:
         alertIds:

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/evaluation/post_evaluate_route.gen.ts

@@ -22,12 +22,10 @@ export type PostEvaluateBody = z.infer<typeof PostEvaluateBody>;
 export const PostEvaluateBody = z.object({
   graphs: z.array(z.string()),
   datasetName: z.string(),
-  evaluatorConnectorId: z.string().optional(),
   connectorIds: z.array(z.string()),
   runName: z.string().optional(),
   alertsIndexPattern: z.string().optional().default('.alerts-security.alerts-default'),
   langSmithApiKey: z.string().optional(),
-  langSmithProject: z.string().optional(),
   replacements: Replacements.optional().default({}),
   size: z.number().optional().default(20),
 });

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/evaluation/post_evaluate_route.schema.yaml

@@ -61,8 +61,6 @@ components:
             type: string
         datasetName:
           type: string
-        evaluatorConnectorId:
-          type: string
         connectorIds:
           type: array
           items:
@@ -74,8 +72,6 @@ components:
           default: ".alerts-security.alerts-default"
         langSmithApiKey:
           type: string
-        langSmithProject:
-          type: string
         replacements:
           $ref: "../conversations/common_attributes.schema.yaml#/components/schemas/Replacements"
           default: {}

x-pack/packages/kbn-elastic-assistant-common/index.ts

@@ -25,19 +25,3 @@ export {
 export { transformRawData } from './impl/data_anonymization/transform_raw_data';
 export { parseBedrockBuffer, handleBedrockChunk } from './impl/utils/bedrock';
 export * from './constants';
-
-/** currently the same shape as "fields" property in the ES response */
-export { type MaybeRawData } from './impl/alerts/helpers/types';
-
-/**
- * This query returns open and acknowledged (non-building block) alerts in the last 24 hours.
- *
- * The alerts are ordered by risk score, and then from the most recent to the oldest.
- */
-export { getOpenAndAcknowledgedAlertsQuery } from './impl/alerts/get_open_and_acknowledged_alerts_query';
-
-/** Returns the raw data if it valid, or a default if it's not */
-export { getRawDataOrDefault } from './impl/alerts/helpers/get_raw_data_or_default';
-
-/** Return true if the provided size is out of range */
-export { sizeIsOutOfRange } from './impl/alerts/helpers/size_is_out_of_range';

x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/alerts_settings/alerts_settings.tsx

@@ -16,7 +16,7 @@ import * as i18n from '../../../knowledge_base/translations';
 export const MIN_LATEST_ALERTS = 10;
 export const MAX_LATEST_ALERTS = 100;
 export const TICK_INTERVAL = 10;
-export const RANGE_CONTAINER_WIDTH = 600; // px
+export const RANGE_CONTAINER_WIDTH = 300; // px
 const LABEL_WRAPPER_MIN_WIDTH = 95; // px
 
 interface Props {
@@ -52,7 +52,6 @@ const AlertsSettingsComponent = ({ knowledgeBase, setUpdatedKnowledgeBaseSetting
           <AlertsRange
             knowledgeBase={knowledgeBase}
             setUpdatedKnowledgeBaseSettings={setUpdatedKnowledgeBaseSettings}
-            value={knowledgeBase.latestAlerts}
           />
           <EuiSpacer size="s" />
         </EuiFlexItem>