Skip to content

Commit ecdd770

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into telemetry-increment
2 parents 1ced937 + 5f951bd commit ecdd770

1,587 files changed

Lines changed: 36873 additions & 15447 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.

‎.backportrc.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@
3131
"^v8.0.0$": "master",
3232
"^v7.12.0$": "7.x",
3333
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
34-
}
34+
},
35+
"autoMerge": true,
36+
"autoMergeMethod": "squash"
3537
}

‎.ci/Jenkinsfile_coverage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load() // load from the Jenkins instance
55

6-
kibanaPipeline(timeoutMinutes: 240) {
6+
kibanaPipeline(timeoutMinutes: 300) {
77
catchErrors {
88
def timestamp = new Date(currentBuild.startTimeInMillis).format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"))
99
withEnv([
1010
"TIME_STAMP=${timestamp}",
1111
'CODE_COVERAGE=1', // Enables coverage. Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
1212
]) {
13-
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
13+
workers.base(name: 'coverage-worker', size: 'xl', ramDisk: false, bootstrapped: false) {
1414
catchError {
1515

1616
kibanaPipeline.bash("""

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
1919

2020
def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
2121

22-
kibanaPipeline(timeoutMinutes: 150) {
22+
kibanaPipeline(timeoutMinutes: 210) {
2323
catchErrors {
2424
slackNotifications.onFailure(
2525
title: "*<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@
7474
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
7575
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
7676

77-
# Client Side Monitoring (lives in APM directories but owned by Uptime)
77+
# Uptime
78+
/x-pack/plugins/uptime @elastic/uptime
79+
/x-pack/test/functional_with_es_ssl/apps/uptime @elastic/uptime
80+
/x-pack/test/functional/apps/uptime @elastic/uptime
81+
/x-pack/test/api_integration/apis/uptime @elastic/uptime
82+
83+
# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
7884
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
7985
/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
8086
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
@@ -106,7 +112,6 @@
106112
/x-pack/plugins/fleet/ @elastic/fleet
107113
/x-pack/plugins/observability/ @elastic/observability-ui
108114
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
109-
/x-pack/plugins/uptime @elastic/uptime
110115

111116
# Machine Learning
112117
/x-pack/plugins/ml/ @elastic/ml-ui

‎.github/workflows/backport.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,20 @@ jobs:
1818
)
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: 'Get backport config'
22-
run: |
23-
curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
24-
25-
- name: Use Node.js 14.x
26-
uses: actions/setup-node@v1
21+
- name: Checkout Actions
22+
uses: actions/checkout@v2
2723
with:
28-
node-version: 14.x
29-
30-
- name: Install backport CLI
31-
run: npm install -g backport@5.6.4
24+
repository: 'elastic/kibana-github-actions'
25+
ref: main
26+
path: ./actions
3227

33-
- name: Backport PR
34-
run: |
35-
git config --global user.name "kibanamachine"
36-
git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
37-
backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
38-
env:
39-
PR_NUMBER: ${{ github.event.pull_request.number }}
40-
PR_OWNER: ${{ github.event.pull_request.user.login }}
28+
- name: Install Actions
29+
run: npm install --production --prefix ./actions
4130

42-
- name: Report backport status
43-
run: |
44-
COMMENT="Backport result
45-
\`\`\`
46-
$(cat output.log)
47-
\`\`\`"
48-
49-
GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
50-
env:
51-
PR_NUMBER: ${{ github.event.pull_request.number }}
31+
- name: Run Backport
32+
uses: ./actions/backport
33+
with:
34+
branch: master
35+
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
36+
commit_user: kibanamachine
37+
commit_email: 42973632+kibanamachine@users.noreply.github.com

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ npm-debug.log*
6161
.ci/bash_standard_lib.sh
6262
.gradle
6363

64-
# apm plugin
65-
/x-pack/plugins/apm/tsconfig.json
66-
apm.tsconfig.json
6764
## @cypress/snapshot from apm plugin
6865
snapshots.js
6966

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
6+
kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
77
slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
88
githubPr.withDefaultPrComments {
99
ciStats.trackBuild {

‎docs/api/actions-and-connectors.asciidoc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[[actions-and-connectors-api]]
2+
== Action and connector APIs
3+
4+
Manage Actions and Connectors.
5+
6+
The following action APIs are available:
7+
8+
* <<actions-and-connectors-api-get, Get action API>> to retrieve a single action by ID
9+
10+
* <<actions-and-connectors-api-get-all, Get all actions API>> to retrieve all actions
11+
12+
* <<actions-and-connectors-api-list, List all action types API>> to retrieve a list of all action types
13+
14+
* <<actions-and-connectors-api-create, Create action API>> to create actions
15+
16+
* <<actions-and-connectors-api-update, Update action API>> to update the attributes for an existing action
17+
18+
* <<actions-and-connectors-api-execute, Execute action API>> to execute an action by ID
19+
20+
* <<actions-and-connectors-api-delete, Delete action API>> to delete an action by ID
21+
22+
For information about the actions and connectors that {kib} supports, refer to <<action-types,Action and connector types>>.
23+
24+
include::actions-and-connectors/get.asciidoc[]
25+
include::actions-and-connectors/get_all.asciidoc[]
26+
include::actions-and-connectors/list.asciidoc[]
27+
include::actions-and-connectors/create.asciidoc[]
28+
include::actions-and-connectors/update.asciidoc[]
29+
include::actions-and-connectors/execute.asciidoc[]
30+
include::actions-and-connectors/delete.asciidoc[]

‎docs/api/actions-and-connectors/create.asciidoc‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
[[actions-and-connectors-api-create]]
2+
=== Create action API
3+
++++
4+
<titleabbrev>Create action API</titleabbrev>
5+
++++
6+
7+
Creates an action.
8+
9+
[[actions-and-connectors-api-create-request]]
10+
==== Request
11+
12+
`POST <kibana host>:<port>/api/actions/action`
13+
14+
[[actions-and-connectors-api-create-request-body]]
15+
==== Request body
16+
17+
`name`::
18+
(Required, string) The display name for the action.
19+
20+
`actionTypeId`::
21+
(Required, string) The action type ID for the action.
22+
23+
`config`::
24+
(Required, object) The configuration for the action. Configuration properties vary depending on
25+
the action type. For information about the configuration properties, refer to <<action-types,Action and connector types>>.
26+
27+
`secrets`::
28+
(Required, object) The secrets configuration for the action. Secrets configuration properties vary
29+
depending on the action type. For information about the secrets configuration properties, refer to <<action-types,Action and connector types>>.
30+
31+
[[actions-and-connectors-api-create-request-codes]]
32+
==== Response code
33+
34+
`200`::
35+
Indicates a successful call.
36+
37+
[[actions-and-connectors-api-create-example]]
38+
==== Example
39+
40+
[source,sh]
41+
--------------------------------------------------
42+
$ curl -X POST api/actions/action -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
43+
{
44+
"name": "my-action",
45+
"actionTypeId": ".index",
46+
"config": {
47+
"index": "test-index"
48+
}
49+
}'
50+
--------------------------------------------------
51+
// KIBANA
52+
53+
The API returns the following:
54+
55+
[source,sh]
56+
--------------------------------------------------
57+
{
58+
"id": "c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad",
59+
"actionTypeId": ".index",
60+
"name": "my-action",
61+
"config": {
62+
"index": "test-index",
63+
"refresh": false,
64+
"executionTimeField": null
65+
},
66+
"isPreconfigured": false
67+
}
68+
--------------------------------------------------

‎docs/api/actions-and-connectors/delete.asciidoc‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[[actions-and-connectors-api-delete]]
2+
=== Delete action API
3+
++++
4+
<titleabbrev>Delete action API</titleabbrev>
5+
++++
6+
7+
Deletes an action by ID.
8+
9+
WARNING: When you delete an action, _it cannot be recovered_.
10+
11+
[[actions-and-connectors-api-delete-request]]
12+
==== Request
13+
14+
`DELETE <kibana host>:<port>/api/actions/action/<id>`
15+
16+
[[actions-and-connectors-api-delete-path-params]]
17+
==== Path parameters
18+
19+
`id`::
20+
(Required, string) The ID of the action.
21+
22+
[[actions-and-connectors-api-delete-response-codes]]
23+
==== Response code
24+
25+
`200`::
26+
Indicates a successful call.
27+
28+
==== Example
29+
30+
[source,sh]
31+
--------------------------------------------------
32+
$ curl -X DELETE api/actions/action/c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad
33+
--------------------------------------------------
34+
// KIBANA
35+

0 commit comments

Comments
 (0)