honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make start and end optional params in results endpoints 

Original commit: elastic/x-pack-elasticsearch@0ab5da04f9
This commit is contained in:
Dimitrios Athanasiou 2016-11-25 10:57:08 +00:00 committed by Dimitris Athanasiou
parent 9d2ce12624
commit 2898e3c421
17 changed files with 183 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetBucketsAction.java
View File

@ -83,8 +83,8 @@ public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucket
PARSER.declareString(Request::setPartitionValue, PARTITION_VALUE); PARSER.declareString(Request::setPartitionValue, PARTITION_VALUE);
PARSER.declareBoolean(Request::setExpand, EXPAND); PARSER.declareBoolean(Request::setExpand, EXPAND);
PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM); PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM);
PARSER.declareString(Request::setStart, START); PARSER.declareStringOrNull(Request::setStart, START);
PARSER.declareString(Request::setEnd, END); PARSER.declareStringOrNull(Request::setEnd, END);
PARSER.declareBoolean(Request::setExpand, EXPAND); PARSER.declareBoolean(Request::setExpand, EXPAND);
PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM); PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM);
PARSER.declareObject(Request::setPageParams, PageParams.PARSER, PageParams.PAGE); PARSER.declareObject(Request::setPageParams, PageParams.PARSER, PageParams.PAGE);
@ -161,7 +161,7 @@ public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucket
} }
public void setStart(String start) { public void setStart(String start) {
this.start = ExceptionsHelper.requireNonNull(start, START.getPreferredName()); this.start = start;
} }
public String getEnd() { public String getEnd() {
@ -169,7 +169,7 @@ public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucket
} }
public void setEnd(String end) { public void setEnd(String end) {
this.end = ExceptionsHelper.requireNonNull(end, END.getPreferredName()); this.end = end;
} }
public PageParams getPageParams() { public PageParams getPageParams() {
@ -198,12 +198,7 @@ public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucket
@Override @Override
public ActionRequestValidationException validate() { public ActionRequestValidationException validate() {
ActionRequestValidationException validationException = null; return null;
if ((timestamp == null || timestamp.isEmpty())
&& (start == null || start.isEmpty() || end == null || end.isEmpty())) {
validationException = addValidationError("Either [timestamp] or [start, end] parameters must be set.", validationException);
}
return validationException;
} }
@Override @Override
@ -248,12 +243,8 @@ public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucket
if (partitionValue != null) { if (partitionValue != null) {
builder.field(PARTITION_VALUE.getPreferredName(), partitionValue); builder.field(PARTITION_VALUE.getPreferredName(), partitionValue);
} }
if (start != null) { builder.field(START.getPreferredName(), start);
builder.field(START.getPreferredName(), start); builder.field(END.getPreferredName(), end);
}
if (end != null) {
builder.field(END.getPreferredName(), end);
}
if (pageParams != null) { if (pageParams != null) {
builder.field(PageParams.PAGE.getPreferredName(), pageParams); builder.field(PageParams.PAGE.getPreferredName(), pageParams);
} }

33
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetInfluencersAction.java
View File

@ -36,6 +36,7 @@ import org.elasticsearch.xpack.prelert.job.persistence.QueryPage;
import org.elasticsearch.xpack.prelert.job.results.Influencer; import org.elasticsearch.xpack.prelert.job.results.Influencer;
import org.elasticsearch.xpack.prelert.job.results.PageParams; import org.elasticsearch.xpack.prelert.job.results.PageParams;
import org.elasticsearch.xpack.prelert.utils.ExceptionsHelper; import org.elasticsearch.xpack.prelert.utils.ExceptionsHelper;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
@ -72,8 +73,8 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
static { static {
PARSER.declareString((request, jobId) -> request.jobId = jobId, Job.ID); PARSER.declareString((request, jobId) -> request.jobId = jobId, Job.ID);
PARSER.declareString((request, start) -> request.start = start, START); PARSER.declareStringOrNull(Request::setStart, START);
PARSER.declareString((request, end) -> request.end = end, END); PARSER.declareStringOrNull(Request::setEnd, END);
PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM); PARSER.declareBoolean(Request::setIncludeInterim, INCLUDE_INTERIM);
PARSER.declareObject(Request::setPageParams, PageParams.PARSER, PageParams.PAGE); PARSER.declareObject(Request::setPageParams, PageParams.PARSER, PageParams.PAGE);
PARSER.declareDouble(Request::setAnomalyScore, ANOMALY_SCORE); PARSER.declareDouble(Request::setAnomalyScore, ANOMALY_SCORE);
@ -81,18 +82,12 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
PARSER.declareBoolean(Request::setDecending, DESCENDING_SORT); PARSER.declareBoolean(Request::setDecending, DESCENDING_SORT);
} }
public static Request parseRequest(String jobId, String start, String end, XContentParser parser, public static Request parseRequest(String jobId, XContentParser parser,
ParseFieldMatcherSupplier parseFieldMatcherSupplier) { ParseFieldMatcherSupplier parseFieldMatcherSupplier) {
Request request = PARSER.apply(parser, parseFieldMatcherSupplier); Request request = PARSER.apply(parser, parseFieldMatcherSupplier);
if (jobId != null) { if (jobId != null) {
request.jobId = jobId; request.jobId = jobId;
} }
if (start != null) {
request.start = start;
}
if (end != null) {
request.end = end;
}
return request; return request;
} }
@ -108,10 +103,8 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
Request() { Request() {
} }
public Request(String jobId, String start, String end) { public Request(String jobId) {
this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName()); this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName());
this.start = ExceptionsHelper.requireNonNull(start, START.getPreferredName());
this.end = ExceptionsHelper.requireNonNull(end, END.getPreferredName());
} }
public String getJobId() { public String getJobId() {
@ -122,10 +115,18 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
return start; return start;
} }
public void setStart(String start) {
this.start = start;
}
public String getEnd() { public String getEnd() {
return end; return end;
} }
public void setEnd(String end) {
this.end = end;
}
public boolean isDecending() { public boolean isDecending() {
return decending; return decending;
} }
@ -177,8 +178,8 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
jobId = in.readString(); jobId = in.readString();
includeInterim = in.readBoolean(); includeInterim = in.readBoolean();
pageParams = new PageParams(in); pageParams = new PageParams(in);
start = in.readString(); start = in.readOptionalString();
end = in.readString(); end = in.readOptionalString();
sort = in.readOptionalString(); sort = in.readOptionalString();
decending = in.readBoolean(); decending = in.readBoolean();
anomalyScoreFilter = in.readDouble(); anomalyScoreFilter = in.readDouble();
@ -190,8 +191,8 @@ extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetI
out.writeString(jobId); out.writeString(jobId);
out.writeBoolean(includeInterim); out.writeBoolean(includeInterim);
pageParams.writeTo(out); pageParams.writeTo(out);
out.writeString(start); out.writeOptionalString(start);
out.writeString(end); out.writeOptionalString(end);
out.writeOptionalString(sort); out.writeOptionalString(sort);
out.writeBoolean(decending); out.writeBoolean(decending);
out.writeDouble(anomalyScoreFilter); out.writeDouble(anomalyScoreFilter);

32
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetRecordsAction.java
View File

@ -75,8 +75,8 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
static { static {
PARSER.declareString((request, jobId) -> request.jobId = jobId, Job.ID); PARSER.declareString((request, jobId) -> request.jobId = jobId, Job.ID);
PARSER.declareString((request, start) -> request.start = start, START); PARSER.declareStringOrNull(Request::setStart, START);
PARSER.declareString((request, end) -> request.end = end, END); PARSER.declareStringOrNull(Request::setEnd, END);
PARSER.declareString(Request::setPartitionValue, PARTITION_VALUE); PARSER.declareString(Request::setPartitionValue, PARTITION_VALUE);
PARSER.declareString(Request::setSort, SORT); PARSER.declareString(Request::setSort, SORT);
PARSER.declareBoolean(Request::setDecending, DESCENDING); PARSER.declareBoolean(Request::setDecending, DESCENDING);
@ -108,10 +108,8 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
Request() { Request() {
} }
public Request(String jobId, String start, String end) { public Request(String jobId) {
this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName()); this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName());
this.start = ExceptionsHelper.requireNonNull(start, START.getPreferredName());
this.end = ExceptionsHelper.requireNonNull(end, END.getPreferredName());
} }
public String getJobId() { public String getJobId() {
@ -122,10 +120,18 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
return start; return start;
} }
public void setStart(String start) {
this.start = start;
}
public String getEnd() { public String getEnd() {
return end; return end;
} }
public void setEnd(String end) {
this.end = end;
}
public boolean isDecending() { public boolean isDecending() {
return decending; return decending;
} }
@ -192,8 +198,8 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
jobId = in.readString(); jobId = in.readString();
includeInterim = in.readBoolean(); includeInterim = in.readBoolean();
pageParams = new PageParams(in); pageParams = new PageParams(in);
start = in.readString(); start = in.readOptionalString();
end = in.readString(); end = in.readOptionalString();
sort = in.readOptionalString(); sort = in.readOptionalString();
decending = in.readBoolean(); decending = in.readBoolean();
anomalyScoreFilter = in.readDouble(); anomalyScoreFilter = in.readDouble();
@ -207,8 +213,8 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
out.writeString(jobId); out.writeString(jobId);
out.writeBoolean(includeInterim); out.writeBoolean(includeInterim);
pageParams.writeTo(out); pageParams.writeTo(out);
out.writeString(start); out.writeOptionalString(start);
out.writeString(end); out.writeOptionalString(end);
out.writeOptionalString(sort); out.writeOptionalString(sort);
out.writeBoolean(decending); out.writeBoolean(decending);
out.writeDouble(anomalyScoreFilter); out.writeDouble(anomalyScoreFilter);
@ -220,12 +226,8 @@ public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecord
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(); builder.startObject();
builder.field(Job.ID.getPreferredName(), jobId); builder.field(Job.ID.getPreferredName(), jobId);
if (start != null) { builder.field(START.getPreferredName(), start);
builder.field(START.getPreferredName(), start); builder.field(END.getPreferredName(), end);
}
if (end != null) {
builder.field(END.getPreferredName(), end);
}
builder.field(SORT.getPreferredName(), sort); builder.field(SORT.getPreferredName(), sort);
builder.field(DESCENDING.getPreferredName(), decending); builder.field(DESCENDING.getPreferredName(), decending);
builder.field(ANOMALY_SCORE_FILTER.getPreferredName(), anomalyScoreFilter); builder.field(ANOMALY_SCORE_FILTER.getPreferredName(), anomalyScoreFilter);

2
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/persistence/BucketsQueryBuilder.java
View File

@ -198,7 +198,7 @@ public final class BucketsQueryBuilder {
Objects.equals(expand, other.expand) && Objects.equals(expand, other.expand) &&
Objects.equals(includeInterim, other.includeInterim) && Objects.equals(includeInterim, other.includeInterim) &&
Objects.equals(epochStart, other.epochStart) && Objects.equals(epochStart, other.epochStart) &&
Objects.equals(epochStart, other.epochStart) && Objects.equals(epochEnd, other.epochEnd) &&
Objects.equals(anomalyScoreFilter, other.anomalyScoreFilter) && Objects.equals(anomalyScoreFilter, other.anomalyScoreFilter) &&
Objects.equals(normalizedProbability, other.normalizedProbability) && Objects.equals(normalizedProbability, other.normalizedProbability) &&
Objects.equals(partitionValue, other.partitionValue) && Objects.equals(partitionValue, other.partitionValue) &&

23
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/persistence/ElasticsearchMappings.java
View File

@ -217,6 +217,7 @@ public class ElasticsearchMappings {
.endObject(); .endObject();
addAnomalyRecordFieldsToMapping(builder); addAnomalyRecordFieldsToMapping(builder);
addInfluencerFieldsToMapping(builder);
if (termFieldNames != null) { if (termFieldNames != null) {
ElasticsearchDotNotationReverser reverser = new ElasticsearchDotNotationReverser(); ElasticsearchDotNotationReverser reverser = new ElasticsearchDotNotationReverser();
@ -244,7 +245,7 @@ public class ElasticsearchMappings {
* @return builder * @return builder
* @throws IOException On write error * @throws IOException On write error
*/ */
private static XContentBuilder addAnomalyRecordFieldsToMapping(XContentBuilder builder) private static XContentBuilder addAnomalyRecordFieldsToMapping(XContentBuilder builder)
throws IOException { throws IOException {
builder.startObject(AnomalyRecord.DETECTOR_INDEX.getPreferredName()) builder.startObject(AnomalyRecord.DETECTOR_INDEX.getPreferredName())
.field(TYPE, INTEGER).field(INCLUDE_IN_ALL, false) .field(TYPE, INTEGER).field(INCLUDE_IN_ALL, false)
@ -351,6 +352,26 @@ public class ElasticsearchMappings {
return builder; return builder;
} }
private static XContentBuilder addInfluencerFieldsToMapping(XContentBuilder builder) throws IOException {
builder.startObject(Influencer.INFLUENCER_FIELD_NAME.getPreferredName())
.field(TYPE, KEYWORD).field(INCLUDE_IN_ALL, false)
.endObject()
.startObject(Influencer.INFLUENCER_FIELD_VALUE.getPreferredName())
.field(TYPE, KEYWORD).field(INCLUDE_IN_ALL, false)
.endObject()
.startObject(Influencer.ANOMALY_SCORE.getPreferredName())
.field(TYPE, DOUBLE).field(INCLUDE_IN_ALL, false)
.endObject()
.startObject(Influencer.INITIAL_ANOMALY_SCORE.getPreferredName())
.field(TYPE, DOUBLE).field(INCLUDE_IN_ALL, false)
.endObject()
.startObject(Influencer.PROBABILITY.getPreferredName())
.field(TYPE, DOUBLE).field(INCLUDE_IN_ALL, false)
.endObject();
return builder;
}
public static XContentBuilder dataCountsMapping() throws IOException { public static XContentBuilder dataCountsMapping() throws IOException {
return jsonBuilder() return jsonBuilder()
.startObject() .startObject()

2
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/persistence/InfluencersQueryBuilder.java
View File

@ -158,7 +158,7 @@ public final class InfluencersQueryBuilder {
Objects.equals(size, other.size) && Objects.equals(size, other.size) &&
Objects.equals(includeInterim, other.includeInterim) && Objects.equals(includeInterim, other.includeInterim) &&
Objects.equals(epochStart, other.epochStart) && Objects.equals(epochStart, other.epochStart) &&
Objects.equals(epochStart, other.epochStart) && Objects.equals(epochEnd, other.epochEnd) &&
Objects.equals(anomalyScoreFilter, other.anomalyScoreFilter) && Objects.equals(anomalyScoreFilter, other.anomalyScoreFilter) &&
Objects.equals(sortField, other.sortField) && Objects.equals(sortField, other.sortField) &&
this.sortDescending == other.sortDescending; this.sortDescending == other.sortDescending;

1
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/results/ReservedFieldNames.java
View File

@ -80,6 +80,7 @@ public final class ReservedFieldNames {
AnomalyRecord.BUCKET_SPAN.getPreferredName(), AnomalyRecord.BUCKET_SPAN.getPreferredName(),
Bucket.ANOMALY_SCORE.getPreferredName(), Bucket.ANOMALY_SCORE.getPreferredName(),
Bucket.BUCKET_INFLUENCERS.getPreferredName(),
Bucket.BUCKET_SPAN.getPreferredName(), Bucket.BUCKET_SPAN.getPreferredName(),
Bucket.MAX_NORMALIZED_PROBABILITY.getPreferredName(), Bucket.MAX_NORMALIZED_PROBABILITY.getPreferredName(),
Bucket.IS_INTERIM.getPreferredName(), Bucket.IS_INTERIM.getPreferredName(),

8
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/rest/influencers/RestGetInfluencersAction.java
View File

@ -47,9 +47,11 @@ public class RestGetInfluencersAction extends BaseRestHandler {
final GetInfluencersAction.Request request; final GetInfluencersAction.Request request;
if (bodyBytes != null && bodyBytes.length() > 0) { if (bodyBytes != null && bodyBytes.length() > 0) {
XContentParser parser = XContentFactory.xContent(bodyBytes).createParser(bodyBytes); XContentParser parser = XContentFactory.xContent(bodyBytes).createParser(bodyBytes);
request = GetInfluencersAction.Request.parseRequest(jobId, start, end, parser, () -> parseFieldMatcher); request = GetInfluencersAction.Request.parseRequest(jobId, parser, () -> parseFieldMatcher);
} else { } else {
request = new GetInfluencersAction.Request(jobId, start, end); request = new GetInfluencersAction.Request(jobId);
request.setStart(start);
request.setEnd(end);
request.setIncludeInterim(restRequest.paramAsBoolean(GetInfluencersAction.Request.INCLUDE_INTERIM.getPreferredName(), false)); request.setIncludeInterim(restRequest.paramAsBoolean(GetInfluencersAction.Request.INCLUDE_INTERIM.getPreferredName(), false));
request.setPageParams(new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM), request.setPageParams(new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM),
restRequest.paramAsInt(PageParams.SIZE.getPreferredName(), PageParams.DEFAULT_SIZE))); restRequest.paramAsInt(PageParams.SIZE.getPreferredName(), PageParams.DEFAULT_SIZE)));
@ -57,7 +59,7 @@ public class RestGetInfluencersAction extends BaseRestHandler {
Double.parseDouble(restRequest.param(GetInfluencersAction.Request.ANOMALY_SCORE.getPreferredName(), "0.0"))); Double.parseDouble(restRequest.param(GetInfluencersAction.Request.ANOMALY_SCORE.getPreferredName(), "0.0")));
request.setSort(restRequest.param(GetInfluencersAction.Request.SORT_FIELD.getPreferredName(), request.setSort(restRequest.param(GetInfluencersAction.Request.SORT_FIELD.getPreferredName(),
Influencer.ANOMALY_SCORE.getPreferredName())); Influencer.ANOMALY_SCORE.getPreferredName()));
request.setDecending(restRequest.paramAsBoolean(GetInfluencersAction.Request.DESCENDING_SORT.getPreferredName(), false)); request.setDecending(restRequest.paramAsBoolean(GetInfluencersAction.Request.DESCENDING_SORT.getPreferredName(), true));
} }
return channel -> transportAction.execute(request, new RestToXContentListener<GetInfluencersAction.Response>(channel)); return channel -> transportAction.execute(request, new RestToXContentListener<GetInfluencersAction.Response>(channel));

4
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/rest/results/RestGetBucketsAction.java
View File

@ -63,7 +63,7 @@ public class RestGetBucketsAction extends BaseRestHandler {
request.setTimestamp(timestamp); request.setTimestamp(timestamp);
request.setExpand(restRequest.paramAsBoolean(GetBucketsAction.Request.EXPAND.getPreferredName(), false)); request.setExpand(restRequest.paramAsBoolean(GetBucketsAction.Request.EXPAND.getPreferredName(), false));
request.setIncludeInterim(restRequest.paramAsBoolean(GetBucketsAction.Request.INCLUDE_INTERIM.getPreferredName(), false)); request.setIncludeInterim(restRequest.paramAsBoolean(GetBucketsAction.Request.INCLUDE_INTERIM.getPreferredName(), false));
} else if (start != null && !start.isEmpty() && end != null && !end.isEmpty()) { } else {
// Multiple buckets // Multiple buckets
request.setStart(start); request.setStart(start);
request.setEnd(end); request.setEnd(end);
@ -77,8 +77,6 @@ public class RestGetBucketsAction extends BaseRestHandler {
if (restRequest.hasParam(GetBucketsAction.Request.PARTITION_VALUE.getPreferredName())) { if (restRequest.hasParam(GetBucketsAction.Request.PARTITION_VALUE.getPreferredName())) {
request.setPartitionValue(restRequest.param(GetBucketsAction.Request.PARTITION_VALUE.getPreferredName())); request.setPartitionValue(restRequest.param(GetBucketsAction.Request.PARTITION_VALUE.getPreferredName()));
} }
} else {
throw new IllegalArgumentException("Either [timestamp] or [start, end] parameters must be set.");
} }
// Common options // Common options

8
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/rest/results/RestGetRecordsAction.java
View File

@ -34,9 +34,9 @@ public class RestGetRecordsAction extends BaseRestHandler {
@Override @Override
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
GetRecordsAction.Request request = new GetRecordsAction.Request(restRequest.param(Job.ID.getPreferredName()), GetRecordsAction.Request request = new GetRecordsAction.Request(restRequest.param(Job.ID.getPreferredName()));
restRequest.param(GetRecordsAction.Request.START.getPreferredName()), request.setStart(restRequest.param(GetRecordsAction.Request.START.getPreferredName()));
restRequest.param(GetRecordsAction.Request.END.getPreferredName())); request.setEnd(restRequest.param(GetRecordsAction.Request.END.getPreferredName()));
request.setIncludeInterim(restRequest.paramAsBoolean(GetRecordsAction.Request.INCLUDE_INTERIM.getPreferredName(), false)); request.setIncludeInterim(restRequest.paramAsBoolean(GetRecordsAction.Request.INCLUDE_INTERIM.getPreferredName(), false));
request.setPageParams(new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM), request.setPageParams(new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM),
restRequest.paramAsInt(PageParams.SIZE.getPreferredName(), PageParams.DEFAULT_SIZE))); restRequest.paramAsInt(PageParams.SIZE.getPreferredName(), PageParams.DEFAULT_SIZE)));
@ -44,7 +44,7 @@ public class RestGetRecordsAction extends BaseRestHandler {
Double.parseDouble(restRequest.param(GetRecordsAction.Request.ANOMALY_SCORE_FILTER.getPreferredName(), "0.0"))); Double.parseDouble(restRequest.param(GetRecordsAction.Request.ANOMALY_SCORE_FILTER.getPreferredName(), "0.0")));
request.setSort(restRequest.param(GetRecordsAction.Request.SORT.getPreferredName(), request.setSort(restRequest.param(GetRecordsAction.Request.SORT.getPreferredName(),
AnomalyRecord.NORMALIZED_PROBABILITY.getPreferredName())); AnomalyRecord.NORMALIZED_PROBABILITY.getPreferredName()));
request.setDecending(restRequest.paramAsBoolean(GetRecordsAction.Request.DESCENDING.getPreferredName(), false)); request.setDecending(restRequest.paramAsBoolean(GetRecordsAction.Request.DESCENDING.getPreferredName(), true));
request.setMaxNormalizedProbability( request.setMaxNormalizedProbability(
Double.parseDouble(restRequest.param(GetRecordsAction.Request.MAX_NORMALIZED_PROBABILITY.getPreferredName(), "0.0"))); Double.parseDouble(restRequest.param(GetRecordsAction.Request.MAX_NORMALIZED_PROBABILITY.getPreferredName(), "0.0")));
String partitionValue = restRequest.param(GetRecordsAction.Request.PARTITION_VALUE.getPreferredName()); String partitionValue = restRequest.param(GetRecordsAction.Request.PARTITION_VALUE.getPreferredName());

13
elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/action/GetInfluencersActionRequestTests.java
View File

@ -15,13 +15,20 @@ public class GetInfluencersActionRequestTests extends AbstractStreamableXContent
@Override @Override
protected Request parseInstance(XContentParser parser, ParseFieldMatcher matcher) { protected Request parseInstance(XContentParser parser, ParseFieldMatcher matcher) {
return GetInfluencersAction.Request.parseRequest(null, null, null, parser, () -> matcher); return GetInfluencersAction.Request.parseRequest(null, parser, () -> matcher);
} }
@Override @Override
protected Request createTestInstance() { protected Request createTestInstance() {
Request request = new Request(randomAsciiOfLengthBetween(1, 20), randomAsciiOfLengthBetween(1, 20), Request request = new Request(randomAsciiOfLengthBetween(1, 20));
randomAsciiOfLengthBetween(1, 20)); if (randomBoolean()) {
String start = randomBoolean() ? randomAsciiOfLengthBetween(1, 20) : String.valueOf(randomPositiveLong());
request.setStart(start);
}
if (randomBoolean()) {
String end = randomBoolean() ? randomAsciiOfLengthBetween(1, 20) : String.valueOf(randomPositiveLong());
request.setEnd(end);
}
if (randomBoolean()) { if (randomBoolean()) {
request.setAnomalyScore(randomDouble()); request.setAnomalyScore(randomDouble());
} }

11
elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/action/GetRecordsActionRequestTests.java
View File

@ -20,8 +20,15 @@ public class GetRecordsActionRequestTests extends AbstractStreamableXContentTest
@Override @Override
protected Request createTestInstance() { protected Request createTestInstance() {
Request request = new Request(randomAsciiOfLengthBetween(1, 20), randomAsciiOfLengthBetween(1, 20), Request request = new Request(randomAsciiOfLengthBetween(1, 20));
randomAsciiOfLengthBetween(1, 20)); if (randomBoolean()) {
String start = randomBoolean() ? randomAsciiOfLengthBetween(1, 20) : String.valueOf(randomPositiveLong());
request.setStart(start);
}
if (randomBoolean()) {
String end = randomBoolean() ? randomAsciiOfLengthBetween(1, 20) : String.valueOf(randomPositiveLong());
request.setEnd(end);
}
if (randomBoolean()) { if (randomBoolean()) {
request.setPartitionValue(randomAsciiOfLengthBetween(1, 20)); request.setPartitionValue(randomAsciiOfLengthBetween(1, 20));
} }

6
elasticsearch/src/test/resources/rest-api-spec/api/xpack.prelert.get_influencers.json
View File

@ -25,13 +25,11 @@
}, },
"start": { "start": {
"type": "string", "type": "string",
"description": "start timestamp for the requested influencers", "description": "start timestamp for the requested influencers"
"required": true
}, },
"end": { "end": {
"type": "string", "type": "string",
"description": "end timestamp for the requested influencers", "description": "end timestamp for the requested influencers"
"required": true
}, },
"anomalyScore": { "anomalyScore": {
"type": "double", "type": "double",

2
elasticsearch/src/test/resources/rest-api-spec/api/xpack.prelert.get_records.json
View File

@ -28,12 +28,10 @@
}, },
"start": { "start": {
"type": "string", "type": "string",
"required": true,
"description" : "Start time filter for records" "description" : "Start time filter for records"
}, },
"end": { "end": {
"type": "string", "type": "string",
"required": true,
"description" : "End time filter for records" "description" : "End time filter for records"
}, },
"anomalyScore": { "anomalyScore": {

23
elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_buckets.yaml
View File

@ -20,12 +20,19 @@ setup:
id: "farequote_1464739200000_1" id: "farequote_1464739200000_1"
body: { "jobId": "farequote", "result_type": "bucket", "timestamp": "2016-06-01T00:00:00Z", "bucketSpan":1 } body: { "jobId": "farequote", "result_type": "bucket", "timestamp": "2016-06-01T00:00:00Z", "bucketSpan":1 }
- do:
index:
index: prelertresults-farequote
type: result
id: "farequote_1464739200000_2"
body: { "jobId": "farequote", "result_type": "bucket", "timestamp": "2016-08-01T00:00:00Z", "bucketSpan":1 }
- do: - do:
indices.refresh: indices.refresh:
index: prelertresults-farequote index: prelertresults-farequote
--- ---
"Test result buckets api": "Test result buckets api with time range":
- do: - do:
xpack.prelert.get_buckets: xpack.prelert.get_buckets:
job_id: "farequote" job_id: "farequote"
@ -37,6 +44,20 @@ setup:
- match: { buckets.0.jobId: farequote} - match: { buckets.0.jobId: farequote}
- match: { buckets.0.result_type: bucket} - match: { buckets.0.result_type: bucket}
---
"Test result buckets api":
- do:
xpack.prelert.get_buckets:
job_id: "farequote"
- match: { count: 2 }
- match: { buckets.0.timestamp: 1464739200000 }
- match: { buckets.0.jobId: farequote}
- match: { buckets.0.result_type: bucket}
- match: { buckets.1.timestamp: 1470009600000 }
- match: { buckets.1.jobId: farequote}
- match: { buckets.1.result_type: bucket}
--- ---
"Test result single bucket api": "Test result single bucket api":
- do: - do:

30
elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_influencers.yaml
View File

@ -25,9 +25,24 @@ setup:
"timestamp": "2016-06-01T00:00:00Z", "timestamp": "2016-06-01T00:00:00Z",
"influencerFieldName": "foo", "influencerFieldName": "foo",
"influencerFieldValue": "bar", "influencerFieldValue": "bar",
"anomalyScore": 80.0,
"result_type" : "influencer" "result_type" : "influencer"
} }
- do:
index:
index: prelertresults-farequote
type: result
id: 2
body:
{
"jobId": "farequote",
"timestamp": "2016-06-02T00:00:00Z",
"influencerFieldName": "foo",
"influencerFieldValue": "zoo",
"anomalyScore": 50.0,
"result_type" : "influencer"
}
- do: - do:
indices.refresh: indices.refresh:
index: prelertresults-farequote index: prelertresults-farequote
@ -37,9 +52,18 @@ setup:
- do: - do:
xpack.prelert.get_influencers: xpack.prelert.get_influencers:
job_id: "farequote" job_id: "farequote"
start: "2016-05-01T00:00:00Z"
end: "2016-07-01T00:00:00Z" - match: { count: 2 }
- match: { influencers.0.timestamp: 1464739200000 }
- match: { influencers.1.timestamp: 1464825600000 }
---
"Test result influencers api with time range":
- do:
xpack.prelert.get_influencers:
job_id: "farequote"
start: "2016-06-01T00:00:00Z"
end: "2016-06-01T01:00:00Z"
- match: { count: 1 } - match: { count: 1 }
- match: { influencers.0.timestamp: 1464739200000 } - match: { influencers.0.timestamp: 1464739200000 }

39
elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_records.yaml
View File

@ -32,7 +32,28 @@ setup:
index: prelertresults-farequote index: prelertresults-farequote
type: result type: result
id: 2 id: 2
body: { "jobId": "farequote", "result_type": "record", "timestamp": "2016-06-01T00:00:00Z", "result_type": "record" } body:
{
"jobId": "farequote",
"result_type": "record",
"timestamp": "2016-06-01T00:00:00Z",
"anomalyScore": 60.0,
"result_type": "record"
}
- do:
index:
index: prelertresults-farequote
type: result
id: 3
body:
{
"jobId": "farequote",
"result_type": "record",
"timestamp": "2016-06-02T00:00:00Z",
"anomalyScore": 80.0,
"result_type": "record"
}
- do: - do:
indices.refresh: indices.refresh:
@ -40,11 +61,25 @@ setup:
--- ---
"Test result records api": "Test result records api":
- do:
xpack.prelert.get_records:
job_id: "farequote"
- match: { count: 2 }
- match: { records.0.timestamp: 1464825600000 }
- match: { records.0.jobId: farequote}
- match: { records.0.result_type: record}
- match: { records.1.timestamp: 1464739200000 }
- match: { records.1.jobId: farequote}
- match: { records.1.result_type: record}
---
"Test result records api with time range":
- do: - do:
xpack.prelert.get_records: xpack.prelert.get_records:
job_id: "farequote" job_id: "farequote"
start: "2016-05-01T00:00:00Z" start: "2016-05-01T00:00:00Z"
end: "2016-07-01T00:00:00Z" end: "2016-06-01T01:00:00Z"
- match: { count: 1 } - match: { count: 1 }
- match: { records.0.timestamp: 1464739200000 } - match: { records.0.timestamp: 1464739200000 }