Skip to content

Commit

Permalink
Merge branch 'main' into build/docker-upgrade-ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
jbudz committed Jul 21, 2023
2 parents dcefc22 + d0350ef commit 0530cf3
Show file tree
Hide file tree
Showing 1,068 changed files with 14,325 additions and 6,889 deletions.
3 changes: 1 addition & 2 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ disabled:
- x-pack/test/threat_intelligence_cypress/config.ts
- x-pack/test/functional_enterprise_search/visual_config.ts
- x-pack/test/functional_enterprise_search/cli_config.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/config_headless.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/config_visual.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
- x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
- x-pack/plugins/apm/ftr_e2e/ftr_config.ts
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 @@ -139,7 +139,7 @@ steps:
- command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
label: 'Build Storybooks'
agents:
queue: n2-4-spot
queue: n2-8-spot
key: storybooks
timeout_in_minutes: 60
retry:
Expand Down
18 changes: 18 additions & 0 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,24 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/functional/security_serverless.sh
label: 'Serverless Security Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
soft_fail:
- exit_status: 10
retry:
automatic:
- exit_status: '-1'
limit: 3
- exit_status: '*'
limit: 1
artifact_paths:
- "target/kibana-security-serverless/**/*"


- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
Expand Down
15 changes: 15 additions & 0 deletions .buildkite/pipelines/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,18 @@ steps:
limit: 3
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless.sh
label: 'Serverless Security Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
retry:
automatic:
- exit_status: '-1'
limit: 3
- exit_status: '*'
limit: 1
artifact_paths:
- "target/kibana-security-serverless/**/*"
13 changes: 13 additions & 0 deletions .buildkite/scripts/steps/functional/security_serverless.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh
source .buildkite/scripts/steps/functional/common_cypress.sh

export JOB=kibana-serverless-security-cypress
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

echo "--- Security Serverless Cypress"

yarn --cwd x-pack/test_serverless/functional/test_suites/security/cypress cypress:run
1 change: 0 additions & 1 deletion .buildkite/scripts/steps/functional/serverless_ftr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ elif [[ "$SERVERLESS_ENVIRONMENT" == "security" ]]; then
SERVERLESS_CONFIGS=(
"x-pack/test_serverless/api_integration/test_suites/security/config.ts"
"x-pack/test_serverless/functional/test_suites/security/config.ts"
"x-pack/test_serverless/functional/test_suites/security/cypress/config_headless.ts"
)
fi

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/storybooks/build_and_upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const STORYBOOKS = [
'lists',
'observability',
'presentation',
'security_solution',
// 'security_solution', => This build is error out and failing CI. SEE: https://github.com/elastic/kibana/issues/162290
'security_solution_packages',
'serverless',
'shared_ux',
Expand Down
3 changes: 1 addition & 2 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"dataViews": "src/plugins/data_views",
"defaultNavigation": "packages/default-nav",
"devTools": "src/plugins/dev_tools",
"discover": "src/plugins/discover",
"discover-utils": "packages/kbn-discover-utils",
"discover": ["src/plugins/discover", "packages/kbn-discover-utils"],
"savedSearch": "src/plugins/saved_search",
"embeddableApi": "src/plugins/embeddable",
"embeddableExamples": "examples/embeddable_examples",
Expand Down
56 changes: 51 additions & 5 deletions api_docs/actions.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2676,6 +2676,52 @@
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "actions",
"id": "def-server.ActionType.getKibanaPrivileges",
"type": "Function",
"tags": [],
"label": "getKibanaPrivileges",
"description": [
"\nAdditional Kibana privileges to be checked by the actions framework.\nUse it if you want to perform extra authorization checks based on a Kibana feature.\nFor example, you can define the privileges a users needs to have to execute\na Case or OsQuery system action.\n\nThe list of the privileges follows the Kibana privileges format usually generated with `security.authz.actions.*.get(...)`.\n\nIt only works with system actions and only when executing an action.\nFor all other scenarios they will be ignored"
],
"signature": [
"((args?: { params?: Params | undefined; } | undefined) => string[]) | undefined"
],
"path": "x-pack/plugins/actions/server/types.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
{
"parentPluginId": "actions",
"id": "def-server.ActionType.getKibanaPrivileges.$1",
"type": "Object",
"tags": [],
"label": "args",
"description": [],
"path": "x-pack/plugins/actions/server/types.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
{
"parentPluginId": "actions",
"id": "def-server.ActionType.getKibanaPrivileges.$1.params",
"type": "Uncategorized",
"tags": [],
"label": "params",
"description": [],
"signature": [
"Params | undefined"
],
"path": "x-pack/plugins/actions/server/types.ts",
"deprecated": false,
"trackAdoption": false
}
]
}
],
"returnComment": []
},
{
"parentPluginId": "actions",
"id": "def-server.ActionType.renderParameterTemplates",
Expand Down Expand Up @@ -3228,7 +3274,7 @@
"label": "ActionsAuthorization",
"description": [],
"signature": [
"{ ensureAuthorized: (operation: string, actionTypeId?: string | undefined) => Promise<void>; }"
"{ ensureAuthorized: ({ operation, actionTypeId, additionalPrivileges, }: { operation: string; actionTypeId?: string | undefined; additionalPrivileges?: string[] | undefined; }) => Promise<void>; }"
],
"path": "x-pack/plugins/actions/server/index.ts",
"deprecated": false,
Expand Down Expand Up @@ -3267,7 +3313,7 @@
},
"<",
"ActionTypeConfig",
">>; get: ({ id }: { id: string; }) => Promise<",
">>; get: ({ id, throwIfSystemAction, }: { id: string; throwIfSystemAction?: boolean | undefined; }) => Promise<",
{
"pluginId": "actions",
"scope": "server",
Expand All @@ -3277,15 +3323,15 @@
},
"<",
"ActionTypeConfig",
">>; getAll: () => Promise<",
">>; getAll: ({ includeSystemActions }?: GetAllOptions) => Promise<",
{
"pluginId": "actions",
"scope": "server",
"docId": "kibActionsPluginApi",
"section": "def-server.FindActionResult",
"text": "FindActionResult"
},
"[]>; getBulk: (ids: string[]) => Promise<",
"[]>; getBulk: (ids: string[], throwIfSystemAction?: boolean) => Promise<",
{
"pluginId": "actions",
"scope": "server",
Expand Down Expand Up @@ -3321,7 +3367,7 @@
"section": "def-server.RunNowResult",
"text": "RunNowResult"
},
">; listTypes: (featureId?: string | undefined) => Promise<",
">; listTypes: ({ featureId, includeSystemActionTypes, }?: ListTypesOptions) => Promise<",
{
"pluginId": "actions",
"scope": "common",
Expand Down
4 changes: 2 additions & 2 deletions 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-07-19
date: 2023-07-21
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand All @@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o

| Public API count | Any count | Items lacking comments | Missing exports |
|-------------------|-----------|------------------------|-----------------|
| 272 | 10 | 267 | 27 |
| 275 | 10 | 269 | 27 |

## Client

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-07-19
date: 2023-07-21
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
Loading

0 comments on commit 0530cf3

Please sign in to comment.