Merge branch 'main' into eui-page-deprecated/platform-deployment-mana…

…gement

.buildkite/pipelines/pull_request/base.yml

@@ -212,13 +212,6 @@ steps:
       automatic: false
     soft_fail: true
 
-  - command: .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
-    label: 'Security Solution OpenAPI codegen'
-    agents:
-      queue: n2-2-spot
-    timeout_in_minutes: 60
-    parallelism: 1
-
   - command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
     label: 'Osquery Cypress Tests, burning changed specs'
     agents:

.buildkite/pipelines/quality-gates/pipeline.tests-production.yaml

@@ -2,10 +2,6 @@
 # Incorporate any necessary additional logic to validate the service's integrity.
 # A failure in this pipeline build will prevent further progression to the subsequent stage.
 
-# DEPRECATION NOTICE:
-# PRODUCTION WILL SOON BE SPLIT INTO "CANARY" AND "NONCANARY" AND THIS FILE WILL BE DELETED.
-# ENSURE ANY CHANGE MADE TO THIS FILE IS REFLECTED IN THOSE FILES AS WELL.
-
 steps:
   - label: ":pipeline::kibana::seedling: Trigger SLO check"
     trigger: "serverless-quality-gates" # https://buildkite.com/elastic/serverless-quality-gates
@@ -18,9 +14,14 @@ steps:
     soft_fail: true
 
   - label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests"
+    if: build.env("ENVIRONMENT") == "production-canary"
     trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
     build:
       env:
         REGION_ID: aws-us-east-1
         NAME_PREFIX: ci_test_kibana-promotion_
       message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production.yaml)"
+
+  - label: ":cookie: 24h bake time before continuing promotion"
+    if: build.env("ENVIRONMENT") == "production-canary"
+    command: "sleep 86400"

.buildkite/scripts/steps/checks.sh

@@ -22,3 +22,4 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
 .buildkite/scripts/steps/checks/test_hardening.sh
 .buildkite/scripts/steps/checks/ftr_configs.sh
 .buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
+.buildkite/scripts/steps/code_generation/security_solution_codegen.sh

catalog-info.yaml

@@ -56,6 +56,8 @@ spec:
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ
+        appex-qa:
+          access_level: BUILD_AND_READ
         security-engineering-productivity:
           access_level: BUILD_AND_READ
         fleet:

docs/api/saved-objects/bulk_create.asciidoc

@@ -38,7 +38,7 @@ For the most up-to-date API details, refer to the
 ==== Request body
 
 `type`::
-  (Required, string) Valid options include `visualization`, `dashboard`, `search`, `index-pattern`, `config`.
+  (Required, string) Valid options include `visualization`, `dashboard`, `search`, `index-pattern`.
 
 `id`::
   (Optional, string) Specifies an ID instead of using a randomly generated ID.

docs/api/saved-objects/create.asciidoc

@@ -32,7 +32,7 @@ For the most up-to-date API details, refer to the
   (Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
 
 `<type>`::
-  (Required, string) Valid options include `visualization`, `dashboard`, `search`, `index-pattern`, `config`.
+  (Required, string) Valid options include `visualization`, `dashboard`, `search`, `index-pattern`.
 
 `<id>`::
   (Optional, string) Specifies an ID instead of using a randomly generated ID.

packages/kbn-es/src/serverless_resources/operator_users.yml

@@ -1,19 +1,5 @@
 operator:
-  - usernames:
-      [
-        'elastic_serverless',
-        'system_indices_superuser',
-        't1_analyst',
-        't2_analyst',
-        't3_analyst',
-        'threat_intelligence_analyst',
-        'rule_author',
-        'soc_manager',
-        'detections_admin',
-        'platform_engineer',
-        'endpoint_operations_analyst',
-        'endpoint_policy_manager',
-      ]
+  - usernames: ['elastic_serverless', 'system_indices_superuser']
     realm_type: 'file'
     auth_type: 'realm'
   - usernames: ['elastic/kibana']

packages/kbn-es/src/serverless_resources/roles.yml

@@ -117,6 +117,7 @@ t1_analyst:
         - metrics-endpoint.metadata_current_*
         - ".fleet-agents*"
         - ".fleet-actions*"
+        - "risk-score.risk-score-*"
       privileges:
         - read
   applications:
@@ -157,6 +158,7 @@ t2_analyst:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - "risk-score.risk-score-*"
       privileges:
         - read
   applications:
@@ -204,6 +206,7 @@ t3_analyst:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - "risk-score.risk-score-*"
       privileges:
         - read
   applications:
@@ -256,6 +259,7 @@ threat_intelligence_analyst:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - "risk-score.risk-score-*"
       privileges:
         - read
   applications:
@@ -307,6 +311,7 @@ rule_author:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - "risk-score.risk-score-*"
       privileges:
         - read
   applications:
@@ -363,6 +368,7 @@ soc_manager:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - risk-score.risk-score-*
       privileges:
         - read
   applications:
@@ -391,7 +397,7 @@ soc_manager:
       resources: "*"
 
 detections_admin:
-  cluster:
+  cluster: ["manage_index_templates", "manage_transform"]
   indices:
     - names:
         - apm-*-transaction*
@@ -418,6 +424,10 @@ detections_admin:
         - .fleet-actions*
       privileges:
         - read
+    - names:
+        - risk-score.risk-score-*
+      privileges:
+        - all
   applications:
     - application: "kibana-.kibana"
       privileges:
@@ -450,6 +460,7 @@ platform_engineer:
         - .siem-signals-*
         - .preview.alerts-security*
         - .internal.preview.alerts-security*
+        - risk-score.risk-score-*
       privileges:
         - all
   applications:
@@ -482,6 +493,7 @@ endpoint_operations_analyst:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - risk-score.risk-score-*
       privileges:
         - read
     - names:
@@ -537,6 +549,7 @@ endpoint_policy_manager:
         - metrics-endpoint.metadata_current_*
         - .fleet-agents*
         - .fleet-actions*
+        - risk-score.risk-score-*
       privileges:
         - read
     - names:

packages/kbn-search-connectors/types/native_connectors.ts

@@ -743,7 +743,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
         type: FieldType.BOOLEAN,
-        ui_restrictions: [],
+        ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
@@ -963,7 +963,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
         type: FieldType.BOOLEAN,
-        ui_restrictions: [],
+        ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },

src/plugins/es_ui_shared/public/components/section_loading/section_loading.tsx

@@ -15,13 +15,24 @@ import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 interface Props {
   inline?: boolean;
   children: React.ReactNode;
+  'data-test-subj'?: string;
   [key: string]: any;
 }
 
-export const SectionLoading: React.FunctionComponent<Props> = ({ inline, children, ...rest }) => {
+export const SectionLoading: React.FunctionComponent<Props> = ({
+  inline,
+  'data-test-subj': dataTestSubj,
+  children,
+  ...rest
+}) => {
   if (inline) {
     return (
-      <EuiFlexGroup justifyContent="flexStart" alignItems="center" gutterSize="s">
+      <EuiFlexGroup
+        justifyContent="flexStart"
+        alignItems="center"
+        gutterSize="s"
+        data-test-subj={dataTestSubj}
+      >
         <EuiFlexItem grow={false}>
           <EuiLoadingSpinner size="m" />
         </EuiFlexItem>
@@ -38,7 +49,7 @@ export const SectionLoading: React.FunctionComponent<Props> = ({ inline, childre
     <KibanaPageTemplate.EmptyPrompt
       title={<EuiLoadingSpinner size="xl" />}
       body={<EuiText color="subdued">{children}</EuiText>}
-      data-test-subj="sectionLoading"
+      data-test-subj={dataTestSubj ?? 'sectionLoading'}
     />
   );
 };

versions.json

@@ -14,7 +14,7 @@
       "previousMinor": true
     },
     {
-      "version": "8.10.4",
+      "version": "8.10.5",
       "branch": "8.10",
       "currentMajor": true,
       "previousMinor": true

x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/action_type_selector_modal.tsx

@@ -18,6 +18,7 @@ import {
 } from '@elastic/eui';
 import { ActionType } from '@kbn/actions-plugin/common';
 import { ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
+import { css } from '@emotion/css';
 import * as i18n from '../translations';
 
 interface Props {
@@ -26,6 +27,12 @@ interface Props {
   onClose: () => void;
   onSelect: (actionType: ActionType) => void;
 }
+const itemClassName = css`
+  .euiKeyPadMenuItem__label {
+    white-space: nowrap;
+    overflow: hidden;
+  }
+`;
 
 export const ActionTypeSelectorModal = ({
   actionTypes,
@@ -46,6 +53,7 @@ export const ActionTypeSelectorModal = ({
             return (
               <EuiFlexItem data-test-subj="action-option" key={actionType.id} grow={false}>
                 <EuiKeyPadMenuItem
+                  className={itemClassName}
                   key={actionType.id}
                   isDisabled={!actionType.enabled}
                   label={actionType.name}

x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts

@@ -19,7 +19,7 @@ export const WELCOME_GENERAL_2 = i18n.translate(
   'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt',
   {
     defaultMessage:
-      "First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an AWS Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
+      "First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an Amazon Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
   }
 );
 

x-pack/packages/kbn-slo-schema/src/rest_specs/slo.ts

@@ -19,6 +19,7 @@ import {
   indicatorTypesSchema,
   kqlCustomIndicatorSchema,
   metricCustomIndicatorSchema,
+  timesliceMetricIndicatorSchema,
   objectiveSchema,
   optionalSettingsSchema,
   previewDataSchema,
@@ -28,6 +29,9 @@ import {
   tagsSchema,
   timeWindowSchema,
   timeWindowTypeSchema,
+  timesliceMetricBasicMetricWithField,
+  timesliceMetricDocCountMetric,
+  timesliceMetricPercentileMetric,
 } from '../schema';
 
 const createSLOParamsSchema = t.type({
@@ -270,6 +274,10 @@ type Indicator = t.OutputOf<typeof indicatorSchema>;
 type APMTransactionErrorRateIndicator = t.OutputOf<typeof apmTransactionErrorRateIndicatorSchema>;
 type APMTransactionDurationIndicator = t.OutputOf<typeof apmTransactionDurationIndicatorSchema>;
 type MetricCustomIndicator = t.OutputOf<typeof metricCustomIndicatorSchema>;
+type TimesliceMetricIndicator = t.OutputOf<typeof timesliceMetricIndicatorSchema>;
+type TimesliceMetricBasicMetricWithField = t.OutputOf<typeof timesliceMetricBasicMetricWithField>;
+type TimesliceMetricDocCountMetric = t.OutputOf<typeof timesliceMetricDocCountMetric>;
+type TimesclieMetricPercentileMetric = t.OutputOf<typeof timesliceMetricPercentileMetric>;
 type HistogramIndicator = t.OutputOf<typeof histogramIndicatorSchema>;
 type KQLCustomIndicator = t.OutputOf<typeof kqlCustomIndicatorSchema>;
 
@@ -327,6 +335,10 @@ export type {
   IndicatorType,
   Indicator,
   MetricCustomIndicator,
+  TimesliceMetricIndicator,
+  TimesliceMetricBasicMetricWithField,
+  TimesclieMetricPercentileMetric,
+  TimesliceMetricDocCountMetric,
   HistogramIndicator,
   KQLCustomIndicator,
   TimeWindow,