Skip to content

Commit

Permalink
Merge branch 'main' into edit-query-design-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine committed Oct 27, 2023
2 parents f840111 + 002ac40 commit 6eba6de
Show file tree
Hide file tree
Showing 1,702 changed files with 21,861 additions and 19,144 deletions.
26 changes: 26 additions & 0 deletions .buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,32 @@ steps:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
label: 'Defend Workflows Cypress Tests on Serverless'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
- exit_status: '*'
limit: 1

- wait: ~

- label: ":arrow_up::elastic::arrow_up: Promote docker image"
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/pipelines/flaky_tests/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,11 @@ for (const testSuite of testSuites) {
`Group configuration was not found in groups.json for the following cypress suite: {${suiteName}}.`
);
}
const agentQueue = suiteName.includes('defend_workflows') ? 'n2-4-virt' : 'n2-4-spot';
steps.push({
command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
label: group.name,
agents: { queue: 'n2-4-spot' },
agents: { queue: agentQueue },
depends_on: 'build',
parallelism: testSuite.count,
concurrency,
Expand Down
26 changes: 19 additions & 7 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ steps:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 60
parallelism: 4
parallelism: 6
retry:
automatic:
- exit_status: '*'
Expand Down Expand Up @@ -157,7 +157,7 @@ steps:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 60
parallelism: 6
parallelism: 10
retry:
automatic:
- exit_status: '*'
Expand All @@ -168,8 +168,8 @@ steps:
agents:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 120
parallelism: 2
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
- exit_status: '*'
Expand All @@ -180,7 +180,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
Expand All @@ -192,7 +192,19 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 50
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
Expand Down Expand Up @@ -242,7 +254,7 @@ steps:
- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
queue: n2-16-spot
queue: n2-2-spot
timeout_in_minutes: 60
retry:
automatic:
Expand Down
26 changes: 8 additions & 18 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
limit: 3

- command: .buildkite/scripts/steps/build_api_docs.sh
label: 'Build API Docs'
label: 'Check Types and Build API Docs'
agents:
queue: n2-4-spot
key: build_api_docs
Expand Down Expand Up @@ -63,7 +63,7 @@ steps:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 60
parallelism: 4
parallelism: 6
retry:
automatic:
- exit_status: '*'
Expand Down Expand Up @@ -135,7 +135,7 @@ steps:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 60
parallelism: 6
parallelism: 10
retry:
automatic:
- exit_status: '*'
Expand All @@ -146,8 +146,8 @@ steps:
agents:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 120
parallelism: 2
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
- exit_status: '*'
Expand All @@ -158,7 +158,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
Expand All @@ -170,7 +170,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 50
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
Expand All @@ -182,7 +182,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 50
timeout_in_minutes: 60
parallelism: 6
retry:
automatic:
Expand Down Expand Up @@ -232,13 +232,3 @@ steps:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
queue: n2-16-spot
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3
1 change: 0 additions & 1 deletion .buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ steps:

- label: ":ship: Fleet serverless smoke tests for ${ENVIRONMENT}"
trigger: fleet-smoke-tests # https://buildkite.com/elastic/fleet-smoke-tests
soft_fail: true # Remove this before release
build:
env:
ENVIRONMENT: ${ENVIRONMENT}
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/archive_so_migration_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SO_MIGRATIONS_SNAPSHOT_FOLDER=kibana-so-types-snapshots
SNAPSHOT_FILE_PATH="${1:-target/plugin_so_types_snapshot.json}"

echo "--- Creating snapshot of Saved Object migration info"
node scripts/snapshot_plugin_types --outputPath "$SNAPSHOT_FILE_PATH"
node scripts/snapshot_plugin_types snapshot --outputPath "$SNAPSHOT_FILE_PATH"

echo "--- Uploading as ${BUILDKITE_COMMIT}.json"
SNAPSHOT_PATH="${SO_MIGRATIONS_SNAPSHOT_FOLDER}/${BUILDKITE_COMMIT}.json"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/check_types.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ source .buildkite/scripts/common/util.sh
.buildkite/scripts/bootstrap.sh

echo --- Check Types
node scripts/type_check
node --max-old-space-size=4096 scripts/type_check
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
.buildkite/scripts/steps/checks/test_hardening.sh
.buildkite/scripts/steps/checks/ftr_configs.sh
.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/checks/yarn_deduplicate.sh
11 changes: 11 additions & 0 deletions .buildkite/scripts/steps/checks/saved_objects_definition_change.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/common/util.sh

echo --- Check SO definition changes
cmd="node scripts/jest_integration -u src/core/server/integration_tests/ci_checks"

eval "$cmd"
check_for_changed_files "$cmd" true
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh

echo --- Security Solution OpenAPI Code Generation

(cd x-pack/plugins/security_solution && yarn openapi:generate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ echo "--- Defend Workflows Cypress tests on Serverless"

cd x-pack/plugins/security_solution

set +e
yarn cypress:dw:serverless:run; status=$?; yarn junit:merge || :; exit $status
22 changes: 11 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -928,17 +928,17 @@ module.exports = {
},
{
files: [
'x-pack/plugins/aiops/**/*.tsx',
'x-pack/plugins/apm/**/*.tsx',
'x-pack/plugins/exploratory_view/**/*.tsx',
'x-pack/plugins/infra/**/*.tsx',
'x-pack/plugins/observability/**/*.tsx',
'x-pack/plugins/observability_ai_assistant/**/*.tsx',
'x-pack/plugins/observability_onboarding/**/*.tsx',
'x-pack/plugins/observability_shared/**/*.tsx',
'x-pack/plugins/profiling/**/*.tsx',
'x-pack/plugins/synthetics/**/*.tsx',
'x-pack/plugins/ux/**/*.tsx',
'x-pack/plugins/aiops/**/!(*.test.tsx).tsx',
'x-pack/plugins/apm/**/!(*.test.tsx).tsx',
'x-pack/plugins/exploratory_view/**/!(*.test.tsx).tsx',
'x-pack/plugins/infra/**/!(*.test.tsx).tsx',
'x-pack/plugins/observability/**/!(*.test.tsx)',
'x-pack/plugins/observability_ai_assistant/**/!(*.test.tsx).tsx',
'x-pack/plugins/observability_onboarding/**/!(*.test.tsx).tsx',
'x-pack/plugins/observability_shared/**/!(*.test.tsx).tsx',
'x-pack/plugins/profiling/**/!(*.test.tsx).tsx',
'x-pack/plugins/synthetics/**/!(*.test.tsx).tsx',
'x-pack/plugins/ux/**/!(*.test.tsx).tsx',
],
rules: {
'@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,6 @@ examples/share_examples @elastic/appex-sharedux
src/plugins/share @elastic/appex-sharedux
packages/kbn-shared-svg @elastic/apm-ui
packages/shared-ux/avatar/solution @elastic/appex-sharedux
packages/shared-ux/avatar/user_profile/impl @elastic/appex-sharedux
packages/shared-ux/button/exit_full_screen/impl @elastic/appex-sharedux
packages/shared-ux/button/exit_full_screen/mocks @elastic/appex-sharedux
packages/shared-ux/button/exit_full_screen/types @elastic/appex-sharedux
Expand Down Expand Up @@ -891,6 +890,7 @@ packages/kbn-yarn-lock-validator @elastic/kibana-operations
/test/api_integration/apis/event_annotations @elastic/kibana-visualizations
/x-pack/test_serverless/functional/test_suites/common/visualizations/ @elastic/kibana-visualizations
/x-pack/test_serverless/functional/fixtures/kbn_archiver/lens/ @elastic/kibana-visualizations
packages/kbn-monaco/src/esql @elastic/kibana-visualizations

# Global Experience

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/create-deploy-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ jobs:
echo "This workflow can only be run on the main branch"
exit 1
fi
- name: Find previous tag
run: |
prev_tag_name=`git tag -l 'deploy@[0-9]*' | tail -1`
echo "PREV_TAG_NAME=${prev_tag_name}" >> "${GITHUB_ENV}"
- name: Prepare tag
run: |
tag_name="deploy@$(date +%s)"
Expand Down Expand Up @@ -103,7 +107,7 @@ jobs:
JSON_USEFUL_LINKS_ARRAY: |
[
"*Useful links:*\\n",
"<https://docs.google.com/document/d/1c2LzojDh1wawjeMsKh4D_L2jpVJALhxukkmmL-TUbrs/edit#heading=h.50173f90utwr|Release process playbook>",
"<https://github.com/elastic/kibana/compare/${{ env.PREV_TAG_NAME }}...${{ env.TAG_NAME }}|Commits contained in deploy>",
"<https://buildkite.com/elastic/kibana-serverless-release/builds?branch=${{ env.TAG_NAME }}|Kibana Serverless Release pipeline>",
"<https://argo-workflows.us-central1.gcp.qa.cld.elstc.co/workflows?label=hash%3D${{ env.COMMIT }}|Argo Workflow> (use Elastic Cloud Staging VPN)",
"<https://overview.qa.cld.elstc.co/app/dashboards#/view/serverless-tooling-gpctl-deployment-status?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1d,to:now))&service-name=kibana&_a=(controlGroupInput:(chainingSystem:HIERARCHICAL,controlStyle:oneLine,ignoreParentSettings:(ignoreFilters:!f,ignoreQuery:!f,ignoreTimerange:!f,ignoreValidations:!f),panels:('18201b8e-3aae-4459-947d-21e007b6a3a5':(explicitInput:(dataViewId:'serverless.logs-*',enhancements:(),fieldName:commit-hash,id:'18201b8e-3aae-4459-947d-21e007b6a3a5',selectedOptions:!('${{ env.COMMIT }}'),title:commit-hash),grow:!t,order:1,type:optionsListControl,width:medium),'41060e65-ce4c-414e-b8cf-492ccb19245f':(explicitInput:(dataViewId:'serverless.logs-*',enhancements:(),fieldName:service-name,id:'41060e65-ce4c-414e-b8cf-492ccb19245f',selectedOptions:!(kibana),title:service-name),grow:!t,order:0,type:optionsListControl,width:medium),ed96828e-efe9-43ad-be3f-0e04218f79af:(explicitInput:(dataViewId:'serverless.logs-*',enhancements:(),fieldName:to-env,id:ed96828e-efe9-43ad-be3f-0e04218f79af,selectedOptions:!(qa),title:to-env),grow:!t,order:2,type:optionsListControl,width:medium))))|GPCTL Deployment Status dashboard for nonprod>",
Expand Down Expand Up @@ -152,6 +156,5 @@ jobs:
JSON_USEFUL_LINKS_ARRAY: |
[
"*Useful links:*\\n",
"<https://docs.google.com/document/d/1c2LzojDh1wawjeMsKh4D_L2jpVJALhxukkmmL-TUbrs/edit#heading=h.50173f90utwr|Release process playbook>",
"<https://github.com/elastic/kibana/actions/runs/${{ github.run_id }}|GitHub Workflow run>"
]
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: 2023-10-24
date: 2023-10-27
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: 2023-10-24
date: 2023-10-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
39 changes: 39 additions & 0 deletions api_docs/aiops.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,29 @@
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "aiops",
"id": "def-public.AiopsAppDependencies.usageCollection",
"type": "Object",
"tags": [],
"label": "usageCollection",
"description": [
"\nUsage collection."
],
"signature": [
{
"pluginId": "usageCollection",
"scope": "public",
"docId": "kibUsageCollectionPluginApi",
"section": "def-public.UsageCollectionSetup",
"text": "UsageCollectionSetup"
},
" | undefined"
],
"path": "x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "aiops",
"id": "def-public.AiopsAppDependencies.share",
Expand Down Expand Up @@ -690,6 +713,22 @@
"path": "x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "aiops",
"id": "def-public.AiopsAppDependencies.embeddingOrigin",
"type": "string",
"tags": [],
"label": "embeddingOrigin",
"description": [
"Identifier to indicate the plugin utilizing the component"
],
"signature": [
"string | undefined"
],
"path": "x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts",
"deprecated": false,
"trackAdoption": false
}
],
"initialIsOpen": false
Expand Down
Loading

0 comments on commit 6eba6de

Please sign in to comment.