Skip to content

Commit

Permalink
Merge branch 'main' into rule-detail-page
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored May 16, 2022
2 parents 8391aaf + 059f09d commit 080b723
Show file tree
Hide file tree
Showing 256 changed files with 9,713 additions and 15,534 deletions.
4 changes: 2 additions & 2 deletions .buildkite/scripts/build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ set -euo pipefail
export KBN_NP_PLUGINS_BUILT=true

echo "--- Build Kibana Distribution"
if [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-all-platforms"* ]]; then
if is_pr_with_label "ci:build-all-platforms"; then
node scripts/build --all-platforms --skip-os-packages
elif [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-os-packages"* ]]; then
elif is_pr_with_label "ci:build-os-packages"; then
node scripts/build --all-platforms --docker-cross-compile
else
node scripts/build
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export ELASTIC_APM_SERVER_URL=https://kibana-ci-apm.apm.us-central1.gcp.cloud.es
export ELASTIC_APM_SECRET_TOKEN=7YKhoXsO4MzjhXjx2c

if is_pr; then
if [[ "${GITHUB_PR_LABELS:-}" == *"ci:collect-apm"* ]]; then
if is_pr_with_label "ci:collect-apm"; then
export ELASTIC_APM_ACTIVE=true
export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=false
else
Expand Down
21 changes: 20 additions & 1 deletion .buildkite/scripts/common/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,25 @@ is_pr() {
false
}

is_pr_with_label() {
match="$1"

IFS=',' read -ra labels <<< "${GITHUB_PR_LABELS:-}"

for label in "${labels[@]}"
do
if [ "$label" == "$match" ]; then
return
fi
done

false
}

is_auto_commit_disabled() {
is_pr_with_label "ci:no-auto-commit"
}

check_for_changed_files() {
RED='\033[0;31m'
YELLOW='\033[0;33m'
Expand All @@ -23,7 +42,7 @@ check_for_changed_files() {
GIT_CHANGES="$(git ls-files --modified -- . ':!:.bazelrc')"

if [ "$GIT_CHANGES" ]; then
if [[ "$SHOULD_AUTO_COMMIT_CHANGES" == "true" && "${BUILDKITE_PULL_REQUEST:-}" ]]; then
if ! is_auto_commit_disabled && [[ "$SHOULD_AUTO_COMMIT_CHANGES" == "true" && "${BUILDKITE_PULL_REQUEST:-}" ]]; then
NEW_COMMIT_MESSAGE="[CI] Auto-commit changed files from '$1'"
PREVIOUS_COMMIT_MESSAGE="$(git log -1 --pretty=%B)"

Expand Down
10 changes: 6 additions & 4 deletions .buildkite/scripts/steps/artifacts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ buildkite-agent artifact upload "dependencies-$FULL_VERSION.csv.sha512.txt"
buildkite-agent artifact upload 'i18n/*.json'
cd -

cd .beats
buildkite-agent artifact upload 'metricbeat-*'
buildkite-agent artifact upload 'filebeat-*'
cd -
if [ -d .beats ]; then
cd .beats
buildkite-agent artifact upload 'metricbeat-*'
buildkite-agent artifact upload 'filebeat-*'
cd -
fi
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
export DISABLE_BOOTSTRAP_VALIDATION=false
.buildkite/scripts/bootstrap.sh

.buildkite/scripts/steps/checks/commit/commit.sh
.buildkite/scripts/steps/checks/precommit_hook.sh
.buildkite/scripts/steps/checks/bazel_packages.sh
.buildkite/scripts/steps/checks/telemetry.sh
.buildkite/scripts/steps/checks/ts_projects.sh
Expand Down
14 changes: 0 additions & 14 deletions .buildkite/scripts/steps/checks/commit/commit.sh

This file was deleted.

13 changes: 0 additions & 13 deletions .buildkite/scripts/steps/checks/commit/commit_check_runner.sh

This file was deleted.

26 changes: 26 additions & 0 deletions .buildkite/scripts/steps/checks/precommit_hook.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/common/util.sh

# Runs pre-commit hook script for the files touched in the last commit.
# That way we can ensure a set of quick commit checks earlier as we removed
# the pre-commit hook installation by default.
# If files are more than 200 we will skip it and just use
# the further ci steps that already check linting and file casing for the entire repo.
echo --- Run Precommit Hook

echo "!!!!!!!! ATTENTION !!!!!!!!
That check is intended to provide earlier CI feedback after we remove the automatic install for the local pre-commit hook.
If you want, you can still manually install the pre-commit hook locally by running 'node scripts/register_git_hook locally'
!!!!!!!!!!!!!!!!!!!!!!!!!!!"

node scripts/precommit_hook.js \
--ref HEAD~1..HEAD \
--max-files 200 \
--verbose \
--fix \
--no-stage # we have to disable staging or check_for_changed_files won't see the changes

check_for_changed_files 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' true
16 changes: 11 additions & 5 deletions .buildkite/scripts/steps/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,26 @@ checks-reporter-with-killswitch "Lint: stylelint" \
node scripts/stylelint
echo "stylelint ✅"

echo '--- Lint: eslint'
# disable "Exit immediately" mode so that we can run eslint, capture it's exit code, and respond appropriately
# after possibly commiting fixed files to the repo
set +e;

echo '--- Lint: eslint'
checks-reporter-with-killswitch "Lint: eslint" \
if is_pr && ! is_auto_commit_disabled; then
node scripts/eslint --no-cache --fix
else
node scripts/eslint --no-cache
fi

eslint_exit=$?

# re-enable "Exit immediately" mode
set -e;

check_for_changed_files 'node scripts/eslint --no-cache --fix' true
desc="node scripts/eslint --no-cache"
if is_pr && ! is_auto_commit_disabled; then
desc="$desc --fix"
fi

check_for_changed_files "$desc" true

if [[ "${eslint_exit}" != "0" ]]; then
exit 1
Expand Down
8 changes: 4 additions & 4 deletions docs/api/actions-and-connectors.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ For deprecated APIs, refer to <<actions-and-connectors-legacy-apis>>.

For information about the actions and connectors that {kib} supports, refer to <<action-types,Action and connector types>>.

include::actions-and-connectors/get.asciidoc[]
include::actions-and-connectors/get_all.asciidoc[]
include::actions-and-connectors/create.asciidoc[leveloffset=+1]
include::actions-and-connectors/delete.asciidoc[leveloffset=+1]
include::actions-and-connectors/get.asciidoc[leveloffset=+1]
include::actions-and-connectors/get_all.asciidoc[leveloffset=+1]
include::actions-and-connectors/list.asciidoc[]
include::actions-and-connectors/create.asciidoc[]
include::actions-and-connectors/update.asciidoc[]
include::actions-and-connectors/execute.asciidoc[]
include::actions-and-connectors/delete.asciidoc[]
include::actions-and-connectors/legacy/index.asciidoc[]
include::actions-and-connectors/legacy/get.asciidoc[]
include::actions-and-connectors/legacy/get_all.asciidoc[]
Expand Down
31 changes: 22 additions & 9 deletions docs/api/actions-and-connectors/create.asciidoc
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
[[create-connector-api]]
=== Create connector API
== Create connector API
++++
<titleabbrev>Create connector</titleabbrev>
++++

Creates a connector.

[discrete]
[[create-connector-api-request]]
==== Request
=== {api-request-title}

`POST <kibana host>:<port>/api/actions/connector`

`POST <kibana host>:<port>/s/<space_id>/api/actions/connector`

[discrete]
=== {api-prereq-title}

You must have `all` privileges for the *Actions and Connectors* feature in the
*Management* section of the
<<kibana-feature-privileges,{kib} feature privileges>>.

[discrete]
[[create-connector-api-path-params]]
==== Path parameters
=== {api-path-parms-title}

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
(Optional, string) An identifier for the space. If `space_id` is not provided
in the URL, the default space is used.

[discrete]
[[create-connector-api-request-body]]
==== Request body
=== {api-request-body-title}

`name`::
(Required, string) The display name for the connector.
Expand All @@ -38,25 +49,27 @@ Creates a connector.
+
WARNING: Remember these values. You must provide them each time you call the <<update-connector-api, update>> API.

[discrete]
[[create-connector-api-request-codes]]
==== Response code
=== {api-response-codes-title}

`200`::
Indicates a successful call.

[discrete]
[[create-connector-api-example]]
==== Example
=== {api-examples-title}

[source,sh]
--------------------------------------------------
$ curl -X POST api/actions/connector -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
POST api/actions/connector
{
"name": "my-connector",
"connector_type_id": ".index",
"config": {
"index": "test-index"
}
}'
}
--------------------------------------------------
// KIBANA

Expand Down
23 changes: 17 additions & 6 deletions docs/api/actions-and-connectors/delete.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[delete-connector-api]]
=== Delete connector API
== Delete connector API
++++
<titleabbrev>Delete connector</titleabbrev>
++++
Expand All @@ -8,32 +8,43 @@ Deletes an connector by ID.

WARNING: When you delete a connector, _it cannot be recovered_.

[discrete]
[[delete-connector-api-request]]
==== Request
=== {api-request-title}

`DELETE <kibana host>:<port>/api/actions/connector/<id>`

`DELETE <kibana host>:<port>/s/<space_id>/api/actions/connector/<id>`

[discrete]
=== {api-prereq-title}

You must have `all` privileges for the *Actions and Connectors* feature in the
*Management* section of the
<<kibana-feature-privileges,{kib} feature privileges>>.

[discrete]
[[delete-connector-api-path-params]]
==== Path parameters
=== {api-path-parms-title}

`id`::
(Required, string) The ID of the connector.

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

[discrete]
[[delete-connector-api-response-codes]]
==== Response code
=== {api-response-codes-title}

`200`::
Indicates a successful call.

==== Example
[discrete]
=== {api-examples-title}

[source,sh]
--------------------------------------------------
$ curl -X DELETE api/actions/connector/c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad
DELETE api/actions/connector/c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad
--------------------------------------------------
// KIBANA
25 changes: 18 additions & 7 deletions docs/api/actions-and-connectors/get.asciidoc
Original file line number Diff line number Diff line change
@@ -1,39 +1,50 @@
[[get-connector-api]]
=== Get connector API
== Get connector API
++++
<titleabbrev>Get connector</titleabbrev>
++++

Retrieves a connector by ID.

[discrete]
[[get-connector-api-request]]
==== Request
=== {api-request-title}

`GET <kibana host>:<port>/api/actions/connector/<id>`

`GET <kibana host>:<port>/s/<space_id>/api/actions/connector/<id>`

[discrete]
=== {api-prereq-title}

You must have `read` privileges for the *Actions and Connectors* feature in the
*Management* section of the
<<kibana-feature-privileges,{kib} feature privileges>>.

[discrete]
[[get-connector-api-params]]
==== Path parameters
=== {api-path-parms-title}

`id`::
(Required, string) The ID of the connector.

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

[discrete]
[[get-connector-api-codes]]
==== Response code
=== {api-response-codes-title}

`200`::
Indicates a successful call.

[discrete]
[[get-connector-api-example]]
==== Example
=== {api-examples-title}

[source,sh]
--------------------------------------------------
$ curl -X GET api/actions/connector/c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad
GET api/actions/connector/c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad
--------------------------------------------------
// KIBANA

Expand All @@ -54,4 +65,4 @@ The API returns the following:
"is_deprecated": false,
"is_missing_secrets": false
}
--------------------------------------------------
--------------------------------------------------
Loading

0 comments on commit 080b723

Please sign in to comment.