Skip to content

Commit c20db06

Browse files
committed
Merge branch 'master' into alerts/action-groups-as-conditions
* master: [Security Solution][Detections] Adds framework for replacing API schemas (elastic#82462) [Enterprise Search] Share Loading component (elastic#83246) Consolidates Jest configuration files and scripts (elastic#82671) APM header changes (elastic#82870) [Security Solutions] Adds a default for indicator match custom query of *:* (elastic#81727) [Security Solution] Note 10k object paging limit on Endpoint list (elastic#82889) [packerCache] fix gulp usage, don't archive node_modules (elastic#83327) Upgrade Node.js to version 12 (elastic#61587) [Actions] Removing placeholders and updating validation messages on connector forms (elastic#82734) [Fleet] Rename ingest_manager_api_integration tests fleet_api_integration (elastic#83011) [DOCS] Updates Discover docs (elastic#82773) [ML] Data frame analytics: Adds map view (elastic#81666) enables actions scoped within the stack to register at Basic license (elastic#82931)
2 parents 5307995 + 4dd25fa commit c20db06

File tree

1,036 files changed

+6726
-8356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,036 files changed

+6726
-8356
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=10.22.1
4+
ARG NODE_VERSION=12.19.0
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/packer_cache_for_branch.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ node scripts/es snapshot --download-only;
1818
node scripts/es snapshot --license=oss --download-only;
1919

2020
# download reporting browsers
21-
(cd "x-pack" && yarn gulp downloadChromium);
21+
(cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);
2222

2323
# cache the chromedriver archive
2424
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
@@ -51,10 +51,6 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
5151
.chromedriver \
5252
.geckodriver;
5353

54-
echo "Adding node_modules"
55-
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
56-
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
57-
5854
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5955

6056
if [[ "$branch" != "master" ]]; then

.github/paths-labeller.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
- "x-pack/plugins/apm/**/*.*"
1313
- "Team:Ingest Management":
1414
- "x-pack/plugins/fleet/**/*.*"
15-
- "x-pack/test/api_integration/apis/fleet/**/*.*"
16-
- "x-pack/test/epm_api_integration/**/*.*"
15+
- "x-pack/test/fleet_api_integration/**/*.*"
1716
- "Team:uptime":
1817
- "x-pack/plugins/uptime/**/*.*"
1918
- "x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/*.*"

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
1+
12.19.0

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
1+
12.19.0

docs/discover/context.asciidoc

Lines changed: 0 additions & 66 deletions
This file was deleted.

docs/discover/document-data.asciidoc

Lines changed: 0 additions & 55 deletions
This file was deleted.

docs/discover/field-filter.asciidoc

Lines changed: 0 additions & 155 deletions
This file was deleted.

docs/discover/images/Discover-Start.png

100644100755
-156 KB
Loading

docs/discover/images/add-icon.png

830 Bytes
Loading

0 commit comments

Comments
 (0)