Skip to content

Commit a0d487e

Browse files
committed
Verify that create_time and version fields appear on GET
1 parent 49afd63 commit a0d487e

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java

+2
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ public Builder(DataFrameAnalyticsConfig config, ByteSizeValue maxModelMemoryLimi
304304
if (config.analyzedFields != null) {
305305
this.analyzedFields = new FetchSourceContext(true, config.analyzedFields.includes(), config.analyzedFields.excludes());
306306
}
307+
this.createTime = config.createTime;
308+
this.version = config.version;
307309
}
308310

309311
public String getId() {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappings.java

+8
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ public static void addDatafeedConfigFields(XContentBuilder builder) throws IOExc
391391
.endObject();
392392
}
393393

394+
/**
395+
* {@link DataFrameAnalyticsConfig} mapping.
396+
* Does not include mapping for CREATE_TIME as this mapping is added by {@link #addJobConfigFields} method.
397+
*/
394398
public static void addDataFrameAnalyticsFields(XContentBuilder builder) throws IOException {
395399
builder.startObject(DataFrameAnalyticsConfig.ID.getPreferredName())
396400
.field(TYPE, KEYWORD)
@@ -434,6 +438,10 @@ public static void addDataFrameAnalyticsFields(XContentBuilder builder) throws I
434438
.endObject()
435439
.endObject()
436440
.endObject()
441+
.endObject()
442+
// re-used: CREATE_TIME
443+
.startObject(DataFrameAnalyticsConfig.VERSION.getPreferredName())
444+
.field(TYPE, KEYWORD)
437445
.endObject();
438446
}
439447

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/ReservedFieldNames.java

+2
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ public final class ReservedFieldNames {
277277
DataFrameAnalyticsConfig.DEST.getPreferredName(),
278278
DataFrameAnalyticsConfig.ANALYSIS.getPreferredName(),
279279
DataFrameAnalyticsConfig.ANALYZED_FIELDS.getPreferredName(),
280+
DataFrameAnalyticsConfig.CREATE_TIME.getPreferredName(),
281+
DataFrameAnalyticsConfig.VERSION.getPreferredName(),
280282
DataFrameAnalyticsDest.INDEX.getPreferredName(),
281283
DataFrameAnalyticsDest.RESULTS_FIELD.getPreferredName(),
282284
DataFrameAnalyticsSource.INDEX.getPreferredName(),

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/data_frame_analytics_crud.yml

+13
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,19 @@ setup:
5858
- is_true: create_time
5959
- is_true: version
6060

61+
- do:
62+
ml.get_data_frame_analytics:
63+
id: "simple-outlier-detection-with-query"
64+
- match: { count: 1 }
65+
- match: { data_frame_analytics.0.id: "simple-outlier-detection-with-query" }
66+
- match: { data_frame_analytics.0.source.index: "index-source" }
67+
- match: { data_frame_analytics.0.source.query: {"term" : { "user" : "Kimchy"} } }
68+
- match: { data_frame_analytics.0.dest.index: "index-dest" }
69+
- match: { data_frame_analytics.0.analysis: {"outlier_detection":{}} }
70+
- match: { data_frame_analytics.0.analyzed_fields: {"includes" : ["obj1.*", "obj2.*" ], "excludes": [] } }
71+
- is_true: data_frame_analytics.0.create_time
72+
- is_true: data_frame_analytics.0.version
73+
6174
---
6275
"Test put config with security headers in the body":
6376
- do:

0 commit comments

Comments
 (0)