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

Reenable Rollup Jobs API test that was failing due to interval change in ES. (#36310) (#36387)

Browse source
This commit is contained in:
CJ Cenizal 2019-05-20 16:17:13 -04:00 • committed by GitHub
parent 3bb33c0cb0
commit 1bdb1b97c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
x-pack/plugins/rollup/public/crud_app/services/jobs.js
View file

@ -86,7 +86,9 @@ export function deserializeJob(job) {
metrics,
groups: {
date_histogram: {
interval: dateHistogramInterval,
interval,
fixed_interval: fixedInterval,
calendar_interval: calendarInterval,
delay: rollupDelay,
time_zone: dateHistogramTimeZone,
field: dateHistogramField,
@ -108,6 +110,10 @@ export function deserializeJob(job) {
const json = job;
// `interval` is deprecated but still supported. All three of the various interval types are
// mutually exclusive.
const dateHistogramInterval = interval || fixedInterval || calendarInterval;
const deserializedJob = {
id,
indexPattern,

6
x-pack/test/api_integration/apis/management/rollup/rollup.js
View file

@ -139,7 +139,11 @@ export default function ({ getService }) {
'testCreatedField': {
'agg': 'date_histogram',
'delay': '1d',
'interval': '24h',
// TODO: Note that we created the job with `interval`, but ES has coerced this to
// `fixed_interval` based on the value we provided. Once we update the UI and
// tests to no longer use the deprecated `interval` property, we can remove
// this comment.
'fixed_interval': '24h',
'time_zone': 'UTC'
}
},