Skip to content

Commit 71cfe01

Browse files
tiansivivetiansivive
committed
merging main
2 parents 90232a0 + d56a1bb commit 71cfe01

1,804 files changed

Lines changed: 100004 additions & 13941 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ enabled:
351351
- x-pack/performance/journeys_e2e/tsdb_logs_data_visualizer.ts
352352
- x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
353353
- x-pack/performance/journeys_e2e/web_logs_dashboard.ts
354+
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
354355
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
355356
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
356357
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enabled:
8181
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
8383
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
84+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
8485
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
8586
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/serverless.config.ts
8687
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ enabled:
6262
- x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
6363
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
6464
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
65+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
6566
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/ess.config.ts
6667
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/ess.config.ts
6768
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/scripts/steps/esql_generate_function_metadata.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
VALIDATION_PACKAGE_DIR="packages/kbn-esql-validation-autocomplete"
5-
EDITOR_PACKAGE_DIR="packages/kbn-text-based-editor"
5+
EDITOR_PACKAGE_DIR="packages/kbn-language-documentation"
66
GIT_SCOPE="$VALIDATION_PACKAGE_DIR/**/* $EDITOR_PACKAGE_DIR/**/*"
77

88
report_main_step () {

‎.buildkite/scripts/steps/openapi_bundling/final_merge.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ source .buildkite/scripts/common/util.sh
77
echo --- Merge Kibana OpenAPI specs
88

99
(cd oas_docs && make api-docs && make api-docs-lint)
10+
(cd oas_docs && make api-docs-staging && make api-docs-lint)
11+
12+
check_for_changed_files "make api-docs && make api-docs-staging" true

‎.buildkite/scripts/steps/storybooks/build_and_upload.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const STORYBOOKS = [
5454
'language_documentation_popover',
5555
'unified_search',
5656
'random_sampling',
57-
'text_based_editor',
57+
'esql_editor',
5858
];
5959

6060
const GITHUB_CONTEXT = 'Build and Publish Storybooks';

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
44
ENV HOME=/home/vscode
55
ENV NVM_DIR=${HOME}/nvm
66
ENV NVM_VERSION=v0.39.1
7-
ENV KBN_DIR=/workspaces/kibana
87
ENV OPENSSL_PATH=${HOME}/openssl
98
# Only specific versions are FIPS certified.
109
ENV OPENSSL_VERSION='3.0.8'
@@ -50,6 +49,7 @@ WORKDIR ${KBN_DIR}
5049
# Node and NVM setup
5150
COPY .node-version /tmp/
5251

52+
# Mac will have permissions issues if Node and NVM are installed as root
5353
USER vscode
5454

5555
RUN mkdir -p $NVM_DIR && \

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
9230,
2424
9231
2525
],
26-
"postStartCommand": "/workspaces/kibana/.devcontainer/scripts/post_start.sh",
26+
"postStartCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/post_start.sh",
2727
"remoteUser": "vscode",
28+
"containerEnv": {
29+
"KBN_DIR": "${containerWorkspaceFolder}"
30+
},
2831
"features": {
2932
"ghcr.io/devcontainers/features/docker-in-docker:2": {
3033
"version": "latest",

‎.github/CODEOWNERS‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ x-pack/plugins/data_quality @elastic/obs-ux-logs-team
354354
test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
355355
packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
356356
packages/kbn-data-stream-adapter @elastic/security-threat-hunting-explore
357+
x-pack/plugins/data_usage @elastic/obs-ai-assistant @elastic/security-solution
357358
src/plugins/data_view_editor @elastic/kibana-data-discovery
358359
examples/data_view_field_editor_example @elastic/kibana-data-discovery
359360
src/plugins/data_view_field_editor @elastic/kibana-data-discovery
@@ -428,6 +429,7 @@ src/plugins/esql @elastic/kibana-esql
428429
packages/kbn-esql-ast @elastic/kibana-esql
429430
examples/esql_ast_inspector @elastic/kibana-esql
430431
src/plugins/esql_datagrid @elastic/kibana-esql
432+
packages/kbn-esql-editor @elastic/kibana-esql
431433
packages/kbn-esql-utils @elastic/kibana-esql
432434
packages/kbn-esql-validation-autocomplete @elastic/kibana-esql
433435
examples/esql_validation_example @elastic/kibana-esql
@@ -552,7 +554,7 @@ src/plugins/kibana_usage_collection @elastic/kibana-core
552554
src/plugins/kibana_utils @elastic/appex-sharedux
553555
x-pack/plugins/kubernetes_security @elastic/kibana-cloud-security-posture
554556
x-pack/packages/kbn-langchain @elastic/security-generative-ai
555-
packages/kbn-language-documentation-popover @elastic/kibana-esql
557+
packages/kbn-language-documentation @elastic/kibana-esql
556558
x-pack/examples/lens_config_builder_example @elastic/kibana-visualizations
557559
packages/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
558560
packages/kbn-lens-formula-docs @elastic/kibana-visualizations
@@ -918,7 +920,6 @@ test
918920
x-pack/test
919921
x-pack/performance @elastic/appex-qa
920922
x-pack/examples/testing_embedded_lens @elastic/kibana-visualizations
921-
packages/kbn-text-based-editor @elastic/kibana-esql
922923
x-pack/examples/third_party_lens_navigation_prompt @elastic/kibana-visualizations
923924
x-pack/examples/third_party_vis_lens_example @elastic/kibana-visualizations
924925
x-pack/plugins/threat_intelligence @elastic/security-threat-hunting-investigations
@@ -1361,6 +1362,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
13611362
# Kibana Platform Security
13621363
/.github/codeql @elastic/kibana-security
13631364
/.github/workflows/codeql.yml @elastic/kibana-security
1365+
/.github/workflows/codeql-stats.yml @elastic/kibana-security
13641366
/src/dev/eslint/security_eslint_rule_tests.ts @elastic/kibana-security
13651367
/src/core/server/integration_tests/config/check_dynamic_config.test.ts @elastic/kibana-security
13661368
/src/plugins/telemetry/server/config/telemetry_labels.ts @elastic/kibana-security
@@ -1416,6 +1418,15 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
14161418
/x-pack/test_serverless/functional/test_suites/security/screenshot_creation/response_ops_docs @elastic/response-ops
14171419
/x-pack/test_serverless/functional/test_suites/observability/screenshot_creation/response_ops_docs @elastic/response-ops
14181420
/x-pack/test_serverless/api_integration/test_suites/common/alerting/ @elastic/response-ops
1421+
/x-pack/test/functional/es_archives/action_task_params @elastic/response-ops
1422+
/x-pack/test/functional/es_archives/actions @elastic/response-ops
1423+
/x-pack/test/functional/es_archives/alerting @elastic/response-ops
1424+
/x-pack/test/functional/es_archives/alerts @elastic/response-ops
1425+
/x-pack/test/functional/es_archives/alerts_legacy @elastic/response-ops
1426+
/x-pack/test/functional/es_archives/observability/alerts @elastic/response-ops
1427+
/x-pack/test/functional/es_archives/actions @elastic/response-ops
1428+
/x-pack/test/functional/es_archives/rules_scheduled_task_id @elastic/response-ops
1429+
/x-pack/test/functional/es_archives/alerting/8_2_0 @elastic/response-ops
14191430

14201431
# Enterprise Search
14211432
/x-pack/test/functional_enterprise_search/ @elastic/search-kibana

‎.github/workflows/codeql-stats.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: CodeQL statistics
2+
3+
on:
4+
schedule:
5+
- cron: '27 0 * * 1' # At 00:27 every Monday
6+
7+
jobs:
8+
stats:
9+
name: CodeQL statistics
10+
runs-on: ubuntu-latest
11+
if: github.repository == 'elastic/kibana' # Hack: Do not run on forks
12+
steps:
13+
- name: Checkout kibana-operations
14+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
with:
16+
repository: 'elastic/kibana-operations'
17+
ref: main
18+
path: ./kibana-operations
19+
token: ${{secrets.KIBANAMACHINE_TOKEN}}
20+
21+
- name: CodeQL alert statistics
22+
working-directory: ./kibana-operations/triage
23+
env:
24+
GITHUB_TOKEN: ${{secrets.KIBANAMACHINE_TOKEN}}
25+
SLACK_TOKEN: ${{secrets.CODE_SCANNING_SLACK_TOKEN}}
26+
run: |
27+
npm ci --omit=dev
28+
node codeql-alert-stats

0 commit comments

Comments
 (0)