[ML] Sample data modules - use event.dataset instead of index name (#…

…68538) This PR adds event.dataset to the Kibana ecommerce sample data and makes the ML modules for ecommerce and weblog sample data use event.dataset to recognize the modules and also as the corresponding datafeed query instead of looking for the index name.
elastic · Jun 9, 2020 · 004df98 · 004df98
1 parent 0b3391a
commit 004df98
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/ecommerce.json.gz b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/ecommerce.json.gz
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/field_mappings.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/field_mappings.ts
@@ -173,4 +173,11 @@ export const fieldMappings = {
       city_name: { type: 'keyword' },
     },
   },
+  event: {
+    properties: {
+      dataset: {
+        type: 'keyword',
+      },
+    },
+  },
 };
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/sample_data_ecommerce/manifest.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/sample_data_ecommerce/manifest.json
@@ -7,7 +7,7 @@
   "defaultIndexPattern": "kibana_sample_data_ecommerce",
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_ecommerce" } }]
+      "filter": [{ "term": { "event.dataset": "sample_ecommerce" } }]
     }
   },
   "jobs": [

diff --git a/...odels/data_recognizer/modules/sample_data_ecommerce/ml/datafeed_high_sum_total_sales.json b/...odels/data_recognizer/modules/sample_data_ecommerce/ml/datafeed_high_sum_total_sales.json
@@ -3,7 +3,7 @@
   "indices": ["INDEX_PATTERN_NAME"],
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_ecommerce" } }]
+      "filter": [{ "term": { "event.dataset": "sample_ecommerce" } }]
     }
   }
 }
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/sample_data_weblogs/manifest.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/sample_data_weblogs/manifest.json
@@ -7,7 +7,7 @@
   "defaultIndexPattern": "kibana_sample_data_logs",
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_logs" } }]
+      "filter": [{ "term": { "event.dataset": "sample_web_logs" } }]
     }
   },
   "jobs": [

diff --git a/...rver/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_low_request_rate.json b/...rver/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_low_request_rate.json
@@ -3,7 +3,7 @@
   "indices": ["INDEX_PATTERN_NAME"],
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_logs" } }]
+      "filter": [{ "term": { "event.dataset": "sample_web_logs" } }]
     }
   },
   "aggregations": {

diff --git a/...r/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_response_code_rates.json b/...r/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_response_code_rates.json
@@ -3,7 +3,7 @@
   "indices": ["INDEX_PATTERN_NAME"],
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_logs" } }]
+      "filter": [{ "term": { "event.dataset": "sample_web_logs" } }]
     }
   }
 }
diff --git a/...l/server/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_url_scanning.json b/...l/server/models/data_recognizer/modules/sample_data_weblogs/ml/datafeed_url_scanning.json
@@ -3,7 +3,7 @@
   "indices": ["INDEX_PATTERN_NAME"],
   "query": {
     "bool": {
-      "filter": [{ "term": { "_index": "kibana_sample_data_logs" } }]
+      "filter": [{ "term": { "event.dataset": "sample_web_logs" } }]
     }
   }
 }