Skip to content

Commit 366cf05

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into chore/reporting-np-move
2 parents 4fe3ee1 + f190fd2 commit 366cf05

362 files changed

Lines changed: 3605 additions & 3371 deletions

File tree

Some content is hidden

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

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"@elastic/eui": "23.3.1",
131131
"@elastic/filesaver": "1.1.2",
132132
"@elastic/good": "8.1.1-kibana2",
133-
"@elastic/numeral": "2.4.0",
133+
"@elastic/numeral": "^2.5.0",
134134
"@elastic/request-crypto": "1.1.4",
135135
"@elastic/ui-ace": "0.2.3",
136136
"@hapi/good-squeeze": "5.2.1",
@@ -365,7 +365,6 @@
365365
"@types/node": ">=10.17.17 <10.20.0",
366366
"@types/node-forge": "^0.9.0",
367367
"@types/normalize-path": "^3.0.0",
368-
"@types/numeral": "^0.0.26",
369368
"@types/opn": "^5.1.0",
370369
"@types/pegjs": "^0.10.1",
371370
"@types/pngjs": "^3.3.2",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ module.exports = {
3939
to: false,
4040
disallowedMessage: `Don't use 'mkdirp', use the new { recursive: true } option of Fs.mkdir instead`
4141
},
42+
{
43+
from: 'numeral',
44+
to: '@elastic/numeral',
45+
},
4246
{
4347
from: '@kbn/elastic-idx',
4448
to: false,

‎packages/kbn-ui-shared-deps/entry.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Moment.tz.load(require('moment-timezone/data/packed/latest.json'));
4444
// big deps which are locked to a single version
4545
export const Rxjs = require('rxjs');
4646
export const RxjsOperators = require('rxjs/operators');
47+
export const ElasticNumeral = require('@elastic/numeral');
4748
export const ElasticCharts = require('@elastic/charts');
4849
export const ElasticEui = require('@elastic/eui');
4950
export const ElasticEuiLibServices = require('@elastic/eui/lib/services');

‎packages/kbn-ui-shared-deps/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ exports.externals = {
5151
*/
5252
rxjs: '__kbnSharedDeps__.Rxjs',
5353
'rxjs/operators': '__kbnSharedDeps__.RxjsOperators',
54+
numeral: '__kbnSharedDeps__.ElasticNumeral',
55+
'@elastic/numeral': '__kbnSharedDeps__.ElasticNumeral',
5456
'@elastic/charts': '__kbnSharedDeps__.ElasticCharts',
5557
'@elastic/eui': '__kbnSharedDeps__.ElasticEui',
5658
'@elastic/eui/lib/services': '__kbnSharedDeps__.ElasticEuiLibServices',

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@elastic/charts": "19.2.0",
1313
"@elastic/eui": "23.3.1",
14+
"@elastic/numeral": "^2.5.0",
1415
"@kbn/i18n": "1.0.0",
1516
"abortcontroller-polyfill": "^1.4.0",
1617
"angular": "^1.7.9",

‎renovate.json5‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,14 +715,6 @@
715715
'@types/normalize-path',
716716
],
717717
},
718-
{
719-
groupSlug: 'numeral',
720-
groupName: 'numeral related packages',
721-
packageNames: [
722-
'numeral',
723-
'@types/numeral',
724-
],
725-
},
726718
{
727719
groupSlug: 'object-hash',
728720
groupName: 'object-hash related packages',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const uiSettingsType: SavedObjectsType = {
3838
importableAndExportable: true,
3939
getInAppUrl() {
4040
return {
41-
path: `/app/kibana#/management/kibana/settings`,
41+
path: `/app/management/kibana/settings`,
4242
uiCapabilitiesPath: 'advancedSettings.show',
4343
};
4444
},

‎src/legacy/core_plugins/kibana/index.js‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import { exportApi } from './server/routes/api/export';
2626
import { getUiSettingDefaults } from './server/ui_setting_defaults';
2727
import { registerCspCollector } from './server/lib/csp_usage_collector';
2828
import { injectVars } from './inject_vars';
29-
import { i18n } from '@kbn/i18n';
30-
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
29+
3130
import { kbnBaseUrl } from '../../../plugins/kibana_legacy/server';
3231

3332
const mkdirAsync = promisify(Fs.mkdir);
@@ -53,19 +52,7 @@ export default function (kibana) {
5352
main: 'plugins/kibana/kibana',
5453
},
5554
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
56-
links: [
57-
{
58-
id: 'kibana:stack_management',
59-
title: i18n.translate('kbn.managementTitle', {
60-
defaultMessage: 'Stack Management',
61-
}),
62-
order: 9003,
63-
url: `${kbnBaseUrl}#/management`,
64-
euiIconType: 'managementApp',
65-
linkToLastSubUrl: false,
66-
category: DEFAULT_APP_CATEGORIES.management,
67-
},
68-
],
55+
links: [],
6956

7057
injectDefaultVars(server, options) {
7158
const mapConfig = server.config().get('map');

‎src/legacy/core_plugins/kibana/public/.eslintrc.js‎

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

‎src/legacy/core_plugins/kibana/public/_hacks.scss‎

Whitespace-only changes.

0 commit comments

Comments
 (0)