Skip to content

Commit 70de633

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into Fixed_Grok_Debugger_Flaky_Test
2 parents 0df1535 + c7e23bf commit 70de633

399 files changed

Lines changed: 8900 additions & 3591 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.

‎.bazelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import %workspace%/.bazelrc.common
1111

1212
# BuildBuddy
1313
## Metadata settings
14-
build --workspace_status_command=$(pwd)/src/dev/bazel_workspace_status.sh
14+
build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
1515
# Enable this in case you want to share your build info
1616
# build --build_metadata=VISIBILITY=PUBLIC
1717
build --build_metadata=TEST_GROUPS=//packages

‎.ci/end2end.groovy‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,15 @@ pipeline {
121121
}
122122

123123
def notifyStatus(String description, String status) {
124-
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
124+
notify(context: 'end2end-for-apm-ui', description: description, status: status, targetUrl: getBlueoceanTabURL('pipeline'))
125125
}
126126

127127
def notifyTestStatus(String description, String status) {
128-
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
128+
notify(context: 'end2end-for-apm-ui', description: description, status: status, targetUrl: getBlueoceanTabURL('tests'))
129+
}
130+
131+
def notify(Map args = [:]) {
132+
retryWithSleep(retries: 2, seconds: 5, backoff: true) {
133+
githubNotify(context: args.context, description: args.description, status: args.status, targetUrl: args.targetUrl)
134+
}
129135
}

‎.ci/packer_cache_for_branch.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ source src/dev/ci_setup/setup.sh;
2626

2727
# download es snapshots
2828
node scripts/es snapshot --download-only;
29-
node scripts/es snapshot --license=oss --download-only;
3029

3130
# download reporting browsers
3231
(cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);

‎.github/CODEOWNERS‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
/src/plugins/dashboard/ @elastic/kibana-presentation
9292
/src/plugins/input_control_vis/ @elastic/kibana-presentation
9393
/src/plugins/vis_type_markdown/ @elastic/kibana-presentation
94+
/test/functional/apps/dashboard/ @elastic/kibana-presentation
9495
/x-pack/plugins/canvas/ @elastic/kibana-presentation
9596
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
9697
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
@@ -149,7 +150,14 @@
149150
/src/cli/keystore/ @elastic/kibana-operations
150151
/src/legacy/server/warnings/ @elastic/kibana-operations
151152
/.ci/es-snapshots/ @elastic/kibana-operations
153+
/.github/workflows/ @elastic/kibana-operations
152154
/vars/ @elastic/kibana-operations
155+
/.bazelignore @elastic/kibana-operations
156+
/.bazeliskversion @elastic/kibana-operations
157+
/.bazelrc @elastic/kibana-operations
158+
/.bazelrc.common @elastic/kibana-operations
159+
/.bazelversion @elastic/kibana-operations
160+
/WORKSPACE.bazel @elastic/kibana-operations
153161
#CC# /packages/kbn-expect/ @elastic/kibana-operations
154162

155163
# Quality Assurance
@@ -238,7 +246,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
238246
/x-pack/test/security_api_integration/ @elastic/kibana-security
239247
/x-pack/test/security_functional/ @elastic/kibana-security
240248
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
241-
#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
242249
#CC# /x-pack/plugins/security/ @elastic/kibana-security
243250

244251
# Kibana Alerting Services
@@ -306,25 +313,22 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
306313
#CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
307314
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
308315

309-
# Endpoint
310-
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
311-
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
312-
/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
313-
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
314-
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
315-
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
316-
#CC# /x-pack/legacy/plugins/siem/ @elastic/siem
317-
#CC# /x-pack/plugins/siem/ @elastic/siem
318-
#CC# /x-pack/plugins/security_solution/ @elastic/siem
319-
320316
# Security Solution
321-
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
322-
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
323-
/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
324-
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
325-
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
326-
/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
327-
#CC# /x-pack/plugins/security_solution/ @elastic/siem
317+
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
318+
/x-pack/test/security_solution_endpoint/ @elastic/security-solution
319+
/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
320+
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/security-solution
321+
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
322+
/x-pack/plugins/security_solution/ @elastic/security-solution
323+
/x-pack/test/detection_engine_api_integration @elastic/security-solution
324+
/x-pack/test/lists_api_integration @elastic/security-solution
325+
/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
326+
#CC# /x-pack/plugins/security_solution/ @elastic/security-solution
327+
328+
# Security Solution sub teams
329+
/x-pack/plugins/case @elastic/security-threat-hunting
330+
/x-pack/test/case_api_integration @elastic/security-threat-hunting
331+
/x-pack/plugins/lists @elastic/security-detections-response
328332

329333
# Security Intelligence And Analytics
330334
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
@@ -356,3 +360,4 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
356360
# Reporting
357361
#CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services
358362

363+

‎.github/workflows/backport.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
on:
2+
pull_request_target:
3+
branches:
4+
- master
5+
types:
6+
- labeled
7+
- closed
8+
9+
jobs:
10+
backport:
11+
name: Backport PR
12+
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'auto-backport')
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: 'Get backport config'
17+
run: |
18+
curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
19+
20+
- name: Use Node.js 14.x
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: 14.x
24+
25+
- name: Install backport CLI
26+
run: npm install -g backport@5.6.4
27+
28+
- name: Backport PR
29+
run: |
30+
git config --global user.name "kibanamachine"
31+
git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
32+
backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
33+
env:
34+
PR_NUMBER: ${{ github.event.pull_request.number }}
35+
PR_OWNER: ${{ github.event.pull_request.user.login }}
36+
37+
- name: Report backport status
38+
run: |
39+
COMMENT="Backport result
40+
\`\`\`
41+
$(cat output.log)
42+
\`\`\`"
43+
44+
GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
45+
env:
46+
PR_NUMBER: ${{ github.event.pull_request.number }}

‎docs/developer/contributing/development-ci-metrics.asciidoc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,9 @@ All metrics are collected from the `tar.gz` archive produced for the linux platf
4444
[[ci-metric-distributable-file-count]] `distributable file count` ::
4545
The number of files included in the default distributable.
4646

47-
[[ci-metric-oss-distributable-file-count]] `oss distributable file count` ::
48-
The number of files included in the OSS distributable.
49-
5047
[[ci-metric-distributable-size]] `distributable size` ::
5148
The size, in bytes, of the default distributable. _(not reported on PRs)_
5249

53-
[[ci-metric-oss-distributable-size]] `oss distributable size` ::
54-
The size, in bytes, of the OSS distributable. _(not reported on PRs)_
55-
5650

5751
[[ci-metric-types-saved-object-field-counts]]
5852
==== Saved Object field counts

‎docs/developer/getting-started/development-plugin-resources.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ You can use the <<automatic-plugin-generator>> to get a basic structure for a ne
1414
{kib} repo should be developed inside the `plugins` folder. If you are building a new plugin to check in to the {kib} repo,
1515
you will choose between a few locations:
1616

17-
- {kib-repo}tree/{branch}/x-pack/plugins[x-pack/plugins] for commercially licensed plugins
18-
- {kib-repo}tree/{branch}/src/plugins[src/plugins] for open source licensed plugins
17+
- {kib-repo}tree/{branch}/x-pack/plugins[x-pack/plugins] for plugins related to subscription features
18+
- {kib-repo}tree/{branch}/src/plugins[src/plugins] for plugins related to free features
1919
- {kib-repo}tree/{branch}/examples[examples] for developer example plugins (these will not be included in the distributables)
2020

2121
[discrete]

‎docs/developer/plugin/migrating-legacy-plugins-examples.asciidoc‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,20 @@ export function plugin(initializerContext: PluginInitializerContext) {
7171
*plugins/my_plugin/(public|server)/plugin.ts*
7272
[source,typescript]
7373
----
74-
import type { Observable } from 'rxjs';
75-
import { first } from 'rxjs/operators';
7674
import { CoreSetup, Logger, Plugin, PluginInitializerContext, PluginName } from 'kibana/server';
7775
import type { MyPluginConfig } from './config';
7876
7977
export class MyPlugin implements Plugin {
80-
private readonly config$: Observable<MyPluginConfig>;
78+
private readonly config: MyPluginConfig;
8179
private readonly log: Logger;
8280
8381
constructor(private readonly initializerContext: PluginInitializerContext) {
8482
this.log = initializerContext.logger.get();
85-
this.config$ = initializerContext.config.create();
83+
this.config = initializerContext.config.get<MyPluginConfig>();
8684
}
8785
88-
public async setup(core: CoreSetup, deps: Record<PluginName, unknown>) {
89-
const isEnabled = await this.config$.pipe(first()).toPromise();
86+
public setup(core: CoreSetup, deps: Record<PluginName, unknown>) {
87+
const { someConfigValue } = this.config;
9088
}
9189
}
9290
----
@@ -96,7 +94,7 @@ Additionally, some plugins need to access the runtime env configuration.
9694
[source,typescript]
9795
----
9896
export class MyPlugin implements Plugin {
99-
public async setup(core: CoreSetup, deps: Record<PluginName, unknown>) {
97+
public setup(core: CoreSetup, deps: Record<PluginName, unknown>) {
10098
const { mode: { dev }, packageInfo: { version } } = this.initializerContext.env
10199
}
102100
----

‎docs/development/core/public/kibana-plugin-core-public.asyncplugin.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [AsyncPlugin](./kibana-plugin-core-public.asyncplugin.md)
4+
5+
## AsyncPlugin interface
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
> Asynchronous lifecycles are deprecated, and should be migrated to sync [plugin](./kibana-plugin-core-public.plugin.md)
10+
>
11+
12+
A plugin with asynchronous lifecycle methods.
13+
14+
<b>Signature:</b>
15+
16+
```typescript
17+
export interface AsyncPlugin<TSetup = void, TStart = void, TPluginsSetup extends object = object, TPluginsStart extends object = object>
18+
```
19+
20+
## Methods
21+
22+
| Method | Description |
23+
| --- | --- |
24+
| [setup(core, plugins)](./kibana-plugin-core-public.asyncplugin.setup.md) | |
25+
| [start(core, plugins)](./kibana-plugin-core-public.asyncplugin.start.md) | |
26+
| [stop()](./kibana-plugin-core-public.asyncplugin.stop.md) | |
27+

‎docs/development/core/public/kibana-plugin-core-public.asyncplugin.setup.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [AsyncPlugin](./kibana-plugin-core-public.asyncplugin.md) &gt; [setup](./kibana-plugin-core-public.asyncplugin.setup.md)
4+
5+
## AsyncPlugin.setup() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
setup(core: CoreSetup<TPluginsStart, TStart>, plugins: TPluginsSetup): TSetup | Promise<TSetup>;
11+
```
12+
13+
## Parameters
14+
15+
| Parameter | Type | Description |
16+
| --- | --- | --- |
17+
| core | <code>CoreSetup&lt;TPluginsStart, TStart&gt;</code> | |
18+
| plugins | <code>TPluginsSetup</code> | |
19+
20+
<b>Returns:</b>
21+
22+
`TSetup | Promise<TSetup>`
23+

0 commit comments

Comments
 (0)