Skip to content

Commit 1c4aa86

Browse files
Merge branch 'master' into canvas/copy-updates
2 parents 5dff258 + ab8bf78 commit 1c4aa86

File tree

2,046 files changed

+70600
-57305
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,046 files changed

+70600
-57305
lines changed

.eslintignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,14 @@ target
1919
# plugin overrides
2020
/src/core/lib/kbn_internal_native_observable
2121
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
22-
/src/legacy/ui/public/flot-charts
2322
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2423
/src/plugins/vis_type_timelion/public/_generated_/**
25-
/src/plugins/vis_type_timelion/public/flot/jquery.flot.*
26-
/src/plugins/timelion/public/flot/jquery.flot.*
2724
/x-pack/legacy/plugins/**/__tests__/fixtures/**
2825
/x-pack/plugins/apm/e2e/**/snapshots.js
2926
/x-pack/plugins/apm/e2e/tmp/*
3027
/x-pack/plugins/canvas/canvas_plugin
31-
/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
3228
/x-pack/plugins/canvas/shareable_runtime/build
3329
/x-pack/plugins/canvas/storybook/build
34-
/x-pack/plugins/monitoring/public/lib/jquery_flot
3530
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
3631
/x-pack/legacy/plugins/infra/common/graphql/types.ts
3732
/x-pack/legacy/plugins/infra/public/graphql/types.ts
@@ -48,4 +43,4 @@ target
4843
/packages/kbn-ui-framework/dist
4944
/packages/kbn-ui-framework/doc_site/build
5045
/packages/kbn-ui-framework/generator-kui/*/templates/
51-
46+
/packages/kbn-ui-shared-deps/flot_charts

.eslintrc.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,13 +1178,7 @@ module.exports = {
11781178
},
11791179
},
11801180
{
1181-
files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'],
1182-
env: {
1183-
jquery: true,
1184-
},
1185-
},
1186-
{
1187-
files: ['x-pack/plugins/monitoring/public/lib/jquery_flot/**/*.js'],
1181+
files: ['packages/kbn-ui-shared-deps/flot_charts/**/*.js'],
11881182
env: {
11891183
jquery: true,
11901184
},

.github/CODEOWNERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@
66
# used for the 'team' designator within Kibana Stats
77

88
# App
9-
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
109
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
1110
/x-pack/plugins/lens/ @elastic/kibana-app
1211
/x-pack/plugins/graph/ @elastic/kibana-app
1312
/src/plugins/advanced_settings/ @elastic/kibana-app
1413
/src/plugins/charts/ @elastic/kibana-app
15-
/src/plugins/dashboard/ @elastic/kibana-app
1614
/src/plugins/discover/ @elastic/kibana-app
17-
/src/plugins/input_control_vis/ @elastic/kibana-app
1815
/src/plugins/management/ @elastic/kibana-app
1916
/src/plugins/kibana_legacy/ @elastic/kibana-app
2017
/src/plugins/timelion/ @elastic/kibana-app
2118
/src/plugins/vis_default_editor/ @elastic/kibana-app
22-
/src/plugins/vis_type_markdown/ @elastic/kibana-app
2319
/src/plugins/vis_type_metric/ @elastic/kibana-app
2420
/src/plugins/vis_type_table/ @elastic/kibana-app
2521
/src/plugins/vis_type_tagcloud/ @elastic/kibana-app
@@ -35,19 +31,15 @@
3531
#CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
3632
#CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
3733
#CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
38-
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
3934
#CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
4035
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
41-
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
4236
#CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
4337
#CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
4438
#CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
4539
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
4640
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
4741
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
4842
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
49-
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
50-
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
5143

5244
# App Architecture
5345
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -127,10 +119,18 @@
127119
#CC# /x-pack/plugins/beats_management/ @elastic/beats
128120

129121
# Canvas
122+
/src/plugins/dashboard/ @elastic/kibana-canvas
123+
/src/plugins/input_control_vis/ @elastic/kibana-canvas
124+
/src/plugins/vis_type_markdown/ @elastic/kibana-canvas
130125
/x-pack/plugins/canvas/ @elastic/kibana-canvas
126+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-canvas
131127
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
128+
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-canvas
129+
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-canvas
132130
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
133131
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
132+
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-canvas
133+
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-canvas
134134

135135
# Core UI
136136
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report for Security Solution
3+
about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
4+
title: '[Security Solution]'
5+
labels: 'Team: SecuritySolution'
6+
---
7+
8+
**Describe the bug:**
9+
10+
**Kibana/Elasticsearch Stack version:**
11+
12+
**Server OS version:**
13+
14+
**Browser and Browser OS versions:**
15+
16+
**Elastic Endpoint version:**
17+
18+
**Original install method (e.g. download page, yum, from source, etc.):**
19+
20+
**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**
21+
22+
**Steps to reproduce:**
23+
24+
1.
25+
2.
26+
3.
27+
28+
**Current behavior:**
29+
30+
**Expected behavior:**
31+
32+
**Screenshots (if relevant):**
33+
34+
**Errors in browser console (if relevant):**
35+
36+
**Provide logs and/or server output (if relevant):**
37+
38+
**Any additional context (logs, chat logs, magical formulas, etc.):**

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"uiActionsExamples": "examples/ui_action_examples",
1212
"share": "src/plugins/share",
1313
"home": "src/plugins/home",
14+
"flot": "packages/kbn-ui-shared-deps/flot_charts",
1415
"charts": "src/plugins/charts",
1516
"esUi": "src/plugins/es_ui_shared",
1617
"devTools": "src/plugins/dev_tools",

NOTICE.txt

Lines changed: 0 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -118,212 +118,6 @@ 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-
327121
---
328122
Based on the scroll-into-view-if-necessary module from npm
329123
https://github.com/stipsan/compute-scroll-into-view/blob/master/src/index.ts#L269-L340

docs/api/dashboard/export-dashboard.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ experimental[] Export dashboards and corresponding saved objects.
1111

1212
`GET <kibana host>:<port>/api/kibana/dashboards/export`
1313

14+
`GET <kibana host>:<port>/s/<space-id>/api/kibana/dashboards/export`
15+
1416
[[dashboard-api-export-params]]
1517
==== Query parameters
1618

docs/api/dashboard/import-dashboard.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ experimental[] Import dashboards and corresponding saved objects.
1111

1212
`POST <kibana host>:<port>/api/kibana/dashboards/import`
1313

14+
`POST <kibana host>:<port>/s/<space-id>/api/kibana/dashboards/import`
15+
1416
[[dashboard-api-import-params]]
1517
==== Query parameters
1618

0 commit comments

Comments
 (0)