Skip to content

Commit 85196ee

Browse files
committed
Merge remote-tracking branch 'upstream/master' into add-trap-to-sigint-on-precommit-hook-script
2 parents 4e4c1f3 + 3c57f71 commit 85196ee

File tree

1,352 files changed

+34222
-23516
lines changed

Some content is hidden

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

1,352 files changed

+34222
-23516
lines changed

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"kbn": "src/legacy/core_plugins/kibana",
1818
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
1919
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
20+
"management": "src/legacy/core_plugins/management",
2021
"kibana_react": "src/legacy/core_plugins/kibana_react",
2122
"kibana-react": "src/plugins/kibana_react",
2223
"kibana_utils": "src/plugins/kibana_utils",

NOTICE.txt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -186,32 +186,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
186186
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
187187
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
188188

189-
---
190-
This product includes code that is based on facebookincubator/idx, which was
191-
available under a "MIT" license.
192-
193-
MIT License
194-
195-
Copyright (c) 2013-present, Facebook, Inc.
196-
197-
Permission is hereby granted, free of charge, to any person obtaining a copy
198-
of this software and associated documentation files (the "Software"), to deal
199-
in the Software without restriction, including without limitation the rights
200-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
201-
copies of the Software, and to permit persons to whom the Software is
202-
furnished to do so, subject to the following conditions:
203-
204-
The above copyright notice and this permission notice shall be included in all
205-
copies or substantial portions of the Software.
206-
207-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
208-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
209-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
210-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
211-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
212-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
213-
SOFTWARE.
214-
215189
---
216190
This product includes code that was extracted from [email protected].
217191
Original license:

docs/developer/core/development-functional-tests.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ The `FunctionalTestRunner` comes with three built-in services:
282282
* Source: {blob}src/functional_test_runner/lib/lifecycle.ts[src/functional_test_runner/lib/lifecycle.ts]
283283
* Designed primary for use in services
284284
* Exposes lifecycle events for basic coordination. Handlers can return a promise and resolve/fail asynchronously
285-
* Phases include: `beforeLoadTests`, `beforeTests`, `beforeEachTest`, `cleanup`, `phaseStart`, `phaseEnd`
285+
* Phases include: `beforeLoadTests`, `beforeTests`, `beforeEachTest`, `cleanup`
286286

287287
[float]
288288
===== Kibana Services

docs/development/core/public/kibana-plugin-public.appmountcontext.core.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ core: {
1717
i18n: I18nStart;
1818
notifications: NotificationsStart;
1919
overlays: OverlayStart;
20+
savedObjects: SavedObjectsStart;
2021
uiSettings: IUiSettingsClient;
2122
injectedMetadata: {
2223
getInjectedVar: (name: string, defaultValue?: any) => unknown;

docs/development/core/public/kibana-plugin-public.appmountcontext.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ export interface AppMountContext
1616

1717
| Property | Type | Description |
1818
| --- | --- | --- |
19-
| [core](./kibana-plugin-public.appmountcontext.core.md) | <code>{</code><br/><code> application: Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp'&gt;;</code><br/><code> chrome: ChromeStart;</code><br/><code> docLinks: DocLinksStart;</code><br/><code> http: HttpStart;</code><br/><code> i18n: I18nStart;</code><br/><code> notifications: NotificationsStart;</code><br/><code> overlays: OverlayStart;</code><br/><code> uiSettings: IUiSettingsClient;</code><br/><code> injectedMetadata: {</code><br/><code> getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code> };</code><br/><code> }</code> | Core service APIs available to mounted applications. |
19+
| [core](./kibana-plugin-public.appmountcontext.core.md) | <code>{</code><br/><code> application: Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp'&gt;;</code><br/><code> chrome: ChromeStart;</code><br/><code> docLinks: DocLinksStart;</code><br/><code> http: HttpStart;</code><br/><code> i18n: I18nStart;</code><br/><code> notifications: NotificationsStart;</code><br/><code> overlays: OverlayStart;</code><br/><code> savedObjects: SavedObjectsStart;</code><br/><code> uiSettings: IUiSettingsClient;</code><br/><code> injectedMetadata: {</code><br/><code> getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code> };</code><br/><code> }</code> | Core service APIs available to mounted applications. |
2020

docs/management/field-formatters/url-formatter.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ The `Url` field formatter can take on the following types:
44
* The *Image* type can be used to specify an image directory where a specified image is located.
55
* The *Audio* type can be used to specify an audio directory where a specified audio file is located.
66
7+
For an *Image* type you can specify width and height attributes. These will be used to set the max width / max height of the image, while keeping the aspect ratio. Image will not be upscaled if it's smaller than the provided size parameters.
8+
79
You can customize either type of URL field formats with templates. A _URL template_ enables you to add specific values
810
to a partial URL. Use the string `{{value}}` to add the contents of the field to a fixed URL.
911

docs/maps/connect-to-ems.asciidoc

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,20 @@ EMS requests are made to the following domains:
1313
* vector.maps.elastic.co
1414

1515
**Elastic Maps** makes requests directly from the browser to EMS.
16-
To proxy EMS requests through the Kibana server, set `map.proxyElasticMapsServiceInMaps` to `true` in your <<settings, kibana.yml>> file.
16+
17+
[float]
18+
=== Connect to Elastic Maps Service from an internal network
19+
20+
To connect to EMS when your Kibana server and browser are in an internal network:
21+
22+
. Set `map.proxyElasticMapsServiceInMaps` to `true` in your <<settings, kibana.yml>> file to proxy EMS requests through the Kibana server.
23+
. Update your firewall rules to whitelist connections from your Kibana server to the EMS domains listed above.
24+
25+
NOTE: Coordinate map and region map visualizations do not support `map.proxyElasticMapsServiceInMaps` and will not proxy EMS requests through the Kibana server.
1726

1827

1928
[float]
20-
=== Disabling Elastic Maps Service
29+
=== Disable Elastic Maps Service
2130

2231
You might experience EMS connection issues if your Kibana server or browser are on a private network or
2332
behind a firewall. If this happens, you can disable the EMS connection to avoid unnecessary EMS requests.

docs/setup/settings.asciidoc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,36 @@ will default to `true`.
147147
`logging.quiet:`:: *Default: false* Set the value of this setting to `true` to
148148
suppress all logging output other than error messages.
149149

150+
`logging.rotate:`:: [experimental] Specifies the options for the logging rotate feature.
151+
When not defined, all the sub options defaults would be applied.
152+
The following example shows a valid logging rotate configuration:
153+
+
154+
--
155+
logging.rotate:
156+
enabled: true
157+
everyBytes: 10485760
158+
keepFiles: 10
159+
--
160+
161+
`logging.rotate.enabled:`:: [experimental] *Default: false* Set the value of this setting to `true` to
162+
enable log rotation. If you do not have a `logging.dest` set that is different from `stdout`
163+
that feature would not take any effect.
164+
165+
`logging.rotate.everyBytes:`:: [experimental] *Default: 10485760* The maximum size of a log file (that is `not an exact` limit). After the
166+
limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB) and
167+
this option should be at least greater than 1024.
168+
169+
`logging.rotate.keepFiles:`:: [experimental] *Default: 7* The number of most recent rotated log files to keep
170+
on disk. Older files are deleted during log rotation. The default value is 7. The `logging.rotate.keepFiles`
171+
option has to be in the range of 2 to 1024 files.
172+
173+
`logging.rotate.pollingInterval:`:: [experimental] *Default: 10000* The number of milliseconds for the polling strategy in case
174+
the `logging.rotate.usePolling` is enabled. That option has to be in the range of 5000 to 3600000 milliseconds.
175+
176+
`logging.rotate.usePolling:`:: [experimental] *Default: false* By default we try to understand the best way to monitoring
177+
the log file. However, there is some systems where it could not be always accurate. In those cases, if needed,
178+
the `polling` method could be used enabling that option.
179+
150180
`logging.silent:`:: *Default: false* Set the value of this setting to `true` to
151181
suppress all logging output.
152182

docs/visualize/most-frequent.asciidoc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ levels of {es} {ref}/search-aggregations-bucket.html[bucket] aggregations.
77

88
The most frequently used visualizations include:
99

10-
* Line, Area and Bar charts
10+
* Line, area, and bar charts
1111
* Pie charts
12-
* Data table
13-
* Metric visualization
14-
* Goal and Gauge visualization
12+
* Data tables
13+
* Metric, goals, and gauges
1514
* Heat maps
16-
* Tag cloud
15+
* Tag clouds
1716

1817
[float]
1918
=== Configure your visualization
2019

21-
You configure visualizations using the default editor, which is broken into *Metrics* and *Buckets*, and includes a default count
20+
You configure visualizations using the default editor, which is broken into metrics and buckets, and includes a default count
2221
metric. Each visualization supports different configurations for what the metrics and buckets
23-
represent. For example, a Bar chart allows you to add an X-axis:
22+
represent. For example, a bar chart allows you to add an X-axis:
2423

2524
[role="screenshot"]
2625
image::images/add-bucket.png["",height=478]

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
"**/image-diff/gm/debug": "^2.6.9",
8989
"**/react-dom": "^16.12.0",
9090
"**/react-test-renderer": "^16.12.0",
91-
"**/deepmerge": "^4.2.2"
91+
"**/deepmerge": "^4.2.2",
92+
"**/serialize-javascript": "^2.1.1"
9293
},
9394
"workspaces": {
9495
"packages": [
@@ -112,7 +113,7 @@
112113
"@elastic/charts": "^14.0.0",
113114
"@elastic/datemath": "5.0.2",
114115
"@elastic/ems-client": "1.0.5",
115-
"@elastic/eui": "16.1.0",
116+
"@elastic/eui": "17.0.0",
116117
"@elastic/filesaver": "1.1.2",
117118
"@elastic/good": "8.1.1-kibana2",
118119
"@elastic/numeral": "2.3.3",
@@ -149,6 +150,7 @@
149150
"cache-loader": "^4.1.0",
150151
"chalk": "^2.4.2",
151152
"check-disk-space": "^2.1.0",
153+
"chokidar": "3.2.1",
152154
"color": "1.0.3",
153155
"commander": "3.0.0",
154156
"compare-versions": "3.5.1",
@@ -165,6 +167,7 @@
165167
"encode-uri-query": "1.0.1",
166168
"execa": "^3.2.0",
167169
"expiry-js": "0.1.7",
170+
"fast-deep-equal": "^3.1.1",
168171
"file-loader": "4.2.0",
169172
"font-awesome": "4.7.0",
170173
"getos": "^3.1.0",
@@ -228,6 +231,7 @@
228231
"react-resize-detector": "^4.2.0",
229232
"react-router-dom": "^4.3.1",
230233
"react-sizeme": "^2.3.6",
234+
"react-use": "^13.10.2",
231235
"reactcss": "1.2.3",
232236
"redux": "4.0.0",
233237
"redux-actions": "2.2.1",
@@ -357,8 +361,8 @@
357361
"@types/uuid": "^3.4.4",
358362
"@types/vinyl-fs": "^2.4.11",
359363
"@types/zen-observable": "^0.8.0",
360-
"@typescript-eslint/eslint-plugin": "^2.9.0",
361-
"@typescript-eslint/parser": "^2.9.0",
364+
"@typescript-eslint/eslint-plugin": "^2.10.0",
365+
"@typescript-eslint/parser": "^2.10.0",
362366
"angular-mocks": "^1.7.8",
363367
"archiver": "^3.1.1",
364368
"axe-core": "^3.3.2",
@@ -370,7 +374,6 @@
370374
"chai": "3.5.0",
371375
"chance": "1.0.18",
372376
"cheerio": "0.22.0",
373-
"chokidar": "3.2.1",
374377
"chromedriver": "78.0.1",
375378
"classnames": "2.2.6",
376379
"dedent": "^0.7.0",

0 commit comments

Comments
 (0)