Skip to content

Commit fa6c95c

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into eui-v72.2.x
2 parents 5631cd5 + 7fa8094 commit fa6c95c

1,125 files changed

Lines changed: 14745 additions & 6764 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/pipelines/artifacts_container_image.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/artifacts/docker_image.sh
3+
label: Build default container images
4+
agents:
5+
queue: n2-16-spot
6+
timeout_in_minutes: 60
7+
retry:
8+
automatic:
9+
- exit_status: '-1'
10+
limit: 3

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
.buildkite/scripts/bootstrap.sh
6+
7+
source .buildkite/scripts/steps/artifacts/env.sh
8+
9+
GIT_ABBREV_COMMIT=${BUILDKITE_COMMIT:0:7}
10+
KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana:$GIT_ABBREV_COMMIT"
11+
12+
echo "--- Verify image does not already exist"
13+
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
14+
trap 'docker logout docker.elastic.co' EXIT
15+
16+
if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
17+
echo "Image already exists, exiting"
18+
exit 1
19+
fi
20+
21+
echo "--- Build image"
22+
node scripts/build \
23+
--debug \
24+
--release \
25+
--docker-cross-compile \
26+
--docker-images \
27+
--docker-namespace="kibana-ci" \
28+
--docker-tag="$GIT_ABBREV_COMMIT" \
29+
--skip-docker-ubi \
30+
--skip-docker-cloud \
31+
--skip-docker-contexts
32+
docker logout docker.elastic.co
33+
34+
echo "--- Build dependencies report"
35+
node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
36+
37+
echo "--- Upload artifacts"
38+
cd target
39+
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
40+
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
41+
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
42+
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
43+
buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
44+
cd -

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ snapshots.js
2828
/x-pack/plugins/canvas/storybook/build
2929
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
3030
/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
31+
/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/**
3132
/x-pack/plugins/cloud_integrations/cloud_gain_sight/server/assets/**
3233

3334
# package overrides

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
382382
/x-pack/plugins/triggers_actions_ui/ @elastic/response-ops
383383
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
384-
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/response-ops
384+
/x-pack/test/functional_with_es_ssl/plugins/alerts/ @elastic/response-ops
385385
/docs/user/alerting/ @elastic/response-ops
386386
/docs/management/connectors/ @elastic/response-ops
387387
/x-pack/plugins/stack_alerts/ @elastic/response-ops
@@ -1086,3 +1086,4 @@ x-pack/packages/ml/nested_property @elastic/ml-ui
10861086
x-pack/packages/ml/query_utils @elastic/ml-ui
10871087
x-pack/packages/ml/string_hash @elastic/ml-ui
10881088
x-pack/packages/ml/url_state @elastic/ml-ui
1089+
x-pack/test/alerting_api_integration/packages/helpers @elastic/response-ops

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,4 @@ fleet-server.yml
115115
/packages/kbn-synthetic-package-map/
116116
**/.synthetics/
117117
**/.journeys/
118+
x-pack/test/security_api_integration/plugins/audit_log/audit.log

‎NOTICE.txt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
225225
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
226226
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
227227

228-
---
229-
Portions of this code are licensed under the following license:
230-
For license information please see https://edge.fullstory.com/s/fs.js.LICENSE.txt
231-
232228
---
233229
Portions of this code are licensed under the following license:
234230
Gainsight PX Agent Wrapper Agent Version: 0.46.0 Installed: 2022-08-25 08:07
@@ -260,6 +256,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
260256
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
261257
THE SOFTWARE.
262258

259+
---
260+
This code is part of the Services provided by FullStory, Inc. For license information, please refer to https://www.fullstory.com/legal/terms-and-conditions/.
261+
Portions of this code are licensed separately and can be found in https://edge.fullstory.com/s/fs.js.LICENSE.txt
262+
263263
---
264264
This product bundles bootstrap@3.3.6 which is available under a
265265
"MIT" license.
@@ -346,3 +346,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
346346
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
347347
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
348348

349+
---
350+
Copyright (c) 2013 HubSpot, Inc.
351+
Released under the MIT license
352+
353+
https://github.com/HubSpot/vex/blob/master/LICENSE
354+

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2023-01-12
11+
date: 2023-01-13
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2023-01-12
11+
date: 2023-01-13
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

‎api_docs/aiops.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2023-01-12
11+
date: 2023-01-13
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';

‎api_docs/alerting.devdocs.json‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2698,7 +2698,7 @@
26982698
"section": "def-common.WithoutReservedActionGroups",
26992699
"text": "WithoutReservedActionGroups"
27002700
},
2701-
"<ActionGroupIds, RecoveryActionGroupId>>) => Promise<void | State>"
2701+
"<ActionGroupIds, RecoveryActionGroupId>>) => Promise<{ state: State; }>"
27022702
],
27032703
"path": "x-pack/plugins/alerting/server/types.ts",
27042704
"deprecated": false,
@@ -3124,6 +3124,53 @@
31243124
"trackAdoption": false,
31253125
"initialIsOpen": false
31263126
},
3127+
{
3128+
"parentPluginId": "alerting",
3129+
"id": "def-server.ExecutorType",
3130+
"type": "Type",
3131+
"tags": [],
3132+
"label": "ExecutorType",
3133+
"description": [],
3134+
"signature": [
3135+
"(options: ",
3136+
{
3137+
"pluginId": "alerting",
3138+
"scope": "server",
3139+
"docId": "kibAlertingPluginApi",
3140+
"section": "def-server.RuleExecutorOptions",
3141+
"text": "RuleExecutorOptions"
3142+
},
3143+
"<Params, State, InstanceState, InstanceContext, ActionGroupIds>) => Promise<{ state: State; }>"
3144+
],
3145+
"path": "x-pack/plugins/alerting/server/types.ts",
3146+
"deprecated": false,
3147+
"trackAdoption": false,
3148+
"returnComment": [],
3149+
"children": [
3150+
{
3151+
"parentPluginId": "alerting",
3152+
"id": "def-server.ExecutorType.$1",
3153+
"type": "Object",
3154+
"tags": [],
3155+
"label": "options",
3156+
"description": [],
3157+
"signature": [
3158+
{
3159+
"pluginId": "alerting",
3160+
"scope": "server",
3161+
"docId": "kibAlertingPluginApi",
3162+
"section": "def-server.RuleExecutorOptions",
3163+
"text": "RuleExecutorOptions"
3164+
},
3165+
"<Params, State, InstanceState, InstanceContext, ActionGroupIds>"
3166+
],
3167+
"path": "x-pack/plugins/alerting/server/types.ts",
3168+
"deprecated": false,
3169+
"trackAdoption": false
3170+
}
3171+
],
3172+
"initialIsOpen": false
3173+
},
31273174
{
31283175
"parentPluginId": "alerting",
31293176
"id": "def-server.PartialRule",

0 commit comments

Comments
 (0)