Skip to content

Commit

Permalink
Merge branch 'main' into mv-eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
jbudz authored Oct 25, 2024
2 parents ed8d2b2 + 3ce8b74 commit 3b95d89
Show file tree
Hide file tree
Showing 2,263 changed files with 40,622 additions and 133,712 deletions.
3 changes: 2 additions & 1 deletion .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ enabled:
- x-pack/test/functional/apps/ml/permissions/config.ts
- x-pack/test/functional/apps/ml/short_tests/config.ts
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
- x-pack/test/functional/apps/ml/memory_usage/config.ts
- x-pack/test/functional/apps/monitoring/config.ts
- x-pack/test/functional/apps/painless_lab/config.ts
- x-pack/test/functional/apps/remote_clusters/config.ts
Expand Down Expand Up @@ -341,7 +342,7 @@ enabled:
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
- x-pack/test/task_manager_claimer_mget/config.ts
- x-pack/test/task_manager_claimer_update_by_query/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/test/ui_capabilities/spaces_only/config.ts
- x-pack/test/upgrade_assistant_integration/config.ts
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
disabled:
# Base config files, only necessary to inform config finding script
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts
- x-pack/test/osquery_cypress/serverless_config.base.ts

# Cypress configs, for now these are still run manually
- x-pack/test/defend_workflows_cypress/serverless_config.ts
- x-pack/test/osquery_cypress/serverless_cli_config.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
- x-pack/test/security_solution_cypress/serverless_config.ts


# Playwright
- x-pack/test/security_solution_playwright/serverless_config.ts

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
message: Daily build
branch: '8.15'
Daily build (7.17):
cronline: 0 22 * * * America/New_York
cronline: 0 20 * * * America/New_York
message: Daily build
branch: '7.17'
tags:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: "Serverless Osquery Cypress Tests"
label: "Osquery Cypress Tests on Serverless"
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pointer_compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,4 @@ steps:
retry:
automatic:
- exit_status: '-1'
limit: 1
# status_exception: Native role management is not enabled in this Elasticsearch instance
# - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
# label: 'Serverless Security Defend Workflows Cypress Tests'
# agents:
# machineType: n2-standard-4
# preemptible: true
# depends_on: build
# timeout_in_minutes: 60
# retry:
# automatic:
# - exit_status: '-1'
# limit: 1
limit: 1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ fi
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/code_generation/osquery_codegen.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
8 changes: 6 additions & 2 deletions .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

set -euo pipefail

.buildkite/scripts/bootstrap.sh

source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

echo --- Capture OAS snapshot
cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces --include-path /api/fleet"
if is_pr && ! is_auto_commit_disabled; then
Expand All @@ -23,3 +24,6 @@ run_check() {
retry 5 15 run_check

check_for_changed_files "$cmd" true

.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/functional/apm_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ APM_CYPRESS_RECORD_KEY="$(vault_get apm-cypress-dashboard-record-key CYPRESS_REC

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

export JOB=kibana-apm-cypress
IS_FLAKY_TEST_RUNNER=${CLI_COUNT:-0}
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/functional/inventory_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

export JOB=kibana-inventory-onboarding-cypress

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

export JOB=kibana-observability-onboarding-cypress

Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/functional/profiling_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

export JOB=kibana-profiling-cypress

Expand Down

This file was deleted.

1 change: 1 addition & 0 deletions .buildkite/scripts/steps/functional/synthetics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

export JOB=kibana-uptime-playwright

Expand Down
3 changes: 1 addition & 2 deletions .buildkite/scripts/steps/openapi_bundling/final_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
echo --- Merge Kibana OpenAPI specs

(cd oas_docs && make api-docs && make api-docs-lint)
(cd oas_docs && make api-docs-staging && make api-docs-lint)

check_for_changed_files "make api-docs && make api-docs-staging" true
check_for_changed_files "make api-docs" true
17 changes: 9 additions & 8 deletions .buildkite/scripts/steps/storybooks/build_and_upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,45 @@ const STORYBOOKS = [
'canvas',
'cases',
'cell_actions',
'coloring',
'chart_icons',
'cloud_security_posture_packages',
'coloring',
'content_management_examples',
'custom_integrations',
'dashboard_enhanced',
'dashboard',
'data',
'logs_explorer',
'embeddable',
'esql_editor',
'expression_error',
'expression_image',
'expression_metric',
'expression_repeat_image',
'expression_reveal_image',
'expression_shape',
'expression_tagcloud',
'management',
'fleet',
'grouping',
'home',
'infra',
'kibana_react',
'language_documentation_popover',
'lists',
'observability',
'logs_explorer',
'management',
'observability_ai_assistant',
'observability_inventory',
'observability_shared',
'observability',
'presentation',
'security_solution',
'random_sampling',
'security_solution_packages',
'security_solution',
'serverless',
'shared_ux',
'triggers_actions_ui',
'ui_actions_enhanced',
'language_documentation_popover',
'unified_search',
'random_sampling',
'esql_editor',
];

const GITHUB_CONTEXT = 'Build and Publish Storybooks';
Expand Down
48 changes: 48 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1978,6 +1978,54 @@ module.exports = {
'max-classes-per-file': 'off',
},
},
{
files: [
'packages/kbn-reporting/common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/pdf_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/pdf/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/png_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/png/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/public/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/server/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/shared-ux/page/analytics_no_data/types/**',
'scripts/create_observability_rules.js', // TODO - is importing "@kbn/observability-alerting-test-data" (observability/private)
'src/cli_setup/**', // TODO @kibana/operations - is importing "@kbn/interactive-setup-plugin" (platform/private)
'src/dev/build/tasks/install_chromium.ts', // TODO @kibana/operations - is importing "@kbn/screenshotting-plugin" (platform/private)
'src/plugins/ai_assistant_management/selection/**',
'src/plugins/dashboard/**',
'src/plugins/discover/**',
'test/**',
'x-pack/examples/exploratory_view_example/**',
'x-pack/examples/screenshotting_example/**',
'x-pack/examples/ui_actions_enhanced_examples/**',
'x-pack/packages/security-solution/data_table/**',
'x-pack/plugins/aiops/**',
'x-pack/plugins/data_quality/**',
'x-pack/plugins/ingest_pipelines/**',
'x-pack/plugins/ml/**',
'x-pack/plugins/monitoring/**',
'x-pack/plugins/observability_solution/infra/**',
'x-pack/plugins/observability_solution/inventory/**',
'x-pack/plugins/observability_solution/investigate_app/**',
'x-pack/plugins/observability_solution/investigate/**',
'x-pack/plugins/observability_solution/logs_shared/**',
'x-pack/plugins/observability_solution/metrics_data_access/**',
'x-pack/plugins/observability_solution/observability_ai_assistant_app/**',
'x-pack/plugins/observability_solution/observability_ai_assistant_management/**',
'x-pack/plugins/observability_solution/observability/**',
'x-pack/plugins/observability_solution/slo/**',
'x-pack/plugins/observability_solution/synthetics/e2e/**',
'x-pack/plugins/osquery/**',
'x-pack/plugins/search_assistant/**',
'x-pack/test_serverless/**',
'x-pack/test/**',
'x-pack/test/plugin_functional/plugins/resolver_test/**',
],
rules: {
'@kbn/imports/no_group_crossing_manifests': 'warn',
'@kbn/imports/no_group_crossing_imports': 'warn',
},
},
],
};

Expand Down
Loading

0 comments on commit 3b95d89

Please sign in to comment.