github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Logs UI] [Metrics UI] Remove deprecated alias config entries (#115974)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Felix Stürmer 2021-10-27 15:20:19 +02:00 • committed by GitHub
parent c566e048e8
commit 34b22578d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/infra/common/source_configuration/source_configuration.ts
View file

@ -49,8 +49,6 @@ export const TimestampFromString = new rt.Type<number, string>(
export const sourceConfigurationConfigFilePropertiesRT = rt.type({
sources: rt.type({
default: rt.partial({
logAlias: rt.string, // Cannot be deprecated until 8.0.0. Will be converted to an indexName reference.
metricAlias: rt.string,
fields: rt.partial({
timestamp: rt.string,
message: rt.array(rt.string),

2
x-pack/plugins/infra/server/deprecations.ts
View file

@ -179,8 +179,6 @@ export const configDeprecations: ConfigDeprecationProvider = ({ deprecate }) =>
return completeConfig;
}
),
deprecate('sources.default.logAlias', '8.0.0'),
deprecate('sources.default.metricAlias', '8.0.0'),
];
export const getInfraDeprecationsFactory =

21
x-pack/plugins/infra/server/lib/sources/sources.ts
View file

@ -212,26 +212,7 @@ export class InfraSources {
fold(constant({}), identity)
);
// NOTE: Legacy logAlias needs converting to a logIndices reference until we can remove
// config file sources in 8.0.0.
if (staticSourceConfiguration && staticSourceConfiguration.logAlias) {
const convertedStaticSourceConfiguration: InfraStaticSourceConfiguration & {
logAlias?: string;
} = {
...staticSourceConfiguration,
logIndices: {
type: 'index_name',
indexName: staticSourceConfiguration.logAlias,
},
};
delete convertedStaticSourceConfiguration.logAlias;
return mergeSourceConfiguration(
defaultSourceConfiguration,
convertedStaticSourceConfiguration
);
} else {
return mergeSourceConfiguration(defaultSourceConfiguration, staticSourceConfiguration);
}
return mergeSourceConfiguration(defaultSourceConfiguration, staticSourceConfiguration);
}
private async getSavedSourceConfiguration(

2
x-pack/plugins/infra/server/plugin.ts
View file

@ -51,8 +51,6 @@ export const config: PluginConfigDescriptor = {
schema.object({
default: schema.maybe(
schema.object({
logAlias: schema.maybe(schema.string()), // NOTE / TODO: Should be deprecated in 8.0.0
metricAlias: schema.maybe(schema.string()),
fields: schema.maybe(
schema.object({
timestamp: schema.maybe(schema.string()),