Skip to content

Commit b943c49

Browse files
dplumleedplumlee
committed
Merge remote-tracking branch 'upstream/main' into rule-type-diff-algorithm
2 parents 6a39b5f + 49661a3 commit b943c49

4,412 files changed

Lines changed: 199243 additions & 61856 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ 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
355+
- x-pack/performance/journeys_e2e/web_logs_dashboard_dataview.ts
354356
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
355357
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
356358
- 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/pipeline-resource-definitions/scripts/fix-location-collection.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ async function main() {
3838

3939
const preamble = locationFileLines.slice(0, 1);
4040

41-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
4241
const locationObj = jsYaml.load(
4342
locationFileLines.slice(1).join('\n')
4443
) as BackstageLocationResource;
4544
locationObj.spec.targets = pipelines.map(
4645
(fileName) => `${resourceDefinitionsBaseUrl}/${fileName}`
4746
);
4847

49-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
5048
const locationYaml = jsYaml.dump(locationObj, { lineWidth: 400 });
5149

5250
fs.writeFileSync(locationFile, `${preamble.join('\n')}\n${locationYaml}`);

‎.buildkite/pipeline-utils/agent_images.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1110
import { dump } from 'js-yaml';
1211
import { BuildkiteClient, BuildkiteCommandStep } from './buildkite';
1312

‎.buildkite/pipeline-utils/buildkite/client.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import axios, { AxiosInstance } from 'axios';
1111
import { execSync, ExecSyncOptions } from 'child_process';
1212

13-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1413
import { dump } from 'js-yaml';
1514

1615
import { parseLinkHeader } from './parse_link_header';

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as Fs from 'fs';
1212
import * as globby from 'globby';
1313
import minimatch from 'minimatch';
1414

15-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1615
import { load as loadYaml } from 'js-yaml';
1716

1817
import { BuildkiteClient, BuildkiteStep } from '../buildkite';

‎.buildkite/scripts/steps/artifacts/docker_image.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ steps:
126126
env:
127127
CONTAINER: "$KIBANA_IMAGE"
128128
soft_fail: true
129-
- label: ":argo: Update kibana image tag for kibana-controller using gpctl"
129+
- label: ":serverless::argo: Run synthetics tests and update kibana image tag to ${GIT_ABBREV_COMMIT} for kibana-controller"
130130
branches: main
131-
trigger: gpctl-promote-with-e2e-tests
131+
trigger: gpctl-promote-after-serverless-devenv-synthetics
132132
build:
133133
env:
134134
SERVICE_COMMIT_HASH: "$GIT_ABBREV_COMMIT"
135135
SERVICE: kibana
136136
REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
137-
DRY_RUN: "${DRY_RUN:-false}"
137+
GPCTL_PROMOTE_DRY_RUN: ${DRY_RUN:-false}
138138
EOF
139139

140140
else

‎.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

0 commit comments

Comments
 (0)