Skip to content

Commit a968ec9

Browse files
Merge branch 'master' into ui-utils/51854
2 parents 4d02949 + 23edb41 commit a968ec9

File tree

419 files changed

+6539
-5064
lines changed

Some content is hidden

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

419 files changed

+6539
-5064
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 angular@1.3.
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/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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"@elastic/charts": "^14.0.0",
114114
"@elastic/datemath": "5.0.2",
115115
"@elastic/ems-client": "1.0.5",
116-
"@elastic/eui": "16.1.0",
116+
"@elastic/eui": "17.0.0",
117117
"@elastic/filesaver": "1.1.2",
118118
"@elastic/good": "8.1.1-kibana2",
119119
"@elastic/numeral": "2.3.3",
@@ -150,6 +150,7 @@
150150
"cache-loader": "^4.1.0",
151151
"chalk": "^2.4.2",
152152
"check-disk-space": "^2.1.0",
153+
"chokidar": "3.2.1",
153154
"color": "1.0.3",
154155
"commander": "3.0.0",
155156
"compare-versions": "3.5.1",
@@ -360,8 +361,8 @@
360361
"@types/uuid": "^3.4.4",
361362
"@types/vinyl-fs": "^2.4.11",
362363
"@types/zen-observable": "^0.8.0",
363-
"@typescript-eslint/eslint-plugin": "^2.9.0",
364-
"@typescript-eslint/parser": "^2.9.0",
364+
"@typescript-eslint/eslint-plugin": "^2.10.0",
365+
"@typescript-eslint/parser": "^2.10.0",
365366
"angular-mocks": "^1.7.8",
366367
"archiver": "^3.1.1",
367368
"axe-core": "^3.3.2",
@@ -373,7 +374,6 @@
373374
"chai": "3.5.0",
374375
"chance": "1.0.18",
375376
"cheerio": "0.22.0",
376-
"chokidar": "3.2.1",
377377
"chromedriver": "78.0.1",
378378
"classnames": "2.2.6",
379379
"dedent": "^0.7.0",

packages/eslint-config-kibana/.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ module.exports = {
2828
to: false,
2929
disallowedMessage: `Don't use 'mkdirp', use the new { recursive: true } option of Fs.mkdir instead`
3030
},
31+
{
32+
from: '@kbn/elastic-idx',
33+
to: false,
34+
disallowedMessage: `Don't use idx(), use optional chaining syntax instead https://ela.st/optchain`
35+
},
3136
{
3237
from: 'x-pack',
3338
toRelative: 'x-pack',

packages/eslint-config-kibana/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"homepage": "https://github.com/elastic/eslint-config-kibana#readme",
1717
"peerDependencies": {
18-
"@typescript-eslint/eslint-plugin": "^2.9.0",
19-
"@typescript-eslint/parser": "^2.9.0",
18+
"@typescript-eslint/eslint-plugin": "^2.10.0",
19+
"@typescript-eslint/parser": "^2.10.0",
2020
"babel-eslint": "^10.0.3",
2121
"eslint": "^6.5.1",
2222
"eslint-plugin-babel": "^5.3.0",

packages/kbn-babel-preset/common_preset.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ const plugins = [
3535
// Need this since we are using TypeScript 3.7+
3636
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
3737
];
38-
const isTestEnv = process.env.BABEL_ENV === 'test' || process.env.NODE_ENV === 'test';
39-
40-
// Only load the idx plugin in non-test environments, since it conflicts with
41-
// Jest's coverage mapping.
42-
if (!isTestEnv) {
43-
plugins.push(require.resolve('@kbn/elastic-idx/babel'));
44-
}
4538

4639
module.exports = {
4740
presets: [require.resolve('@babel/preset-typescript'), require.resolve('@babel/preset-react')],

packages/kbn-babel-preset/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"@babel/preset-env": "^7.5.5",
1313
"@babel/preset-react": "^7.0.0",
1414
"@babel/preset-typescript": "^7.3.3",
15-
"@kbn/elastic-idx": "1.0.0",
1615
"babel-plugin-add-module-exports": "^1.0.2",
1716
"babel-plugin-filter-imports": "^3.0.0",
1817
"babel-plugin-transform-define": "^1.3.1",

packages/kbn-elastic-idx/.npmignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)