Skip to content

Commit

Permalink
Merge branch 'main' into 173718_fix_secrets_exception
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Jan 8, 2024
2 parents c6880dd + 58de8d4 commit 362da9f
Show file tree
Hide file tree
Showing 1,519 changed files with 25,389 additions and 5,791 deletions.
22 changes: 14 additions & 8 deletions .buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ export async function pickTestGroupRunOrder() {
if (Number.isNaN(FTR_CONFIGS_RETRY_COUNT)) {
throw new Error(`invalid FTR_CONFIGS_RETRY_COUNT: ${process.env.FTR_CONFIGS_RETRY_COUNT}`);
}
const JEST_CONFIGS_RETRY_COUNT = process.env.JEST_CONFIGS_RETRY_COUNT
? parseInt(process.env.JEST_CONFIGS_RETRY_COUNT, 10)
: 1;
if (Number.isNaN(JEST_CONFIGS_RETRY_COUNT)) {
throw new Error(`invalid JEST_CONFIGS_RETRY_COUNT: ${process.env.JEST_CONFIGS_RETRY_COUNT}`);
}

const FTR_CONFIGS_DEPS =
process.env.FTR_CONFIGS_DEPS !== undefined
Expand Down Expand Up @@ -417,10 +423,10 @@ export async function pickTestGroupRunOrder() {
},
retry: {
automatic: [
{
exit_status: '-1',
limit: 3,
},
{ exit_status: '-1', limit: 3 },
...(JEST_CONFIGS_RETRY_COUNT > 0
? [{ exit_status: '*', limit: JEST_CONFIGS_RETRY_COUNT }]
: []),
],
},
}
Expand All @@ -437,10 +443,10 @@ export async function pickTestGroupRunOrder() {
},
retry: {
automatic: [
{
exit_status: '-1',
limit: 3,
},
{ exit_status: '-1', limit: 3 },
...(JEST_CONFIGS_RETRY_COUNT > 0
? [{ exit_status: '*', limit: JEST_CONFIGS_RETRY_COUNT }]
: []),
],
},
}
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ steps:
ENVIRONMENT: ${ENVIRONMENT}
EC_ENV: qa
EC_REGION: aws-eu-west-1
RETRY_TESTS_ON_FAIL: "true"
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"

# TODO: Uncomment this code when the integration is ready.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ steps:
ENVIRONMENT: ${ENVIRONMENT}
EC_ENV: staging
EC_REGION: aws-us-east-1
RETRY_TESTS_ON_FAIL: "true"
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"

- wait: ~
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/scripts/lifecycle/pre_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ export SYNTHETICS_REMOTE_KIBANA_URL
DEPLOY_TAGGER_SLACK_WEBHOOK_URL=${DEPLOY_TAGGER_SLACK_WEBHOOK_URL:-"$(vault_get kibana-serverless-release-tools DEPLOY_TAGGER_SLACK_WEBHOOK_URL)"}
export DEPLOY_TAGGER_SLACK_WEBHOOK_URL

GCS_SA_CDN_QA_KEY="$(vault_get gcs-sa-cdn-qa key)"
export GCS_SA_CDN_QA_KEY

GCS_SA_CDN_QA_BUCKET="$(vault_get gcs-sa-cdn-qa bucket)"
export GCS_SA_CDN_QA_BUCKET

# Setup Failed Test Reporter Elasticsearch credentials
{
TEST_FAILURES_ES_CLOUD_ID=$(vault_get failed_tests_reporter_es cloud_id)
Expand Down
16 changes: 12 additions & 4 deletions .buildkite/scripts/steps/artifacts/docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
exit 1
fi

echo "--- Build images"
echo "--- Build Kibana"
node scripts/build \
--debug \
--release \
Expand All @@ -37,8 +37,7 @@ node scripts/build \
--skip-docker-ubuntu \
--skip-docker-ubi \
--skip-docker-cloud \
--skip-docker-contexts \
--skip-cdn-assets
--skip-docker-contexts

echo "--- Tag images"
docker rmi "$KIBANA_IMAGE"
Expand Down Expand Up @@ -88,12 +87,21 @@ fi
echo "--- Build dependencies report"
node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"

echo "--- Upload artifacts"
echo "--- Upload CDN assets"
cd target
gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_QA_KEY")

CDN_ASSETS_FOLDER=$(mktemp -d)
tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1

gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_QA_BUCKET/$GIT_ABBREV_COMMIT"

echo "--- Upload archives"
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
cd -

Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ module.exports = {
*/
{
files: [
'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
'packages/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/scroll_into_view_if_necessary.js',
'**/browser_exec_scripts/**/*.js',
],
rules: {
Expand Down
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
x-pack/plugins/cloud_integrations/cloud_links @elastic/kibana-core
x-pack/plugins/cloud @elastic/kibana-core
x-pack/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
packages/shared-ux/code_editor @elastic/appex-sharedux
packages/shared-ux/code_editor/impl @elastic/appex-sharedux
packages/shared-ux/code_editor/mocks @elastic/appex-sharedux
packages/kbn-code-owners @elastic/appex-qa
packages/kbn-coloring @elastic/kibana-visualizations
packages/kbn-config @elastic/kibana-core
Expand Down Expand Up @@ -487,6 +488,7 @@ x-pack/plugins/kubernetes_security @elastic/kibana-cloud-security-posture
packages/kbn-language-documentation-popover @elastic/kibana-visualizations
packages/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
packages/kbn-lens-formula-docs @elastic/kibana-visualizations
x-pack/examples/lens_embeddable_inline_editing_example @elastic/kibana-visualizations
x-pack/plugins/lens @elastic/kibana-visualizations
x-pack/plugins/license_api_guard @elastic/platform-deployment-management
x-pack/plugins/license_management @elastic/platform-deployment-management
Expand Down
32 changes: 16 additions & 16 deletions api_docs/actions.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -5272,13 +5272,13 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIConnectorFeatureId",
"id": "def-common.GenerativeAIForObservabilityConnectorFeatureId",
"type": "string",
"tags": [],
"label": "GenerativeAIConnectorFeatureId",
"label": "GenerativeAIForObservabilityConnectorFeatureId",
"description": [],
"signature": [
"\"generativeAI\""
"\"generativeAIForObservability\""
],
"path": "x-pack/plugins/actions/common/connector_feature_config.ts",
"deprecated": false,
Expand All @@ -5287,13 +5287,13 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIForObservabilityConnectorFeatureId",
"id": "def-common.GenerativeAIForSecurityConnectorFeatureId",
"type": "string",
"tags": [],
"label": "GenerativeAIForObservabilityConnectorFeatureId",
"label": "GenerativeAIForSecurityConnectorFeatureId",
"description": [],
"signature": [
"\"generativeAIForObservability\""
"\"generativeAIForSecurity\""
],
"path": "x-pack/plugins/actions/common/connector_feature_config.ts",
"deprecated": false,
Expand Down Expand Up @@ -5627,18 +5627,18 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIFeature",
"id": "def-common.GenerativeAIForObservabilityFeature",
"type": "Object",
"tags": [],
"label": "GenerativeAIFeature",
"label": "GenerativeAIForObservabilityFeature",
"description": [],
"path": "x-pack/plugins/actions/common/connector_feature_config.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIFeature.id",
"id": "def-common.GenerativeAIForObservabilityFeature.id",
"type": "string",
"tags": [],
"label": "id",
Expand All @@ -5649,7 +5649,7 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIFeature.name",
"id": "def-common.GenerativeAIForObservabilityFeature.name",
"type": "string",
"tags": [],
"label": "name",
Expand All @@ -5660,7 +5660,7 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIFeature.compatibility",
"id": "def-common.GenerativeAIForObservabilityFeature.compatibility",
"type": "string",
"tags": [],
"label": "compatibility",
Expand All @@ -5674,18 +5674,18 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIForObservabilityFeature",
"id": "def-common.GenerativeAIForSecurityFeature",
"type": "Object",
"tags": [],
"label": "GenerativeAIForObservabilityFeature",
"label": "GenerativeAIForSecurityFeature",
"description": [],
"path": "x-pack/plugins/actions/common/connector_feature_config.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIForObservabilityFeature.id",
"id": "def-common.GenerativeAIForSecurityFeature.id",
"type": "string",
"tags": [],
"label": "id",
Expand All @@ -5696,7 +5696,7 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIForObservabilityFeature.name",
"id": "def-common.GenerativeAIForSecurityFeature.name",
"type": "string",
"tags": [],
"label": "name",
Expand All @@ -5707,7 +5707,7 @@
},
{
"parentPluginId": "actions",
"id": "def-common.GenerativeAIForObservabilityFeature.compatibility",
"id": "def-common.GenerativeAIForSecurityFeature.compatibility",
"type": "string",
"tags": [],
"label": "compatibility",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_observability.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementObservability
title: "aiAssistantManagementObservability"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementObservability plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementObservability']
---
import aiAssistantManagementObservabilityObj from './ai_assistant_management_observability.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
12 changes: 0 additions & 12 deletions api_docs/alerting.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3573,18 +3573,6 @@
"plugin": "securitySolution",
"path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts"
},
{
"plugin": "stackAlerts",
"path": "x-pack/plugins/stack_alerts/server/rule_types/geo_containment/lib/get_entities_and_generate_alerts.ts"
},
{
"plugin": "stackAlerts",
"path": "x-pack/plugins/stack_alerts/server/rule_types/geo_containment/executor.ts"
},
{
"plugin": "stackAlerts",
"path": "x-pack/plugins/stack_alerts/server/rule_types/geo_containment/executor.ts"
},
{
"plugin": "synthetics",
"path": "x-pack/plugins/synthetics/server/alert_rules/common.ts"
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
description: API docs for the alerting plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
---
import alertingObj from './alerting.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
title: "apm"
image: https://source.unsplash.com/400x175/?github
description: API docs for the apm plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
---
import apmObj from './apm.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm_data_access.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
title: "apmDataAccess"
image: https://source.unsplash.com/400x175/?github
description: API docs for the apmDataAccess plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
---
import apmDataAccessObj from './apm_data_access.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/asset_manager.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetManager
title: "assetManager"
image: https://source.unsplash.com/400x175/?github
description: API docs for the assetManager plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetManager']
---
import assetManagerObj from './asset_manager.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/banners.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
title: "banners"
image: https://source.unsplash.com/400x175/?github
description: API docs for the banners plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
---
import bannersObj from './banners.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/bfetch.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
title: "bfetch"
image: https://source.unsplash.com/400x175/?github
description: API docs for the bfetch plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
---
import bfetchObj from './bfetch.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/canvas.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
title: "canvas"
image: https://source.unsplash.com/400x175/?github
description: API docs for the canvas plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
---
import canvasObj from './canvas.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/cases.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
title: "cases"
image: https://source.unsplash.com/400x175/?github
description: API docs for the cases plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
---
import casesObj from './cases.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/charts.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
title: "charts"
image: https://source.unsplash.com/400x175/?github
description: API docs for the charts plugin
date: 2024-01-04
date: 2024-01-08
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
---
import chartsObj from './charts.devdocs.json';
Expand Down
Loading

0 comments on commit 362da9f

Please sign in to comment.