Skip to content

Commit

Permalink
Merge branch '8.x' into backport/8.x/pr-193534
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeramysoucy
jeramysoucy authored Oct 15, 2024
2 parents cf08b17 + db2adf7 commit a2b1af4
Show file tree
Hide file tree
Showing 491 changed files with 8,672 additions and 3,709 deletions.
2 changes: 2 additions & 0 deletions .buildkite/ftr_platform_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ disabled:

# Cypress configs, for now these are still run manually
- x-pack/test/fleet_cypress/cli_config.ts
- x-pack/test/fleet_cypress/cli_config.space_awareness.ts
- x-pack/test/fleet_cypress/config.ts
- x-pack/test/fleet_cypress/config.space_awareness.ts
- x-pack/test/fleet_cypress/visual_config.ts

defaultQueue: 'n2-4-spot'
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/quality-gates/emergency/pipeline.tests-staging.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ steps:
command: "make -C /agent trigger-manual-verification-phase"
agents:
image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"
if: build.env("DEPLOYMENT_SLICES") =~ /.*staging-ds-2.*/
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/fleet_cypress.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ echo "--- Fleet Cypress tests (Chrome)"
cd x-pack/plugins/fleet

set +e
yarn cypress:run:reporter; status=$?; yarn junit:merge || :; exit $status
yarn cypress:run:reporter; status=$?; yarn cypress_space_awareness:run:reporter; space_status=$?; yarn junit:merge || :; [ "$status" -ne 0 ] && exit $status || [ "$space_status" -ne 0 ] && exit $space_status || exit 0
5 changes: 5 additions & 0 deletions config/serverless.security.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,8 @@ xpack.ml.compatibleModuleType: 'security'

# Disable the embedded Dev Console
console.ui.embeddedEnabled: false

# Experimental Security Solution features

# This feature is disabled in Serverless until fully performance tested within a Serverless environment
xpack.securitySolution.enableExperimental: ['entityStoreDisabled']
65 changes: 65 additions & 0 deletions oas_docs/output/kibana.serverless.staging.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8394,6 +8394,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
/api/entity_store/engines/apply_dataview_indices:
post:
operationId: ApplyEntityEngineDataviewIndices
responses:
'200':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Successful response
'207':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
errors:
items:
type: string
type: array
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Partial successful response
'500':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
body:
type: string
statusCode:
type: number
description: Error response
summary: Apply DataView indices to all installed engines
tags:
- Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: 'List entities records, paging, sorting and filtering as needed.'
Expand Down Expand Up @@ -30170,6 +30220,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
Security_Entity_Analytics_API_EngineDataviewUpdateResult:
type: object
properties:
changes:
type: object
properties:
indexPatterns:
items:
type: string
type: array
type:
type: string
required:
- type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
Expand All @@ -30193,6 +30257,7 @@ components:
- installing
- started
- stopped
- updating
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
Expand Down
65 changes: 65 additions & 0 deletions oas_docs/output/kibana.serverless.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8394,6 +8394,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
/api/entity_store/engines/apply_dataview_indices:
post:
operationId: ApplyEntityEngineDataviewIndices
responses:
'200':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Successful response
'207':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
errors:
items:
type: string
type: array
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Partial successful response
'500':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
body:
type: string
statusCode:
type: number
description: Error response
summary: Apply DataView indices to all installed engines
tags:
- Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: 'List entities records, paging, sorting and filtering as needed.'
Expand Down Expand Up @@ -30170,6 +30220,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
Security_Entity_Analytics_API_EngineDataviewUpdateResult:
type: object
properties:
changes:
type: object
properties:
indexPatterns:
items:
type: string
type: array
type:
type: string
required:
- type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
Expand All @@ -30193,6 +30257,7 @@ components:
- installing
- started
- stopped
- updating
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
Expand Down
65 changes: 65 additions & 0 deletions oas_docs/output/kibana.staging.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11822,6 +11822,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
/api/entity_store/engines/apply_dataview_indices:
post:
operationId: ApplyEntityEngineDataviewIndices
responses:
'200':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Successful response
'207':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
errors:
items:
type: string
type: array
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Partial successful response
'500':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
body:
type: string
statusCode:
type: number
description: Error response
summary: Apply DataView indices to all installed engines
tags:
- Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: 'List entities records, paging, sorting and filtering as needed.'
Expand Down Expand Up @@ -38935,6 +38985,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
Security_Entity_Analytics_API_EngineDataviewUpdateResult:
type: object
properties:
changes:
type: object
properties:
indexPatterns:
items:
type: string
type: array
type:
type: string
required:
- type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
Expand All @@ -38958,6 +39022,7 @@ components:
- installing
- started
- stopped
- updating
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
Expand Down
65 changes: 65 additions & 0 deletions oas_docs/output/kibana.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11822,6 +11822,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
/api/entity_store/engines/apply_dataview_indices:
post:
operationId: ApplyEntityEngineDataviewIndices
responses:
'200':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Successful response
'207':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
errors:
items:
type: string
type: array
result:
items:
$ref: >-
#/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
type: array
success:
type: boolean
description: Partial successful response
'500':
content:
application/json; Elastic-Api-Version=2023-10-31:
schema:
type: object
properties:
body:
type: string
statusCode:
type: number
description: Error response
summary: Apply DataView indices to all installed engines
tags:
- Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: 'List entities records, paging, sorting and filtering as needed.'
Expand Down Expand Up @@ -38935,6 +38985,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
Security_Entity_Analytics_API_EngineDataviewUpdateResult:
type: object
properties:
changes:
type: object
properties:
indexPatterns:
items:
type: string
type: array
type:
type: string
required:
- type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
Expand All @@ -38958,6 +39022,7 @@ components:
- installing
- started
- stopped
- updating
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@
"@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/test/cloud_integration/plugins/saml_provider",
"@kbn/cloud-links-plugin": "link:x-pack/plugins/cloud_integrations/cloud_links",
"@kbn/cloud-plugin": "link:x-pack/plugins/cloud",
"@kbn/cloud-security-posture": "link:x-pack/packages/kbn-cloud-security-posture",
"@kbn/cloud-security-posture-common": "link:x-pack/packages/kbn-cloud-security-posture-common",
"@kbn/cloud-security-posture": "link:x-pack/packages/kbn-cloud-security-posture/public",
"@kbn/cloud-security-posture-common": "link:x-pack/packages/kbn-cloud-security-posture/common",
"@kbn/cloud-security-posture-graph": "link:x-pack/packages/kbn-cloud-security-posture/graph",
"@kbn/cloud-security-posture-plugin": "link:x-pack/plugins/cloud_security_posture",
"@kbn/code-editor": "link:packages/shared-ux/code_editor/impl",
Expand Down Expand Up @@ -1587,7 +1587,7 @@
"@types/jsonwebtoken": "^9.0.0",
"@types/license-checker": "15.0.0",
"@types/loader-utils": "^2.0.3",
"@types/lodash": "^4.14.159",
"@types/lodash": "^4.17.10",
"@types/lru-cache": "^5.1.0",
"@types/lz-string": "^1.3.34",
"@types/mapbox__vector-tile": "1.3.0",
Expand Down
Loading

0 comments on commit a2b1af4

Please sign in to comment.