maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add title to kibana.index and telemetry deprecations (#113259)

Browse source 
* add title to kibana.index deprecation

* add title to telemetry deprecation

* use i18n for kibana.index deprecation

* fix bundle key
This commit is contained in:
Pierre Gayvallet 2021-09-29 14:10:59 +02:00 committed by GitHub
parent 36e7b5f622
commit 9217be3287
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/server/kibana_config.ts
View file

@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
import { i18n } from '@kbn/i18n';
import { schema, TypeOf } from '@kbn/config-schema';
import { ConfigDeprecationProvider } from '@kbn/config';
@ -16,12 +17,21 @@ const deprecations: ConfigDeprecationProvider = () => [
const kibana = settings[fromPath];
if (kibana?.index) {
addDeprecation({
message: `"kibana.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
title: i18n.translate('core.kibana.index.deprecationTitle', {
defaultMessage: `Setting "kibana.index" is deprecated`,
}),
message: i18n.translate('core.kibana.index.deprecationMessage', {
defaultMessage: `"kibana.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
}),
documentationUrl: 'https://ela.st/kbn-remove-legacy-multitenancy',
correctiveActions: {
manualSteps: [
`If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
`To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
i18n.translate('core.kibana.index.deprecationManualStep1', {
defaultMessage: `If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
}),
i18n.translate('core.kibana.index.deprecationManualStep2', {
defaultMessage: `To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
}),
],
},
});

2
src/plugins/telemetry/server/config/deprecations.test.ts
View file

@ -136,6 +136,7 @@ describe('deprecateEndpointConfigs', () => {
],
},
"message": "\\"telemetry.url\\" has been deprecated. Set \\"telemetry.sendUsageTo: staging\\" to the Kibana configurations to send usage to the staging endpoint.",
"title": "Setting \\"telemetry.url\\" is deprecated",
},
]
`);
@ -157,6 +158,7 @@ describe('deprecateEndpointConfigs', () => {
],
},
"message": "\\"telemetry.optInStatusUrl\\" has been deprecated. Set \\"telemetry.sendUsageTo: staging\\" to the Kibana configurations to send usage to the staging endpoint.",
"title": "Setting \\"telemetry.optInStatusUrl\\" is deprecated",
},
]
`);

4
src/plugins/telemetry/server/config/deprecations.ts
View file

@ -35,6 +35,10 @@ export const deprecateEndpointConfigs: ConfigDeprecation = (
}
addDeprecation({
title: i18n.translate('telemetry.endpointConfigs.deprecationTitle', {
defaultMessage: 'Setting "{configPath}" is deprecated',
values: { configPath: fullConfigPath },
}),
message: i18n.translate('telemetry.endpointConfigs.deprecationMessage', {
defaultMessage:
'"{configPath}" has been deprecated. Set "telemetry.sendUsageTo: staging" to the Kibana configurations to send usage to the staging endpoint.',