Skip to content

Commit 9f91d27

Browse files
Merge branch 'master' into 93924
2 parents f6e60c6 + 532f38f commit 9f91d27

File tree

169 files changed

+5377
-1814
lines changed

Some content is hidden

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

169 files changed

+5377
-1814
lines changed

docs/migration/migrate_8_0.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ for example, `logstash-*`.
5252
==== Default logging timezone is now the system's timezone
5353
*Details:* In prior releases the timezone used in logs defaulted to UTC. We now use the host machine's timezone by default.
5454

55-
*Impact:* To restore the previous behavior, in kibana.yml use the pattern layout, with a date modifier:
55+
*Impact:* To restore the previous behavior, in kibana.yml use the pattern layout, with a {kibana-ref}/logging-service.html#date-format[date modifier]:
5656
[source,yaml]
5757
-------------------
5858
logging:
@@ -87,7 +87,7 @@ See https://github.com/elastic/kibana/pull/87939 for more details.
8787

8888
[float]
8989
==== Logging destination is specified by the appender
90-
*Details:* Previously log destination would be `stdout` and could be changed to `file` using `logging.dest`. With the new logging configuration, you can specify the destination using appenders.
90+
*Details:* Previously log destination would be `stdout` and could be changed to `file` using `logging.dest`. With the new logging configuration, you can specify the destination using {kibana-ref}/logging-service.html#logging-appenders[appenders].
9191

9292
*Impact:* To restore the previous behavior and log records to *stdout*, in `kibana.yml` use an appender with `type: console`.
9393
[source,yaml]
@@ -118,7 +118,7 @@ logging:
118118

119119
[float]
120120
==== Set log verbosity with root
121-
*Details:* Previously logging output would be specified by `logging.silent` (none), `logging.quiet` (error messages only) and `logging.verbose` (all). With the new logging configuration, set the minimum required log level.
121+
*Details:* Previously logging output would be specified by `logging.silent` (none), `logging.quiet` (error messages only) and `logging.verbose` (all). With the new logging configuration, set the minimum required {kibana-ref}/logging-service.html#log-level[log level].
122122

123123
*Impact:* To restore the previous behavior, in `kibana.yml` specify `logging.root.level`:
124124
[source,yaml]
@@ -175,7 +175,7 @@ logging:
175175
==== Configure log rotation with the rolling-file appender
176176
*Details:* Previously log rotation would be enabled when `logging.rotate.enabled` was true.
177177

178-
*Impact:* To restore the previous behavior, in `kibana.yml` use the `rolling-file` appender.
178+
*Impact:* To restore the previous behavior, in `kibana.yml` use the {kibana-ref}/logging-service.html#rolling-file-appender[`rolling-file`] appender.
179179

180180
[source,yaml]
181181
-------------------

docs/setup/settings.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}.
281281
|===
282282

283283
|[[logging-root]] `logging.root:`
284-
| The `root` logger has a dedicated configuration node since this context name is special and is pre-configured for logging by default.
284+
| The {kibana-ref}/logging-service.html#logging-service[`root` logger] has a dedicated configuration node since this context name is special and is pre-configured for logging by default.
285285
// TODO: add link to the advanced logging documentation.
286286

287287
|[[logging-root-appenders]] `logging.root.appenders:`
@@ -303,7 +303,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}.
303303
| Specific appender format to apply for a particular logger context.
304304

305305
| `logging.appenders:`
306-
| Define how and where log messages are displayed (eg. *stdout* or console) and stored (eg. file on the disk).
306+
| {kibana-ref}/logging-service.html#logging-appenders[Appenders] define how and where log messages are displayed (eg. *stdout* or console) and stored (eg. file on the disk).
307307
// TODO: add link to the advanced logging documentation.
308308

309309
| `logging.appenders.console:`

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"dependencies": {
9999
"@elastic/apm-rum": "^5.6.1",
100100
"@elastic/apm-rum-react": "^1.2.5",
101-
"@elastic/charts": "27.0.0",
101+
"@elastic/charts": "28.0.0",
102102
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
103103
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
104104
"@elastic/ems-client": "7.12.0",
@@ -444,7 +444,7 @@
444444
"@bazel/ibazel": "^0.14.0",
445445
"@bazel/typescript": "^3.2.3",
446446
"@cypress/snapshot": "^2.1.7",
447-
"@cypress/webpack-preprocessor": "^5.5.0",
447+
"@cypress/webpack-preprocessor": "^5.6.0",
448448
"@elastic/apm-rum": "^5.6.1",
449449
"@elastic/apm-rum-react": "^1.2.5",
450450
"@elastic/eslint-config-kibana": "link:packages/elastic-eslint-config-kibana",
@@ -682,7 +682,7 @@
682682
"copy-webpack-plugin": "^6.0.2",
683683
"cpy": "^8.1.1",
684684
"css-loader": "^3.4.2",
685-
"cypress": "^6.2.1",
685+
"cypress": "^6.8.0",
686686
"cypress-cucumber-preprocessor": "^2.5.2",
687687
"cypress-multi-reporters": "^1.4.0",
688688
"cypress-pipe": "^2.0.0",

packages/kbn-optimizer/limits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pageLoadAssetSize:
4646
lens: 96624
4747
licenseManagement: 41817
4848
licensing: 29004
49-
lists: 202261
49+
lists: 228500
5050
logstash: 53548
5151
management: 46112
5252
maps: 80000
@@ -68,7 +68,7 @@ pageLoadAssetSize:
6868
searchprofiler: 67080
6969
security: 189428
7070
securityOss: 30806
71-
securitySolution: 283440
71+
securitySolution: 235402
7272
share: 99061
7373
snapshotRestore: 79032
7474
spaces: 387915

src/core/server/bootstrap.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ export async function bootstrap({ configs, cliArgs, applyConfigOverrides }: Boot
8383
try {
8484
await root.setup();
8585
await root.start();
86+
87+
// notify parent process know when we are ready for dev mode.
88+
if (process.send) {
89+
process.send(['SERVER_LISTENING']);
90+
}
8691
} catch (err) {
8792
await shutdown(err);
8893
}

src/core/server/ui_settings/saved_objects/migrations.test.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,23 @@ describe('ui_settings 7.12.0 migrations', () => {
7676
const migrated = migration(doc);
7777
expect(JSON.parse(migrated.attributes['timepicker:quickRanges'])).toEqual([migratedQuickRange]);
7878
});
79+
80+
// https://github.com/elastic/kibana/issues/95616
81+
test('returns doc when "timepicker:quickRanges" is null', () => {
82+
const doc = {
83+
type: 'config',
84+
id: '8.0.0',
85+
attributes: {
86+
buildNum: 9007199254740991,
87+
'timepicker:quickRanges': null,
88+
},
89+
references: [],
90+
updated_at: '2020-06-09T20:18:20.349Z',
91+
migrationVersion: {},
92+
};
93+
const migrated = migration(doc);
94+
expect(migrated).toEqual(doc);
95+
});
7996
});
8097

8198
describe('ui_settings 7.13.0 migrations', () => {

src/core/server/ui_settings/saved_objects/migrations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const migrations = {
3232
...doc,
3333
...(doc.attributes && {
3434
attributes: Object.keys(doc.attributes).reduce((acc, key) => {
35-
if (key === 'timepicker:quickRanges' && doc.attributes[key].indexOf('section') > -1) {
35+
if (key === 'timepicker:quickRanges' && doc.attributes[key]?.indexOf('section') > -1) {
3636
const ranges = JSON.parse(doc.attributes[key]).map(
3737
({ from, to, display }: { from: string; to: string; display: string }) => {
3838
return {

src/dev/code_coverage/ingest_coverage/__tests__/enumerate_patterns.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ describe(`enumeratePatterns`, () => {
3535
'src/plugins/charts/public/static/color_maps/color_maps.ts kibana-app'
3636
);
3737
});
38-
it(`should resolve x-pack/plugins/security_solution/public/common/components/exceptions/builder/translations.ts to kibana-security`, () => {
38+
it(`should resolve x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/translations.ts to kibana-security`, () => {
3939
const short = 'x-pack/plugins/security_solution';
4040
const actual = enumeratePatterns(REPO_ROOT)(log)(new Map([[short, ['kibana-security']]]));
4141

4242
expect(
4343
actual[0].includes(
44-
`${short}/public/common/components/exceptions/builder/translations.ts kibana-security`
44+
`${short}/public/common/components/exceptions/edit_exception_modal/translations.ts kibana-security`
4545
)
4646
).toBe(true);
4747
});

src/plugins/charts/public/static/components/current_time.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import moment, { Moment } from 'moment';
1010
import React, { FC } from 'react';
1111

12-
import { LineAnnotation, AnnotationDomainTypes, LineAnnotationStyle } from '@elastic/charts';
12+
import { LineAnnotation, AnnotationDomainType, LineAnnotationStyle } from '@elastic/charts';
1313
import lightEuiTheme from '@elastic/eui/dist/eui_theme_light.json';
1414
import darkEuiTheme from '@elastic/eui/dist/eui_theme_dark.json';
1515

@@ -46,7 +46,7 @@ export const CurrentTime: FC<CurrentTimeProps> = ({ isDarkMode, domainEnd }) =>
4646
<LineAnnotation
4747
id="__current-time__"
4848
hideTooltips
49-
domainType={AnnotationDomainTypes.XDomain}
49+
domainType={AnnotationDomainType.XDomain}
5050
dataValues={lineAnnotationData}
5151
style={lineAnnotationStyle}
5252
/>

src/plugins/dashboard/public/application/actions/copy_to_dashboard_modal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
EuiOutsideClickDetector,
2424
} from '@elastic/eui';
2525
import { DashboardCopyToCapabilities } from './copy_to_dashboard_action';
26-
import { DashboardPicker } from '../../services/presentation_util';
26+
import { LazyDashboardPicker, withSuspense } from '../../services/presentation_util';
2727
import { dashboardCopyToDashboardAction } from '../../dashboard_strings';
2828
import { EmbeddableStateTransfer, IEmbeddable } from '../../services/embeddable';
2929
import { createDashboardEditUrl, DashboardConstants } from '../..';
@@ -37,6 +37,8 @@ interface CopyToDashboardModalProps {
3737
closeModal: () => void;
3838
}
3939

40+
const DashboardPicker = withSuspense(LazyDashboardPicker);
41+
4042
export function CopyToDashboardModal({
4143
PresentationUtilContext,
4244
stateTransfer,

0 commit comments

Comments
 (0)