Skip to content

Commit ea8cce6

Browse files
Merge branch 'master' into Use_test_user_in_rollups_tests
2 parents d2e5223 + 5161f10 commit ea8cce6

File tree

2,188 files changed

+82388
-31148
lines changed

Some content is hidden

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

2,188 files changed

+82388
-31148
lines changed

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.10",
67
"7.9",
78
"7.8",
89
"7.7",
@@ -27,7 +28,7 @@
2728
"targetPRLabels": ["backport"],
2829
"branchLabelMapping": {
2930
"^v8.0.0$": "master",
30-
"^v7.10.0$": "7.x",
31+
"^v7.11.0$": "7.x",
3132
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3233
}
3334
}

.eslintrc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,9 +1046,7 @@ module.exports = {
10461046
*/
10471047
{
10481048
// typescript only for front and back end
1049-
files: [
1050-
'x-pack/plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
1051-
],
1049+
files: ['x-pack/plugins/{alerts,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}'],
10521050
rules: {
10531051
'@typescript-eslint/no-explicit-any': 'error',
10541052
},

.github/CODEOWNERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
/src/plugins/home/public @elastic/kibana-core-ui
138138
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
139139
/src/plugins/home/server/services/ @elastic/kibana-core-ui
140+
/src/plugins/kibana_overview/ @elastic/kibana-core-ui
140141
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
141142
#CC# /src/legacy/core_plugins/newsfeed @elastic/kibana-core-ui
142143
#CC# /src/legacy/server/sample_data/ @elastic/kibana-core-ui
@@ -255,6 +256,8 @@
255256

256257
# Security
257258
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
259+
/src/plugins/security_oss/ @elastic/kibana-security
260+
/test/security_functional/ @elastic/kibana-security
258261
/x-pack/plugins/spaces/ @elastic/kibana-security
259262
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
260263
/x-pack/plugins/security/ @elastic/kibana-security
@@ -314,7 +317,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
314317
#CC# /x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
315318
#CC# /x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
316319
#CC# /x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
317-
#CC# /x-pack/plugins/alerting_builtins @elastic/kibana-alerting-services
320+
#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services
318321

319322
# Enterprise Search
320323
# Shared

.i18nrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"indexPatternManagement": "src/plugins/index_pattern_management",
3030
"advancedSettings": "src/plugins/advanced_settings",
3131
"kibana_legacy": "src/plugins/kibana_legacy",
32+
"kibanaOverview": "src/plugins/kibana_overview",
3233
"kibana_react": "src/legacy/core_plugins/kibana_react",
3334
"kibana-react": "src/plugins/kibana_react",
3435
"kibana_utils": "src/plugins/kibana_utils",
@@ -37,6 +38,7 @@
3738
"regionMap": "src/plugins/region_map",
3839
"savedObjects": "src/plugins/saved_objects",
3940
"savedObjectsManagement": "src/plugins/saved_objects_management",
41+
"security": "src/plugins/security_oss",
4042
"server": "src/legacy/server",
4143
"statusPage": "src/legacy/core_plugins/status_page",
4244
"telemetry": [

NOTICE.txt

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,212 @@ THE SOFTWARE.
118118
This product uses Noto fonts that are licensed under the SIL Open
119119
Font License, Version 1.1.
120120

121+
---
122+
We include the `firstValueFrom()` and `lastValueFrom()` helpers
123+
extracted from the v7-beta.7 version of the RxJS library.
124+
125+
Apache License
126+
Version 2.0, January 2004
127+
http://www.apache.org/licenses/
128+
129+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
130+
131+
1. Definitions.
132+
133+
"License" shall mean the terms and conditions for use, reproduction,
134+
and distribution as defined by Sections 1 through 9 of this document.
135+
136+
"Licensor" shall mean the copyright owner or entity authorized by
137+
the copyright owner that is granting the License.
138+
139+
"Legal Entity" shall mean the union of the acting entity and all
140+
other entities that control, are controlled by, or are under common
141+
control with that entity. For the purposes of this definition,
142+
"control" means (i) the power, direct or indirect, to cause the
143+
direction or management of such entity, whether by contract or
144+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
145+
outstanding shares, or (iii) beneficial ownership of such entity.
146+
147+
"You" (or "Your") shall mean an individual or Legal Entity
148+
exercising permissions granted by this License.
149+
150+
"Source" form shall mean the preferred form for making modifications,
151+
including but not limited to software source code, documentation
152+
source, and configuration files.
153+
154+
"Object" form shall mean any form resulting from mechanical
155+
transformation or translation of a Source form, including but
156+
not limited to compiled object code, generated documentation,
157+
and conversions to other media types.
158+
159+
"Work" shall mean the work of authorship, whether in Source or
160+
Object form, made available under the License, as indicated by a
161+
copyright notice that is included in or attached to the work
162+
(an example is provided in the Appendix below).
163+
164+
"Derivative Works" shall mean any work, whether in Source or Object
165+
form, that is based on (or derived from) the Work and for which the
166+
editorial revisions, annotations, elaborations, or other modifications
167+
represent, as a whole, an original work of authorship. For the purposes
168+
of this License, Derivative Works shall not include works that remain
169+
separable from, or merely link (or bind by name) to the interfaces of,
170+
the Work and Derivative Works thereof.
171+
172+
"Contribution" shall mean any work of authorship, including
173+
the original version of the Work and any modifications or additions
174+
to that Work or Derivative Works thereof, that is intentionally
175+
submitted to Licensor for inclusion in the Work by the copyright owner
176+
or by an individual or Legal Entity authorized to submit on behalf of
177+
the copyright owner. For the purposes of this definition, "submitted"
178+
means any form of electronic, verbal, or written communication sent
179+
to the Licensor or its representatives, including but not limited to
180+
communication on electronic mailing lists, source code control systems,
181+
and issue tracking systems that are managed by, or on behalf of, the
182+
Licensor for the purpose of discussing and improving the Work, but
183+
excluding communication that is conspicuously marked or otherwise
184+
designated in writing by the copyright owner as "Not a Contribution."
185+
186+
"Contributor" shall mean Licensor and any individual or Legal Entity
187+
on behalf of whom a Contribution has been received by Licensor and
188+
subsequently incorporated within the Work.
189+
190+
2. Grant of Copyright License. Subject to the terms and conditions of
191+
this License, each Contributor hereby grants to You a perpetual,
192+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
193+
copyright license to reproduce, prepare Derivative Works of,
194+
publicly display, publicly perform, sublicense, and distribute the
195+
Work and such Derivative Works in Source or Object form.
196+
197+
3. Grant of Patent License. Subject to the terms and conditions of
198+
this License, each Contributor hereby grants to You a perpetual,
199+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
200+
(except as stated in this section) patent license to make, have made,
201+
use, offer to sell, sell, import, and otherwise transfer the Work,
202+
where such license applies only to those patent claims licensable
203+
by such Contributor that are necessarily infringed by their
204+
Contribution(s) alone or by combination of their Contribution(s)
205+
with the Work to which such Contribution(s) was submitted. If You
206+
institute patent litigation against any entity (including a
207+
cross-claim or counterclaim in a lawsuit) alleging that the Work
208+
or a Contribution incorporated within the Work constitutes direct
209+
or contributory patent infringement, then any patent licenses
210+
granted to You under this License for that Work shall terminate
211+
as of the date such litigation is filed.
212+
213+
4. Redistribution. You may reproduce and distribute copies of the
214+
Work or Derivative Works thereof in any medium, with or without
215+
modifications, and in Source or Object form, provided that You
216+
meet the following conditions:
217+
218+
(a) You must give any other recipients of the Work or
219+
Derivative Works a copy of this License; and
220+
221+
(b) You must cause any modified files to carry prominent notices
222+
stating that You changed the files; and
223+
224+
(c) You must retain, in the Source form of any Derivative Works
225+
that You distribute, all copyright, patent, trademark, and
226+
attribution notices from the Source form of the Work,
227+
excluding those notices that do not pertain to any part of
228+
the Derivative Works; and
229+
230+
(d) If the Work includes a "NOTICE" text file as part of its
231+
distribution, then any Derivative Works that You distribute must
232+
include a readable copy of the attribution notices contained
233+
within such NOTICE file, excluding those notices that do not
234+
pertain to any part of the Derivative Works, in at least one
235+
of the following places: within a NOTICE text file distributed
236+
as part of the Derivative Works; within the Source form or
237+
documentation, if provided along with the Derivative Works; or,
238+
within a display generated by the Derivative Works, if and
239+
wherever such third-party notices normally appear. The contents
240+
of the NOTICE file are for informational purposes only and
241+
do not modify the License. You may add Your own attribution
242+
notices within Derivative Works that You distribute, alongside
243+
or as an addendum to the NOTICE text from the Work, provided
244+
that such additional attribution notices cannot be construed
245+
as modifying the License.
246+
247+
You may add Your own copyright statement to Your modifications and
248+
may provide additional or different license terms and conditions
249+
for use, reproduction, or distribution of Your modifications, or
250+
for any such Derivative Works as a whole, provided Your use,
251+
reproduction, and distribution of the Work otherwise complies with
252+
the conditions stated in this License.
253+
254+
5. Submission of Contributions. Unless You explicitly state otherwise,
255+
any Contribution intentionally submitted for inclusion in the Work
256+
by You to the Licensor shall be under the terms and conditions of
257+
this License, without any additional terms or conditions.
258+
Notwithstanding the above, nothing herein shall supersede or modify
259+
the terms of any separate license agreement you may have executed
260+
with Licensor regarding such Contributions.
261+
262+
6. Trademarks. This License does not grant permission to use the trade
263+
names, trademarks, service marks, or product names of the Licensor,
264+
except as required for reasonable and customary use in describing the
265+
origin of the Work and reproducing the content of the NOTICE file.
266+
267+
7. Disclaimer of Warranty. Unless required by applicable law or
268+
agreed to in writing, Licensor provides the Work (and each
269+
Contributor provides its Contributions) on an "AS IS" BASIS,
270+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
271+
implied, including, without limitation, any warranties or conditions
272+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
273+
PARTICULAR PURPOSE. You are solely responsible for determining the
274+
appropriateness of using or redistributing the Work and assume any
275+
risks associated with Your exercise of permissions under this License.
276+
277+
8. Limitation of Liability. In no event and under no legal theory,
278+
whether in tort (including negligence), contract, or otherwise,
279+
unless required by applicable law (such as deliberate and grossly
280+
negligent acts) or agreed to in writing, shall any Contributor be
281+
liable to You for damages, including any direct, indirect, special,
282+
incidental, or consequential damages of any character arising as a
283+
result of this License or out of the use or inability to use the
284+
Work (including but not limited to damages for loss of goodwill,
285+
work stoppage, computer failure or malfunction, or any and all
286+
other commercial damages or losses), even if such Contributor
287+
has been advised of the possibility of such damages.
288+
289+
9. Accepting Warranty or Additional Liability. While redistributing
290+
the Work or Derivative Works thereof, You may choose to offer,
291+
and charge a fee for, acceptance of support, warranty, indemnity,
292+
or other liability obligations and/or rights consistent with this
293+
License. However, in accepting such obligations, You may act only
294+
on Your own behalf and on Your sole responsibility, not on behalf
295+
of any other Contributor, and only if You agree to indemnify,
296+
defend, and hold each Contributor harmless for any liability
297+
incurred by, or claims asserted against, such Contributor by reason
298+
of your accepting any such warranty or additional liability.
299+
300+
END OF TERMS AND CONDITIONS
301+
302+
APPENDIX: How to apply the Apache License to your work.
303+
304+
To apply the Apache License to your work, attach the following
305+
boilerplate notice, with the fields enclosed by brackets "[]"
306+
replaced with your own identifying information. (Don't include
307+
the brackets!) The text should be enclosed in the appropriate
308+
comment syntax for the file format. We also recommend that a
309+
file or class name and description of purpose be included on the
310+
same "printed page" as the copyright notice for easier
311+
identification within third-party archives.
312+
313+
Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors
314+
315+
Licensed under the Apache License, Version 2.0 (the "License");
316+
you may not use this file except in compliance with the License.
317+
You may obtain a copy of the License at
318+
319+
http://www.apache.org/licenses/LICENSE-2.0
320+
321+
Unless required by applicable law or agreed to in writing, software
322+
distributed under the License is distributed on an "AS IS" BASIS,
323+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
324+
See the License for the specific language governing permissions and
325+
limitations under the License.
326+
121327
---
122328
Based on the scroll-into-view-if-necessary module from npm
123329
https://github.com/stipsan/compute-scroll-into-view/blob/master/src/index.ts#L269-L340

docs/api/saved-objects/bulk_create.asciidoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ experimental[] Create multiple {kib} saved objects.
4141
`references`::
4242
(Optional, array) Objects with `name`, `id`, and `type` properties that describe the other saved objects in the referenced object. To refer to the other saved object, use `name` in the attributes. Never use `id` to refer to the other saved object. `id` can be automatically updated during migrations, import, or export.
4343

44-
`namespaces`::
45-
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object should be created. If this is not provided, the
46-
object will be created in the current space.
44+
`initialNamespaces`::
45+
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object is created. If this is provided, the
46+
object is created only in the explicitly defined spaces. If this is not provided, the object is created in the current space
47+
(default behavior).
4748

4849
`version`::
4950
(Optional, number) Specifies the version.

docs/api/saved-objects/create.asciidoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ any data that you send to the API is properly formed.
4646
`references`::
4747
(Optional, array) Objects with `name`, `id`, and `type` properties that describe the other saved objects that this object references. Use `name` in attributes to refer to the other saved object, but never the `id`, which can update automatically during migrations or import/export.
4848

49-
`namespaces`::
50-
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object should be created. If this is not provided, the
51-
object will be created in the current space.
49+
`initialNamespaces`::
50+
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object is created. If this is provided, the
51+
object is created only in the explicitly defined spaces. If this is not provided, the object is created in the current space
52+
(default behavior).
5253

5354
[[saved-objects-api-create-request-codes]]
5455
==== Response code

docs/canvas/canvas-share-workpad.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ When you've finished your workpad, you can share it outside of {kib}.
1010

1111
Create a JSON file of your workpad that you can export outside of {kib}.
1212

13-
Click *Share > Download as JSON*.
13+
To begin, click *Share > Download as JSON*.
1414

1515
[role="screenshot"]
1616
image::images/canvas-export-workpad.png[Export single workpad through JSON, from Share dropdown]
@@ -23,7 +23,7 @@ Want to export multiple workpads? Go to the *Canvas* home page, select the workp
2323

2424
If you have a subscription that supports the {report-features}, you can create a PDF copy of your workpad that you can save and share outside {kib}.
2525

26-
Click *Share > PDF reports > Generate PDF*.
26+
To begin, click *Share > PDF reports > Generate PDF*.
2727

2828
[role="screenshot"]
2929
image::images/canvas-generate-pdf.gif[Image showing how to generate a PDF]
@@ -36,7 +36,7 @@ For more information, refer to <<reporting-getting-started, Reporting from Kiban
3636

3737
If you have a subscription that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using <<watcher-ui,Watcher>> or a script.
3838

39-
Click *Share > PDF reports > Copy POST URL*.
39+
To begin, click *Share > PDF reports > Copy POST URL*.
4040

4141
[role="screenshot"]
4242
image::images/canvas-create-URL.gif[Image showing how to create POST URL]

docs/canvas/canvas-tutorial.asciidoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[[canvas-tutorial]]
33
== Tutorial: Create a workpad for monitoring sales
44

5-
To get up and running with Canvas, use the following tutorial where you'll create a workpad for monitoring sales at an eCommerce store.
5+
To get up and running with Canvas, add the Sample eCommerce orders data, then use the data to create a workpad for monitoring sales at an eCommerce store.
66

77
[float]
88
=== Before you begin
@@ -114,18 +114,16 @@ image::images/canvas-timefilter-element.png[Image showing Canvas workpad with fi
114114

115115
To see how the data changes, set the time filter to *Last 7 days*. As you change the time filter options, the elements automatically update.
116116

117-
Your workpad is now complete!
117+
Your workpad is complete!
118118

119119
[float]
120-
=== Next steps
120+
=== What's next?
121121
Now that you know the Canvas basics, you're ready to explore on your own.
122122

123123
Here are some things to try:
124124

125125
* Play with the {kibana-ref}/add-sample-data.html[sample Canvas workpads].
126126

127-
* Build presentations of your own live data with <<create-workpads,workpads>>.
128-
129-
* Learn more about <<add-canvas-elements,elements>> &mdash; the building blocks of your workpad.
127+
* Build presentations of your own data with <<create-workpads,workpads>>.
130128

131129
* Deep dive into the {kibana-ref}/canvas-function-reference.html[expression language and functions] that drive Canvas.
-73.7 KB
Loading

0 commit comments

Comments
 (0)