Skip to content

Commit 5a097ab

Browse files
darnautovdarnautov
committed
Merge remote-tracking branch 'upstream/master' into ML-66553-add-from-explorer
2 parents c509d2f + 0ed7597 commit 5a097ab

386 files changed

Lines changed: 25215 additions & 2840 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.

‎.ci/packer_cache.sh‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,5 @@
22

33
set -e
44

5-
branch="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)"
6-
7-
# run setup script that gives us node, yarn, and bootstraps the project
8-
source src/dev/ci_setup/setup.sh;
9-
10-
# download es snapshots
11-
node scripts/es snapshot --download-only;
12-
node scripts/es snapshot --license=oss --download-only;
13-
14-
# download reporting browsers
15-
(cd "x-pack" && yarn gulp prepare);
16-
17-
# cache the chromedriver archive
18-
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
19-
chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
20-
if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
21-
echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
22-
exit 1
23-
fi
24-
mkdir -p .chromedriver
25-
curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
26-
echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
27-
28-
# cache the geckodriver archive
29-
geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
30-
if [ -z "$geckodriverPkgVersion" ]; then
31-
echo "UNABLE TO DETERMINE geckodriver VERSIONS"
32-
exit 1
33-
fi
34-
mkdir -p ".geckodriver"
35-
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
36-
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
37-
38-
echo "Creating bootstrap_cache archive"
39-
40-
# archive cacheable directories
41-
mkdir -p "$HOME/.kibana/bootstrap_cache"
42-
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
43-
x-pack/plugins/reporting/.chromium \
44-
.es \
45-
.chromedriver \
46-
.geckodriver;
47-
48-
echo "Adding node_modules"
49-
# 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
50-
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
51-
52-
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
53-
54-
if [ "$branch" == "master" ]; then
55-
echo "Creating bootstrap cache for 7.x";
56-
57-
git clone https://github.com/elastic/kibana.git --branch 7.x --depth 1 /tmp/kibana-7.x
58-
(cd /tmp/kibana-7.x && ./.ci/packer_cache.sh);
59-
rm -rf /tmp/kibana-7.x;
60-
fi
5+
./.ci/packer_cache_for_branch.sh master
6+
./.ci/packer_cache_for_branch.sh 7.x

‎.ci/packer_cache_for_branch.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
branch="$1"
6+
checkoutDir="$(pwd)"
7+
8+
if [[ "$branch" != "master" ]]; then
9+
checkoutDir="/tmp/kibana-$branch"
10+
git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir"
11+
cd "$checkoutDir"
12+
fi
13+
14+
source src/dev/ci_setup/setup.sh;
15+
16+
# download es snapshots
17+
node scripts/es snapshot --download-only;
18+
node scripts/es snapshot --license=oss --download-only;
19+
20+
# download reporting browsers
21+
(cd "x-pack" && yarn gulp prepare);
22+
23+
# cache the chromedriver archive
24+
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
25+
chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
26+
if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
27+
echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
28+
exit 1
29+
fi
30+
mkdir -p .chromedriver
31+
curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
32+
echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
33+
34+
# cache the geckodriver archive
35+
geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
36+
if [ -z "$geckodriverPkgVersion" ]; then
37+
echo "UNABLE TO DETERMINE geckodriver VERSIONS"
38+
exit 1
39+
fi
40+
mkdir -p ".geckodriver"
41+
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
42+
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
43+
44+
echo "Creating bootstrap_cache archive"
45+
46+
# archive cacheable directories
47+
mkdir -p "$HOME/.kibana/bootstrap_cache"
48+
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
49+
x-pack/plugins/reporting/.chromium \
50+
.es \
51+
.chromedriver \
52+
.geckodriver;
53+
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+
58+
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
59+
60+
if [[ "$branch" != "master" ]]; then
61+
rm --preserve-root -rf "$checkoutDir"
62+
fi

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
# App
66
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
7+
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
78
/x-pack/plugins/lens/ @elastic/kibana-app
89
/x-pack/plugins/graph/ @elastic/kibana-app
910
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.irequesttypesmap.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
## IRequestTypesMap interface
66

7+
The map of search strategy IDs to the corresponding request type definitions.
8+
79
<b>Signature:</b>
810

911
```typescript

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iresponsetypesmap.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
## IResponseTypesMap interface
66

7+
The map of search strategy IDs to the corresponding response type definitions.
8+
79
<b>Signature:</b>
810

911
```typescript

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearch.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
export declare type ISearch<T extends TStrategyTypes> = (request: IRequestTypesMap[T], options?: ISearchOptions) => Promise<IResponseTypesMap[T]>;
10+
export declare type ISearch<T extends TStrategyTypes> = (context: RequestHandlerContext, request: IRequestTypesMap[T], options?: ISearchOptions) => Promise<IResponseTypesMap[T]>;
1111
```

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcancel.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
export declare type ISearchCancel<T extends TStrategyTypes> = (id: string) => Promise<void>;
10+
export declare type ISearchCancel<T extends TStrategyTypes> = (context: RequestHandlerContext, id: string) => Promise<void>;
1111
```

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.config_.md‎

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

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.core.md‎

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

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.md‎

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

0 commit comments

Comments
 (0)