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

TSVB validation: Allow numeric values for axes (#63553)

Browse source
This commit is contained in:
Joe Reuter 2020-04-27 17:57:58 +02:00 committed by GitHub
parent d79e631d47
commit 45aa090e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
View file

@ -36,6 +36,7 @@ const queryObject = Joi.object({
language: Joi.string().allow(''), language: Joi.string().allow(''),
query: Joi.string().allow(''), query: Joi.string().allow(''),
}); });
const stringOrNumberOptionalNullable = Joi.alternatives([stringOptionalNullable, numberOptional]);
const numberOptionalOrEmptyString = Joi.alternatives(numberOptional, Joi.string().valid('')); const numberOptionalOrEmptyString = Joi.alternatives(numberOptional, Joi.string().valid(''));
const annotationsItems = Joi.object({ const annotationsItems = Joi.object({
@ -78,7 +79,7 @@ const metricsItems = Joi.object({
unit: stringOptionalNullable, unit: stringOptionalNullable,
model_type: stringOptionalNullable, model_type: stringOptionalNullable,
mode: stringOptionalNullable, mode: stringOptionalNullable,
lag: numberOptional, lag: numberOptionalOrEmptyString,
alpha: numberOptional, alpha: numberOptional,
beta: numberOptional, beta: numberOptional,
gamma: numberOptional, gamma: numberOptional,
@ -130,8 +131,8 @@ const seriesItems = Joi.object({
aggregate_by: stringOptionalNullable, aggregate_by: stringOptionalNullable,
aggregate_function: stringOptionalNullable, aggregate_function: stringOptionalNullable,
axis_position: stringRequired, axis_position: stringRequired,
axis_max: stringOptionalNullable, axis_max: stringOrNumberOptionalNullable,
axis_min: stringOptionalNullable, axis_min: stringOrNumberOptionalNullable,
chart_type: stringRequired, chart_type: stringRequired,
color: stringRequired, color: stringRequired,
color_rules: Joi.array() color_rules: Joi.array()
@ -198,8 +199,8 @@ export const visPayloadSchema = Joi.object({
axis_formatter: stringRequired, axis_formatter: stringRequired,
axis_position: stringRequired, axis_position: stringRequired,
axis_scale: stringRequired, axis_scale: stringRequired,
axis_min: stringOptionalNullable, axis_min: stringOrNumberOptionalNullable,
axis_max: stringOptionalNullable, axis_max: stringOrNumberOptionalNullable,
bar_color_rules: arrayNullable.optional(), bar_color_rules: arrayNullable.optional(),
background_color: stringOptionalNullable, background_color: stringOptionalNullable,
background_color_rules: Joi.array() background_color_rules: Joi.array()
@ -221,9 +222,9 @@ export const visPayloadSchema = Joi.object({
.optional(), .optional(),
gauge_width: [stringOptionalNullable, numberOptional], gauge_width: [stringOptionalNullable, numberOptional],
gauge_inner_color: stringOptionalNullable, gauge_inner_color: stringOptionalNullable,
gauge_inner_width: Joi.alternatives(stringOptionalNullable, numberIntegerOptional), gauge_inner_width: stringOrNumberOptionalNullable,
gauge_style: stringOptionalNullable, gauge_style: stringOptionalNullable,
gauge_max: stringOptionalNullable, gauge_max: stringOrNumberOptionalNullable,
id: stringRequired, id: stringRequired,
ignore_global_filters: numberOptional, ignore_global_filters: numberOptional,
ignore_global_filter: numberOptional, ignore_global_filter: numberOptional,

1
src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts
View file

@ -41,5 +41,6 @@ export const tsvbTelemetrySavedObjectType: SavedObjectsType = {
}, },
migrations: { migrations: {
'7.7.0': flow<SavedObjectMigrationFn>(resetCount), '7.7.0': flow<SavedObjectMigrationFn>(resetCount),
'7.8.0': flow<SavedObjectMigrationFn>(resetCount),
}, },
}; };