Skip to content

Commit 40ff9ee

Browse files
committed
Merge branch 'master' into dependabot/npm_and_yarn/highlight.js-10.1.2
2 parents 1e7c7d1 + d19b558 commit 40ff9ee

File tree

2,959 files changed

+523920
-36356
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,959 files changed

+523920
-36356
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=12.19.1
4+
ARG NODE_VERSION=14.15.1
55

66
FROM node:${NODE_VERSION} AS base
77

.github/CODEOWNERS

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@
187187
/x-pack/test/saved_object_tagging/ @elastic/kibana-core
188188
/packages/kbn-config-schema/ @elastic/kibana-core
189189
/packages/kbn-std/ @elastic/kibana-core
190+
/packages/kbn-config/ @elastic/kibana-core
191+
/packages/kbn-logging/ @elastic/kibana-core
192+
/packages/kbn-legacy-logging/ @elastic/kibana-core
190193
/src/legacy/server/config/ @elastic/kibana-core
191194
/src/legacy/server/http/ @elastic/kibana-core
192195
/src/legacy/server/logging/ @elastic/kibana-core
@@ -259,8 +262,31 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
259262

260263
# Enterprise Search
261264
# Shared
262-
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
265+
/x-pack/plugins/enterprise_search/* @elastic/enterprise-search-frontend
266+
/x-pack/plugins/enterprise_search/common/ @elastic/enterprise-search-frontend
267+
/x-pack/plugins/enterprise_search/public/* @elastic/enterprise-search-frontend
268+
/x-pack/plugins/enterprise_search/public/applications/* @elastic/enterprise-search-frontend
269+
/x-pack/plugins/enterprise_search/public/applications/enterprise_search/ @elastic/enterprise-search-frontend
270+
/x-pack/plugins/enterprise_search/public/applications/shared/ @elastic/enterprise-search-frontend
271+
/x-pack/plugins/enterprise_search/public/applications/__mocks__/ @elastic/enterprise-search-frontend
272+
/x-pack/plugins/enterprise_search/server/* @elastic/enterprise-search-frontend
273+
/x-pack/plugins/enterprise_search/server/lib/ @elastic/enterprise-search-frontend
274+
/x-pack/plugins/enterprise_search/server/__mocks__/ @elastic/enterprise-search-frontend
275+
/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/ @elastic/enterprise-search-frontend
276+
/x-pack/plugins/enterprise_search/server/collectors/lib/ @elastic/enterprise-search-frontend
277+
/x-pack/plugins/enterprise_search/server/routes/enterprise_search/ @elastic/enterprise-search-frontend
278+
/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/ @elastic/enterprise-search-frontend
263279
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
280+
# App Search
281+
/x-pack/plugins/enterprise_search/public/applications/app_search/ @elastic/app-search-frontend
282+
/x-pack/plugins/enterprise_search/server/routes/app_search/ @elastic/app-search-frontend
283+
/x-pack/plugins/enterprise_search/server/collectors/app_search/ @elastic/app-search-frontend
284+
/x-pack/plugins/enterprise_search/server/saved_objects/app_search/ @elastic/app-search-frontend
285+
# Workplace Search
286+
/x-pack/plugins/enterprise_search/public/applications/workplace_search/ @elastic/workplace-search-frontend
287+
/x-pack/plugins/enterprise_search/server/routes/workplace_search/ @elastic/workplace-search-frontend
288+
/x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
289+
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
264290

265291
# Elasticsearch UI
266292
/src/plugins/dev_tools/ @elastic/es-ui

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"src/plugins/management"
2828
],
2929
"maps_legacy": "src/plugins/maps_legacy",
30+
"monaco": "packages/kbn-monaco/src",
3031
"indexPatternManagement": "src/plugins/index_pattern_management",
3132
"advancedSettings": "src/plugins/advanced_settings",
3233
"kibana_legacy": "src/plugins/kibana_legacy",

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.1
1+
14.15.1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.1
1+
14.15.1

STYLEGUIDE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,24 @@ Do not use setters, they cause more problems than they can solve.
589589
590590
[sideeffect]: http://en.wikipedia.org/wiki/Side_effect_(computer_science)
591591
592+
### Avoid circular dependencies
593+
594+
As part of a future effort to use correct and idempotent build tools we need our code to be
595+
able to be represented as a directed acyclic graph. We must avoid having circular dependencies
596+
both on code and type imports to achieve that. One of the most critical parts is the plugins
597+
code. We've developed a tool to identify plugins with circular dependencies which
598+
has allowed us to build a list of plugins who have circular dependencies
599+
between each other.
600+
601+
When building plugins we should avoid importing from plugins
602+
who are known to have circular dependencies at the moment as well as introducing
603+
new circular dependencies. You can run the same tool we use on our CI locally by
604+
typing `node scripts/find_plugins_with_circular_deps --debug`. It will error out in
605+
case new circular dependencies has been added with your changes
606+
(which will also happen in the CI) as well as print out the current list of
607+
the known circular dependencies which, as mentioned before, should not be imported
608+
by your code until the circular dependencies on these have been solved.
609+
592610
## SASS files
593611
594612
When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).

docs/api/logstash-configuration-management/create-logstash.asciidoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
2020
[[logstash-configuration-management-api-create-request-body]]
2121
==== Request body
2222

23-
`id`::
24-
(Required, string) The pipeline ID.
25-
2623
`description`::
2724
(Optional, string) The pipeline description.
2825

docs/api/saved-objects/create.asciidoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ experimental[] Create {kib} saved objects.
99
[[saved-objects-api-create-request]]
1010
==== Request
1111

12-
`POST <kibana host>:<port>/api/saved_objects/<type>` +
12+
`POST <kibana host>:<port>/api/saved_objects/<type>`
1313

1414
`POST <kibana host>:<port>/api/saved_objects/<type>/<id>`
1515

16-
`POST <kibana host>:<port>/s/<space_id>/saved_objects/<type>`
16+
`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>`
17+
18+
`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
1719

1820
[[saved-objects-api-create-path-params]]
1921
==== Path parameters

docs/api/spaces-management/copy_saved_objects.asciidoc

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@ You can request to overwrite any objects that already exist in the target space
5151
(Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target
5252
spaces. The default value is `false`.
5353

54+
`createNewCopies`::
55+
(Optional, boolean) Creates new copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
56+
errors are avoided. The default value is `true`.
57+
+
58+
NOTE: This cannot be used with the `overwrite` option.
59+
5460
`overwrite`::
5561
(Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id`
5662
exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
63+
+
64+
NOTE: This cannot be used with the `createNewCopies` option.
5765

5866
[role="child_attributes"]
5967
[[spaces-api-copy-saved-objects-response-body]]
@@ -128,8 +136,7 @@ $ curl -X POST api/spaces/_copy_saved_objects
128136
"id": "my-dashboard"
129137
}],
130138
"spaces": ["marketing"],
131-
"includeReferences": true,
132-
"createNewcopies": true
139+
"includeReferences": true
133140
}
134141
----
135142
// KIBANA
@@ -193,7 +200,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
193200
"id": "my-dashboard"
194201
}],
195202
"spaces": ["marketing"],
196-
"includeReferences": true
203+
"includeReferences": true,
204+
"createNewCopies": false
197205
}
198206
----
199207
// KIBANA
@@ -254,7 +262,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
254262
"id": "my-dashboard"
255263
}],
256264
"spaces": ["marketing", "sales"],
257-
"includeReferences": true
265+
"includeReferences": true,
266+
"createNewCopies": false
258267
}
259268
----
260269
// KIBANA
@@ -405,7 +414,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
405414
"id": "my-dashboard"
406415
}],
407416
"spaces": ["marketing"],
408-
"includeReferences": true
417+
"includeReferences": true,
418+
"createNewCopies": false
409419
}
410420
----
411421
// KIBANA

docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
4545
`includeReferences`::
4646
(Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
4747

48+
`createNewCopies`::
49+
(Optional, boolean) Creates new copies of the saved objects, regenerates each object ID, and resets the origin. When enabled during the
50+
initial copy, also enable when resolving copy errors. The default value is `true`.
51+
4852
`retries`::
4953
(Required, object) The retry operations to attempt, which can specify how to resolve different types of errors. Object keys represent the
5054
target space IDs.
@@ -148,6 +152,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
148152
"id": "my-dashboard"
149153
}],
150154
"includeReferences": true,
155+
"createNewCopies": false,
151156
"retries": {
152157
"sales": [
153158
{
@@ -246,6 +251,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
246251
"id": "my-dashboard"
247252
}],
248253
"includeReferences": true,
254+
"createNewCopies": false,
249255
"retries": {
250256
"marketing": [
251257
{

0 commit comments

Comments
 (0)