Skip to content

Commit 5907ed1

Browse files
gmmorrisgmmorris
committed
Merge branch 'master' into task-manager/fix-flaky-test
* master: (74 commits) [Discover] Inline noWhiteSpace function (#74331) [DOCS] Add Observability topic (#73041) skip flaky suite (#74327) [Security Solution][Detections] Fixes Severity Override not matching for Elastic Endpoint Security rule (#74317) [Security Solution][Exceptions] - Fixes exceptions builder nested deletion issue and adds unit tests (#74250) Fixed Alert details does not update page title and breadcrumb (#74214) [src/dev/build] build Kibana Platform bundles from source (#73591) [Reporting] Shorten asset path to help CLI FS Watcher (#74185) Fix TMS not loaded in legacy maps (#73570) [Security Solution] styling for notes' panel (#74274) [Security Solution][Tech Debt] cleans up ts-ignore issues and some smaller linter issues (#74268) Make the actions plugin support generics (#71439) [Security Solution] Keep original note creator (#74203) [CI] Fix xpack kibana build dir in xpack visual regression script [CI] Fix baseline_capture job by adding parallel process number back [Monitoring] Ensure setup mode works on cloud but only for alerts (#73127) [Maps] Custom color ramps should show correctly on the map for mvt layers (#74169) [kbn/optimizer] remove unused modules (#74195) [CI] Add pipeline task queue framework and merge workers into one (#71268) Using msearch for tree api endpoint (#73813) ...
2 parents b44d375 + c24b17f commit 5907ed1

609 files changed

Lines changed: 10189 additions & 3471 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/Dockerfile‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
2+
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
3+
4+
ARG NODE_VERSION=10.21.0
5+
6+
FROM node:${NODE_VERSION} AS base
7+
8+
RUN apt-get update && \
9+
apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
10+
libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
11+
libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
12+
libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
13+
libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-8-jre && \
14+
rm -rf /var/lib/apt/lists/*
15+
16+
RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
17+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
18+
&& apt-get update \
19+
&& apt-get install -y rsync jq bsdtar google-chrome-stable \
20+
--no-install-recommends \
21+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
22+
23+
RUN LATEST_VAULT_RELEASE=$(curl -s https://api.github.com/repos/hashicorp/vault/tags | jq --raw-output .[0].name[1:]) \
24+
&& curl -L https://releases.hashicorp.com/vault/${LATEST_VAULT_RELEASE}/vault_${LATEST_VAULT_RELEASE}_linux_amd64.zip -o vault.zip \
25+
&& unzip vault.zip \
26+
&& rm vault.zip \
27+
&& chmod +x vault \
28+
&& mv vault /usr/local/bin/vault
29+
30+
RUN groupadd -r kibana && useradd -r -g kibana kibana && mkdir /home/kibana && chown kibana:kibana /home/kibana
31+
32+
COPY ./bash_standard_lib.sh /usr/local/bin/bash_standard_lib.sh
33+
RUN chmod +x /usr/local/bin/bash_standard_lib.sh
34+
35+
COPY ./runbld /usr/local/bin/runbld
36+
RUN chmod +x /usr/local/bin/runbld
37+
38+
USER kibana

‎.ci/Jenkinsfile_baseline_capture‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ kibanaPipeline(timeoutMinutes: 120) {
77
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
88
ciStats.trackBuild {
99
catchError {
10-
parallel([
11-
'oss-visualRegression': {
12-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
13-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
14-
}
15-
},
16-
'xpack-visualRegression': {
17-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
18-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
19-
}
20-
},
21-
])
10+
withEnv([
11+
'CI_PARALLEL_PROCESS_NUMBER=1'
12+
]) {
13+
parallel([
14+
'oss-visualRegression': {
15+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
16+
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
17+
}
18+
},
19+
'xpack-visualRegression': {
20+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
21+
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
22+
}
23+
},
24+
])
25+
}
2226
}
2327

2428
kibanaPipeline.sendMail()

‎.ci/runbld_no_junit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
profiles:
44
- ".*": # Match any job
55
tests:
6-
junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist
6+
junit-filename-pattern: false

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ npm-debug.log*
4949
.tern-project
5050
.nyc_output
5151
.ci/pipeline-library/build/
52+
.ci/runbld
53+
.ci/bash_standard_lib.sh
5254
.gradle
5355

5456
# apm plugin

‎Jenkinsfile‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
99
ciStats.trackBuild {
1010
catchError {
1111
retryable.enable()
12-
parallel([
13-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
14-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
15-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
16-
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
17-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
18-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
19-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
20-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
21-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
22-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
23-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
24-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
25-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
26-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
27-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
28-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
29-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
30-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
31-
]),
32-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
33-
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
34-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
35-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
36-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
37-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
38-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
39-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
40-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
41-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
42-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
43-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
44-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
45-
'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
46-
'xpack-securitySolutionCypress': { processNumber ->
47-
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/', 'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/', 'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx']) {
48-
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
49-
}
50-
},
51-
52-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
53-
]),
54-
])
12+
kibanaPipeline.allCiTasks()
5513
}
5614
}
5715
}

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export declare class SearchInterceptor
3535

3636
| Method | Modifiers | Description |
3737
| --- | --- | --- |
38-
| [runSearch(request, combinedSignal)](./kibana-plugin-plugins-data-public.searchinterceptor.runsearch.md) | | |
38+
| [runSearch(request, signal)](./kibana-plugin-plugins-data-public.searchinterceptor.runsearch.md) | | |
3939
| [search(request, options)](./kibana-plugin-plugins-data-public.searchinterceptor.search.md) | | Searches using the given <code>search</code> method. Overrides the <code>AbortSignal</code> with one that will abort either when <code>cancelPending</code> is called, when the request times out, or when the original <code>AbortSignal</code> is aborted. Updates the <code>pendingCount</code> when the request is started/finalized. |
4040
| [setupTimers(options)](./kibana-plugin-plugins-data-public.searchinterceptor.setuptimers.md) | | |
4141

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.runsearch.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<b>Signature:</b>
88

99
```typescript
10-
protected runSearch(request: IEsSearchRequest, combinedSignal: AbortSignal): Observable<IEsSearchResponse>;
10+
protected runSearch(request: IEsSearchRequest, signal: AbortSignal): Observable<IEsSearchResponse>;
1111
```
1212

1313
## Parameters
1414

1515
| Parameter | Type | Description |
1616
| --- | --- | --- |
1717
| request | <code>IEsSearchRequest</code> | |
18-
| combinedSignal | <code>AbortSignal</code> | |
18+
| signal | <code>AbortSignal</code> | |
1919

2020
<b>Returns:</b>
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Used internally for telemetry
99
<b>Signature:</b>
1010

1111
```typescript
12-
usage: SearchUsage;
12+
usage?: SearchUsage;
1313
```

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
| [parseInterval(interval)](./kibana-plugin-plugins-data-server.parseinterval.md) | |
2828
| [plugin(initializerContext)](./kibana-plugin-plugins-data-server.plugin.md) | Static code to be shared externally |
2929
| [shouldReadFieldFromDocValues(aggregatable, esType)](./kibana-plugin-plugins-data-server.shouldreadfieldfromdocvalues.md) | |
30+
| [usageProvider(core)](./kibana-plugin-plugins-data-server.usageprovider.md) | |
3031

3132
## Interfaces
3233

@@ -49,6 +50,7 @@
4950
| [PluginStart](./kibana-plugin-plugins-data-server.pluginstart.md) | |
5051
| [Query](./kibana-plugin-plugins-data-server.query.md) | |
5152
| [RefreshInterval](./kibana-plugin-plugins-data-server.refreshinterval.md) | |
53+
| [SearchUsage](./kibana-plugin-plugins-data-server.searchusage.md) | |
5254
| [TimeRange](./kibana-plugin-plugins-data-server.timerange.md) | |
5355

5456
## Variables

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [SearchUsage](./kibana-plugin-plugins-data-server.searchusage.md)
4+
5+
## SearchUsage interface
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export interface SearchUsage
11+
```
12+
13+
## Methods
14+
15+
| Method | Description |
16+
| --- | --- |
17+
| [trackError()](./kibana-plugin-plugins-data-server.searchusage.trackerror.md) | |
18+
| [trackSuccess(duration)](./kibana-plugin-plugins-data-server.searchusage.tracksuccess.md) | |
19+

0 commit comments

Comments
 (0)