From 0babbf150d8e013bcb94022511035b5a80ec06eb Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 22 May 2019 09:57:41 +0100
Subject: [PATCH] [ML] Changes interval to fixed_interval in aggregations in
 created jobs (#36759)

* [ML] Changes interval to fixed_interval in aggregations in created jobs

* updates following review
---
 .../simple/single_metric/create_job/create_job_service.js   | 6 +++---
 .../apache_ecs/ml/datafeed_low_request_rate_ecs.json        | 2 +-
 .../modules/apache_ecs/ml/datafeed_visitor_rate_ecs.json    | 2 +-
 .../modules/nginx_ecs/ml/datafeed_low_request_rate_ecs.json | 2 +-
 .../modules/nginx_ecs/ml/datafeed_visitor_rate_ecs.json     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_service.js b/x-pack/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_service.js
index 0dd5fa567c8b..457fad65e2a3 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_service.js
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_service.js
@@ -214,7 +214,7 @@ export function SingleMetricJobServiceProvider() {
             buckets: {
               date_histogram: {
                 field: formConfig.timeField,
-                interval: interval
+                fixed_interval: `${interval}ms`
               },
               aggregations: {
                 [formConfig.timeField]: {
@@ -237,7 +237,7 @@ export function SingleMetricJobServiceProvider() {
             buckets: {
               date_histogram: {
                 field: formConfig.timeField,
-                interval: ((interval / 100) * 10) // use 10% of bucketSpan to allow for better sampling
+                fixed_interval: `${((interval / 100) * 10)}ms` // use 10% of bucketSpan to allow for better sampling
               },
               aggregations: {
                 [dtr.field_name]: {
@@ -261,7 +261,7 @@ export function SingleMetricJobServiceProvider() {
             buckets: {
               date_histogram: {
                 field: formConfig.timeField,
-                interval: interval
+                fixed_interval: `${interval}ms`
               },
               aggregations: {
                 [formConfig.timeField]: {
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_low_request_rate_ecs.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_low_request_rate_ecs.json
index b08a8526b17e..f91e102a3f1c 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_low_request_rate_ecs.json
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_low_request_rate_ecs.json
@@ -14,7 +14,7 @@
       "buckets": {
         "date_histogram": {
           "field": "@timestamp",
-          "interval": 900000,
+          "fixed_interval": "15m",
           "offset": 0,
           "order": {
             "_key": "asc"
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_visitor_rate_ecs.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_visitor_rate_ecs.json
index b88b66f15b32..0a98563f9881 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_visitor_rate_ecs.json
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apache_ecs/ml/datafeed_visitor_rate_ecs.json
@@ -14,7 +14,7 @@
       "buckets": {
         "date_histogram": {
           "field": "@timestamp",
-          "interval": 900000,
+          "fixed_interval": "15m",
           "offset": 0,
           "order": {
             "_key": "asc"
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_low_request_rate_ecs.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_low_request_rate_ecs.json
index cf143071aa51..d3333928299e 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_low_request_rate_ecs.json
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_low_request_rate_ecs.json
@@ -14,7 +14,7 @@
       "buckets": {
         "date_histogram": {
           "field": "@timestamp",
-          "interval": 900000,
+          "fixed_interval": "15m",
           "offset": 0,
           "order": {
             "_key": "asc"
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_visitor_rate_ecs.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_visitor_rate_ecs.json
index 297bd16db4ed..e3faf8546193 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_visitor_rate_ecs.json
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/nginx_ecs/ml/datafeed_visitor_rate_ecs.json
@@ -14,7 +14,7 @@
       "buckets": {
         "date_histogram": {
           "field": "@timestamp",
-          "interval": 900000,
+          "fixed_interval": "15m",
           "offset": 0,
           "order": {
             "_key": "asc"