honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Deprecate X-Pack centric rollup endpoints (#35962)"

Browse Source 
This reverts commit b84f1f6a3ad511538ea102badfefa934fa8f0336.
This commit is contained in:
Zachary Tong 2018-11-29 12:58:23 -05:00
parent 40c5445480
commit 61c2db5ebb
34 changed files with 109 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/rest-high-level/src/main/java/org/elasticsearch/client/RollupRequestConverters.java
View File

@ -42,7 +42,7 @@ final class RollupRequestConverters {
static Request putJob(final PutRollupJobRequest putRollupJobRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "job")
.addPathPartAsIs("_xpack", "rollup", "job")
.addPathPart(putRollupJobRequest.getConfig().getId())
.build();
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
@ -52,7 +52,7 @@ final class RollupRequestConverters {
static Request startJob(final StartRollupJobRequest startRollupJobRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "job")
.addPathPartAsIs("_xpack", "rollup", "job")
.addPathPart(startRollupJobRequest.getJobId())
.addPathPartAsIs("_start")
.build();
@ -61,7 +61,7 @@ final class RollupRequestConverters {
static Request stopJob(final StopRollupJobRequest stopRollupJobRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "job")
.addPathPartAsIs("_xpack", "rollup", "job")
.addPathPart(stopRollupJobRequest.getJobId())
.addPathPartAsIs("_stop")
.build();
@ -77,7 +77,7 @@ final class RollupRequestConverters {
static Request getJob(final GetRollupJobRequest getRollupJobRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "job")
.addPathPartAsIs("_xpack", "rollup", "job")
.addPathPart(getRollupJobRequest.getJobId())
.build();
return new Request(HttpGet.METHOD_NAME, endpoint);
@ -85,7 +85,7 @@ final class RollupRequestConverters {
static Request deleteJob(final DeleteRollupJobRequest deleteRollupJobRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "job")
.addPathPartAsIs("_xpack", "rollup", "job")
.addPathPart(deleteRollupJobRequest.getId())
.build();
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
@ -95,7 +95,7 @@ final class RollupRequestConverters {
static Request getRollupCaps(final GetRollupCapsRequest getRollupCapsRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_rollup", "data")
.addPathPartAsIs("_xpack", "rollup", "data")
.addPathPart(getRollupCapsRequest.getIndexPattern())
.build();
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
@ -106,7 +106,7 @@ final class RollupRequestConverters {
static Request getRollupIndexCaps(final GetRollupIndexCapsRequest getRollupIndexCapsRequest) throws IOException {
String endpoint = new RequestConverters.EndpointBuilder()
.addCommaSeparatedPathParts(getRollupIndexCapsRequest.indices())
.addPathPartAsIs("_rollup", "data")
.addPathPartAsIs("_xpack", "rollup", "data")
.build();
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
request.setEntity(createEntity(getRollupIndexCapsRequest, REQUEST_BODY_CONTENT_TYPE));

8
client/rest-high-level/src/test/java/org/elasticsearch/client/RollupRequestConvertersTests.java
View File

@ -45,7 +45,7 @@ public class RollupRequestConvertersTests extends ESTestCase {
PutRollupJobRequest put = new PutRollupJobRequest(config);
Request request = RollupRequestConverters.putJob(put);
assertThat(request.getEndpoint(), equalTo("/_rollup/job/" + job));
assertThat(request.getEndpoint(), equalTo("/_xpack/rollup/job/" + job));
assertThat(HttpPut.METHOD_NAME, equalTo(request.getMethod()));
assertThat(request.getParameters().keySet(), empty());
RequestConvertersTests.assertToXContentBody(put, request.getEntity());
@ -57,7 +57,7 @@ public class RollupRequestConvertersTests extends ESTestCase {
StartRollupJobRequest startJob = new StartRollupJobRequest(jobId);
Request request = RollupRequestConverters.startJob(startJob);
assertThat(request.getEndpoint(), equalTo("/_rollup/job/" + jobId + "/_start"));
assertThat(request.getEndpoint(), equalTo("/_xpack/rollup/job/" + jobId + "/_start"));
assertThat(HttpPost.METHOD_NAME, equalTo(request.getMethod()));
assertThat(request.getParameters().keySet(), empty());
assertThat(request.getEntity(), nullValue());
@ -81,7 +81,7 @@ public class RollupRequestConvertersTests extends ESTestCase {
}
Request request = RollupRequestConverters.stopJob(stopJob);
assertThat(request.getEndpoint(), equalTo("/_rollup/job/" + jobId + "/_stop"));
assertThat(request.getEndpoint(), equalTo("/_xpack/rollup/job/" + jobId + "/_stop"));
assertThat(HttpPost.METHOD_NAME, equalTo(request.getMethod()));
assertThat(request.getParameters().keySet().size(), equalTo(expectedParameters));
assertThat(request.getParameters().get("timeout"), equalTo(expectedTimeOutString));
@ -95,7 +95,7 @@ public class RollupRequestConvertersTests extends ESTestCase {
GetRollupJobRequest get = getAll ? new GetRollupJobRequest() : new GetRollupJobRequest(job);
Request request = RollupRequestConverters.getJob(get);
assertThat(request.getEndpoint(), equalTo("/_rollup/job/" + job));
assertThat(request.getEndpoint(), equalTo("/_xpack/rollup/job/" + job));
assertThat(HttpGet.METHOD_NAME, equalTo(request.getMethod()));
assertThat(request.getParameters().keySet(), empty());
assertThat(request.getEntity(), nullValue());

6
docs/build.gradle
View File

@ -625,7 +625,7 @@ buildRestTests.setups['sensor_rollup_job'] = '''
- do:
raw:
method: PUT
path: _rollup/job/sensor
path: _xpack/rollup/job/sensor
body: >
{
"index_pattern": "sensor-*",
@ -696,7 +696,7 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
- do:
raw:
method: PUT
path: _rollup/job/sensor
path: _xpack/rollup/job/sensor
body: >
{
"index_pattern": "sensor-*",
@ -727,7 +727,7 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
- do:
raw:
method: POST
path: _rollup/job/sensor/_start
path: _xpack/rollup/job/sensor/_start
'''
buildRestTests.setups['sensor_index'] = '''

16
docs/reference/rollup/api-quickref.asciidoc
View File

@ -9,7 +9,7 @@ Most {rollup} endpoints have the following base:
[source,js]
----
/_rollup/
/_xpack/rollup/
----
// NOTCONSOLE
@ -17,18 +17,18 @@ Most {rollup} endpoints have the following base:
[[rollup-api-jobs]]
=== /job/
* {ref}/rollup-put-job.html[PUT /_rollup/job/<job_id+++>+++]: Create a job
* {ref}/rollup-get-job.html[GET /_rollup/job]: List jobs
* {ref}/rollup-get-job.html[GET /_rollup/job/<job_id+++>+++]: Get job details
* {ref}/rollup-start-job.html[POST /_rollup/job/<job_id>/_start]: Start a job
* {ref}/rollup-stop-job.html[POST /_rollup/job/<job_id>/_stop]: Stop a job
* {ref}/rollup-delete-job.html[DELETE /_rollup/job/<job_id+++>+++]: Delete a job
* {ref}/rollup-put-job.html[PUT /_xpack/rollup/job/<job_id+++>+++]: Create a job
* {ref}/rollup-get-job.html[GET /_xpack/rollup/job]: List jobs
* {ref}/rollup-get-job.html[GET /_xpack/rollup/job/<job_id+++>+++]: Get job details
* {ref}/rollup-start-job.html[POST /_xpack/rollup/job/<job_id>/_start]: Start a job
* {ref}/rollup-stop-job.html[POST /_xpack/rollup/job/<job_id>/_stop]: Stop a job
* {ref}/rollup-delete-job.html[DELETE /_xpack/rollup/job/<job_id+++>+++]: Delete a job
[float]
[[rollup-api-data]]
=== /data/
* {ref}/rollup-get-rollup-caps.html[GET /_rollup/data/<index_pattern+++>/_rollup_caps+++]: Get Rollup Capabilities
* {ref}/rollup-get-rollup-caps.html[GET /_xpack/rollup/data/<index_pattern+++>/_rollup_caps+++]: Get Rollup Capabilities
* {ref}/rollup-get-rollup-index-caps.html[GET /<index_name+++>/_rollup/data/+++]: Get Rollup Index Capabilities
[float]

6
docs/reference/rollup/apis/delete-job.asciidoc
View File

@ -39,7 +39,7 @@ POST my_rollup_index/_delete_by_query
**********************************
==== Request
`DELETE _rollup/job/<job_id>`
`DELETE _xpack/rollup/job/<job_id>`
//===== Description
@ -66,7 +66,7 @@ If we have a rollup job named `sensor`, it can be deleted with:
[source,js]
--------------------------------------------------
DELETE _rollup/job/sensor
DELETE _xpack/rollup/job/sensor
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_rollup_job]
@ -85,7 +85,7 @@ If however we try to delete a job which doesn't exist:
[source,js]
--------------------------------------------------
DELETE _rollup/job/does_not_exist
DELETE _xpack/rollup/job/does_not_exist
--------------------------------------------------
// CONSOLE
// TEST[catch:missing]

8
docs/reference/rollup/apis/get-job.asciidoc
View File

@ -18,7 +18,7 @@ For details about a historical job, the <<rollup-get-rollup-caps,Rollup Capabili
==== Request
`GET _rollup/job/<job_id>`
`GET _xpack/rollup/job/<job_id>`
//===== Description
@ -44,7 +44,7 @@ If we have already created a rollup job named `sensor`, the details about the jo
[source,js]
--------------------------------------------------
GET _rollup/job/sensor
GET _xpack/rollup/job/sensor
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_rollup_job]
@ -140,7 +140,7 @@ If we add another job, we can see how multi-job responses are handled:
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor2 <1>
PUT _xpack/rollup/job/sensor2 <1>
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",
@ -168,7 +168,7 @@ PUT _rollup/job/sensor2 <1>
]
}
GET _rollup/job/_all <2>
GET _xpack/rollup/job/_all <2>
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_rollup_job]

4
docs/reference/rollup/apis/put-job.asciidoc
View File

@ -13,7 +13,7 @@ started with the <<rollup-start-job,Start Job API>>.
==== Request
`PUT _rollup/job/<job_id>`
`PUT _xpack/rollup/job/<job_id>`
//===== Description
@ -59,7 +59,7 @@ The following example creates a rollup job named "sensor", targeting the "sensor
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",

10
docs/reference/rollup/apis/rollup-caps.asciidoc
View File

@ -21,7 +21,7 @@ live?
==== Request
`GET _rollup/data/{index}`
`GET _xpack/rollup/data/{index}`
//===== Description
@ -50,7 +50,7 @@ this future scaling:
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",
@ -85,7 +85,7 @@ We can then retrieve the rollup capabilities of that index pattern (`sensor-*`)
[source,js]
--------------------------------------------------
GET _rollup/data/sensor-*
GET _xpack/rollup/data/sensor-*
--------------------------------------------------
// CONSOLE
// TEST[continued]
@ -155,7 +155,7 @@ We could also retrieve the same information with a request to `_all`:
[source,js]
--------------------------------------------------
GET _rollup/data/_all
GET _xpack/rollup/data/_all
--------------------------------------------------
// CONSOLE
// TEST[continued]
@ -164,7 +164,7 @@ But note that if we use the concrete index name (`sensor-1`), we'll retrieve no
[source,js]
--------------------------------------------------
GET _rollup/data/sensor-1
GET _xpack/rollup/data/sensor-1
--------------------------------------------------
// CONSOLE
// TEST[continued]

8
docs/reference/rollup/apis/rollup-index-caps.asciidoc
View File

@ -18,7 +18,7 @@ This API will allow you to determine:
==== Request
`GET {index}/_rollup/data`
`GET {index}/_xpack/rollup/data`
//===== Description
@ -44,7 +44,7 @@ will be a `sensor-2`, `sensor-3`, etc. Let's create a Rollup job, which stores
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",
@ -80,7 +80,7 @@ Index API:
[source,js]
--------------------------------------------------
GET /sensor_rollup/_rollup/data
GET /sensor_rollup/_xpack/rollup/data
--------------------------------------------------
// CONSOLE
// TEST[continued]
@ -153,7 +153,7 @@ Like other APIs that interact with indices, you can specify index patterns inste
[source,js]
--------------------------------------------------
GET /*_rollup/_rollup/data
GET /*_rollup/_xpack/rollup/data
--------------------------------------------------
// CONSOLE
// TEST[continued]

2
docs/reference/rollup/apis/rollup-job-config.asciidoc
View File

@ -15,7 +15,7 @@ A full job configuration might look like this:
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",

2
docs/reference/rollup/apis/rollup-search.asciidoc
View File

@ -52,7 +52,7 @@ Imagine we have an index named `sensor-1` full of raw data, and we have created
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",

6
docs/reference/rollup/apis/start-job.asciidoc
View File

@ -13,7 +13,7 @@ Starting an already started job has no action.
==== Request
`POST _rollup/job/<job_id>/_start`
`POST _xpack/rollup/job/<job_id>/_start`
//===== Description
@ -39,7 +39,7 @@ If we have already created a rollup job named `sensor`, it can be started with:
[source,js]
--------------------------------------------------
POST _rollup/job/sensor/_start
POST _xpack/rollup/job/sensor/_start
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_rollup_job]
@ -58,7 +58,7 @@ If however we try to start a job which doesn't exist:
[source,js]
--------------------------------------------------
POST _rollup/job/does_not_exist/_start
POST _xpack/rollup/job/does_not_exist/_start
--------------------------------------------------
// CONSOLE
// TEST[catch:missing]

8
docs/reference/rollup/apis/stop-job.asciidoc
View File

@ -13,7 +13,7 @@ Stopping an already stopped job has no action.
==== Request
`POST _rollup/job/<job_id>/_stop`
`POST _xpack/rollup/job/<job_id>/_stop`
//===== Description
@ -52,7 +52,7 @@ If we have an already-started rollup job named `sensor`, it can be stopped with:
[source,js]
--------------------------------------------------
POST _rollup/job/sensor/_stop
POST _xpack/rollup/job/sensor/_stop
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_started_rollup_job]
@ -71,7 +71,7 @@ If however we try to stop a job which doesn't exist:
[source,js]
--------------------------------------------------
POST _rollup/job/does_not_exist/_stop
POST _xpack/rollup/job/does_not_exist/_stop
--------------------------------------------------
// CONSOLE
// TEST[catch:missing]
@ -106,7 +106,7 @@ stopped. This is accomplished with the `wait_for_completion` query parameter, a
[source,js]
--------------------------------------------------
POST _rollup/job/sensor/_stop?wait_for_completion=true&timeout=10s
POST _xpack/rollup/job/sensor/_stop?wait_for_completion=true&timeout=10s
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_started_rollup_job]

6
docs/reference/rollup/rollup-getting-started.asciidoc
View File

@ -30,7 +30,7 @@ one hour or greater. A rollup job might look like this:
[source,js]
--------------------------------------------------
PUT _rollup/job/sensor
PUT _xpack/rollup/job/sensor
{
"index_pattern": "sensor-*",
"rollup_index": "sensor_rollup",
@ -60,7 +60,7 @@ PUT _rollup/job/sensor
// CONSOLE
// TEST[setup:sensor_index]
We give the job the ID of "sensor" (in the url: `PUT _rollup/job/sensor`), and tell it to rollup the index pattern `"sensor-*"`.
We give the job the ID of "sensor" (in the url: `PUT _xpack/rollup/job/sensor`), and tell it to rollup the index pattern `"sensor-*"`.
This job will find and rollup any index that matches that pattern. Rollup summaries are then stored in the `"sensor_rollup"` index.
The `cron` parameter controls when and how often the job activates. When a rollup job's cron schedule triggers, it will begin rolling up
@ -114,7 +114,7 @@ To start the job, execute this command:
[source,js]
--------------------------------------------------
POST _rollup/job/sensor/_start
POST _xpack/rollup/job/sensor/_start
--------------------------------------------------
// CONSOLE
// TEST[setup:sensor_rollup_job]

2
docs/reference/rollup/understanding-groups.asciidoc
View File

@ -162,7 +162,7 @@ the best practice is to combine them into a single rollup job which covers both
[source,js]
--------------------------------------------------
PUT _rollup/job/combined
PUT _xpack/rollup/job/combined
{
"index_pattern": "data-*",
"rollup_index": "data_rollup",

6
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View File

@ -474,7 +474,7 @@ public abstract class ESRestTestCase extends ESTestCase {
}
private void wipeRollupJobs() throws IOException, InterruptedException {
Response response = adminClient().performRequest(new Request("GET", "/_rollup/job/_all"));
Response response = adminClient().performRequest(new Request("GET", "/_xpack/rollup/job/_all"));
Map<String, Object> jobs = entityAsMap(response);
@SuppressWarnings("unchecked")
List<Map<String, Object>> jobConfigs =
@ -487,7 +487,7 @@ public abstract class ESRestTestCase extends ESTestCase {
for (Map<String, Object> jobConfig : jobConfigs) {
@SuppressWarnings("unchecked")
String jobId = (String) ((Map<String, Object>) jobConfig.get("config")).get("id");
Request request = new Request("POST", "/_rollup/job/" + jobId + "/_stop");
Request request = new Request("POST", "/_xpack/rollup/job/" + jobId + "/_stop");
request.addParameter("ignore", "404");
request.addParameter("wait_for_completion", "true");
request.addParameter("timeout", "10s");
@ -498,7 +498,7 @@ public abstract class ESRestTestCase extends ESTestCase {
for (Map<String, Object> jobConfig : jobConfigs) {
@SuppressWarnings("unchecked")
String jobId = (String) ((Map<String, Object>) jobConfig.get("config")).get("id");
Request request = new Request("DELETE", "/_rollup/job/" + jobId);
Request request = new Request("DELETE", "/_xpack/rollup/job/" + jobId);
request.addParameter("ignore", "404"); // Ignore 404s because they imply someone was racing us to delete this
logger.debug("deleting rollup job [{}]", jobId);
adminClient().performRequest(request);

14
x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
View File

@ -396,7 +396,7 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
client().performRequest(createJobRequest);
String rollupJobId = "rollup-" + jobId;
Request createRollupRequest = new Request("PUT", "/_rollup/job/" + rollupJobId);
Request createRollupRequest = new Request("PUT", "/_xpack/rollup/job/" + rollupJobId);
createRollupRequest.setJsonEntity("{\n"
+ "\"index_pattern\": \"airline-data-aggs\",\n"
+ " \"rollup_index\": \"airline-data-aggs-rollup\",\n"
@ -764,7 +764,7 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
client().performRequest(createJobRequest);
String rollupJobId = "rollup-" + jobId;
Request createRollupRequest = new Request("PUT", "/_rollup/job/" + rollupJobId);
Request createRollupRequest = new Request("PUT", "/_xpack/rollup/job/" + rollupJobId);
createRollupRequest.setJsonEntity("{\n"
+ "\"index_pattern\": \"airline-data-aggs\",\n"
+ " \"rollup_index\": \"airline-data-aggs-rollup\",\n"
@ -792,18 +792,18 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
+ " ]\n"
+ "}");
client().performRequest(createRollupRequest);
client().performRequest(new Request("POST", "/_rollup/job/" + rollupJobId + "/_start"));
client().performRequest(new Request("POST", "/_xpack/rollup/job/" + rollupJobId + "/_start"));
assertBusy(() -> {
Response getRollup = client().performRequest(new Request("GET", "/_rollup/job/" + rollupJobId));
Response getRollup = client().performRequest(new Request("GET", "/_xpack/rollup/job/" + rollupJobId));
String body = EntityUtils.toString(getRollup.getEntity());
assertThat(body, containsString("\"job_state\":\"started\""));
assertThat(body, containsString("\"rollups_indexed\":4"));
}, 60, TimeUnit.SECONDS);
client().performRequest(new Request("POST", "/_rollup/job/" + rollupJobId + "/_stop"));
client().performRequest(new Request("POST", "/_xpack/rollup/job/" + rollupJobId + "/_stop"));
assertBusy(() -> {
Response getRollup = client().performRequest(new Request("GET", "/_rollup/job/" + rollupJobId));
Response getRollup = client().performRequest(new Request("GET", "/_xpack/rollup/job/" + rollupJobId));
assertThat(EntityUtils.toString(getRollup.getEntity()), containsString("\"job_state\":\"stopped\""));
}, 60, TimeUnit.SECONDS);
@ -849,7 +849,7 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
client().performRequest(createJobRequest);
String rollupJobId = "rollup-" + jobId;
Request createRollupRequest = new Request("PUT", "/_rollup/job/" + rollupJobId);
Request createRollupRequest = new Request("PUT", "/_xpack/rollup/job/" + rollupJobId);
createRollupRequest.setJsonEntity("{\n"
+ "\"index_pattern\": \"airline-data-aggs\",\n"
+ " \"rollup_index\": \"airline-data-aggs-rollup\",\n"

17
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestDeleteRollupJobAction.java
View File

@ -3,13 +3,11 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -21,20 +19,12 @@ import org.elasticsearch.xpack.rollup.Rollup;
import java.io.IOException;
import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteRollupJobAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestDeleteRollupJobAction.class));
public static final ParseField ID = new ParseField("id");
public RestDeleteRollupJobAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
DELETE, "/_rollup/job/{id}", this,
DELETE, Rollup.BASE_PATH + "job/{id}/", deprecationLogger);
controller.registerHandler(RestRequest.Method.DELETE, Rollup.BASE_PATH + "job/{id}/", this);
}
@Override
@ -56,7 +46,6 @@ public class RestDeleteRollupJobAction extends BaseRestHandler {
@Override
public String getName() {
return "delete_rollup_job";
return "rollup_delete_job_action";
}
}

16
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestGetRollupCapsAction.java
View File

@ -5,10 +5,8 @@
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -19,21 +17,12 @@ import org.elasticsearch.xpack.rollup.Rollup;
import java.io.IOException;
import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestGetRollupCapsAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestGetRollupCapsAction.class));
public static final ParseField ID = new ParseField("id");
public RestGetRollupCapsAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
GET, "/_rollup/data/{id}", this,
GET, Rollup.BASE_PATH + "data/{id}/", deprecationLogger);
controller.registerHandler(RestRequest.Method.GET, Rollup.BASE_PATH + "data/{id}/", this);
}
@Override
@ -46,7 +35,6 @@ public class RestGetRollupCapsAction extends BaseRestHandler {
@Override
public String getName() {
return "get_rollup_caps";
return "rollup_get_caps_action";
}
}

20
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestGetRollupIndexCapsAction.java
View File

@ -3,15 +3,12 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -19,22 +16,12 @@ import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.rollup.action.GetRollupIndexCapsAction;
import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestGetRollupIndexCapsAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(RestGetRollupIndexCapsAction.class));
static final ParseField INDEX = new ParseField("index");
public static final ParseField INDEX = new ParseField("index");
public RestGetRollupIndexCapsAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
GET, "/{index}/_rollup/data", this,
GET, "/{index}/_xpack/rollup/data", deprecationLogger);
controller.registerHandler(RestRequest.Method.GET, "/{index}/_xpack/rollup/data", this);
}
@Override
@ -48,7 +35,6 @@ public class RestGetRollupIndexCapsAction extends BaseRestHandler {
@Override
public String getName() {
return "get_rollup_index_caps";
return "rollup_get_caps_action";
}
}

16
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestGetRollupJobsAction.java
View File

@ -3,13 +3,10 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -18,20 +15,12 @@ import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.rollup.action.GetRollupJobsAction;
import org.elasticsearch.xpack.rollup.Rollup;
import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestGetRollupJobsAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestGetRollupJobsAction.class));
public static final ParseField ID = new ParseField("id");
public RestGetRollupJobsAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
GET, "/_rollup/job/{id}", this,
GET, Rollup.BASE_PATH + "job/{id}/", deprecationLogger);
controller.registerHandler(RestRequest.Method.GET, Rollup.BASE_PATH + "job/{id}/", this);
}
@Override
@ -44,7 +33,6 @@ public class RestGetRollupJobsAction extends BaseRestHandler {
@Override
public String getName() {
return "get_rollup_job";
return "rollup_get_job_action";
}
}

16
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestPutRollupJobAction.java
View File

@ -3,12 +3,10 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -19,18 +17,11 @@ import org.elasticsearch.xpack.rollup.Rollup;
import java.io.IOException;
import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestPutRollupJobAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestPutRollupJobAction.class));
public RestPutRollupJobAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
PUT, "/_rollup/job/{id}", this,
PUT, Rollup.BASE_PATH + "job/{id}", deprecationLogger);
controller.registerHandler(RestRequest.Method.PUT, Rollup.BASE_PATH + "job/{id}/", this);
}
@Override
@ -42,7 +33,6 @@ public class RestPutRollupJobAction extends BaseRestHandler {
@Override
public String getName() {
return "put_rollup_job";
return "rollup_put_job_action";
}
}

15
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestStartRollupJobAction.java
View File

@ -3,12 +3,9 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
@ -20,18 +17,11 @@ import org.elasticsearch.xpack.rollup.Rollup;
import java.io.IOException;
import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestStartRollupJobAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestStartRollupJobAction.class));
public RestStartRollupJobAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
POST, "/_rollup/job/{id}/_start", this,
POST, Rollup.BASE_PATH + "job/{id}/_start", deprecationLogger);
controller.registerHandler(RestRequest.Method.POST, Rollup.BASE_PATH + "job/{id}/_start", this);
}
@Override
@ -44,7 +34,6 @@ public class RestStartRollupJobAction extends BaseRestHandler {
@Override
public String getName() {
return "start_rollup_job";
return "rollup_start_job_action";
}
}

15
x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/rest/RestStopRollupJobAction.java
View File

@ -3,12 +3,9 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.rollup.rest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.rest.BaseRestHandler;
@ -19,18 +16,11 @@ import org.elasticsearch.xpack.core.rollup.RollupField;
import org.elasticsearch.xpack.core.rollup.action.StopRollupJobAction;
import org.elasticsearch.xpack.rollup.Rollup;
import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestStopRollupJobAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestStopRollupJobAction.class));
public RestStopRollupJobAction(Settings settings, RestController controller) {
super(settings);
// TODO: remove deprecated endpoint in 8.0.0
controller.registerWithDeprecatedHandler(
POST, "/_rollup/job/{id}/_stop", this,
POST, Rollup.BASE_PATH + "job/{id}/_stop", deprecationLogger);
controller.registerHandler(RestRequest.Method.POST, Rollup.BASE_PATH + "job/{id}/_stop", this);
}
@Override
@ -45,7 +35,6 @@ public class RestStopRollupJobAction extends BaseRestHandler {
@Override
public String getName() {
return "stop_rollup_job";
return "rollup_stop_job_action";
}
}

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.delete_job.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "DELETE" ],
"url": {
"path": "/_rollup/job/{id}",
"paths": [ "/_rollup/job/{id}" ],
"path": "/_xpack/rollup/job/{id}",
"paths": [ "/_xpack/rollup/job/{id}" ],
"parts": {
"id": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_jobs.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "GET" ],
"url": {
"path": "/_rollup/job/{id}",
"paths": [ "/_rollup/job/{id}", "/_rollup/job/" ],
"path": "/_xpack/rollup/job/{id}",
"paths": [ "/_xpack/rollup/job/{id}", "/_xpack/rollup/job/" ],
"parts": {
"id": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_caps.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "GET" ],
"url": {
"path": "/_rollup/data/{id}",
"paths": [ "/_rollup/data/{id}", "/_rollup/data/" ],
"path": "/_xpack/rollup/data/{id}",
"paths": [ "/_xpack/rollup/data/{id}", "/_xpack/rollup/data/" ],
"parts": {
"id": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_index_caps.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "GET" ],
"url": {
"path": "/{index}/_rollup/data",
"paths": [ "/{index}/_rollup/data" ],
"path": "/{index}/_xpack/rollup/data",
"paths": [ "/{index}/_xpack/rollup/data" ],
"parts": {
"index": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.put_job.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "PUT" ],
"url": {
"path": "/_rollup/job/{id}",
"paths": [ "/_rollup/job/{id}" ],
"path": "/_xpack/rollup/job/{id}",
"paths": [ "/_xpack/rollup/job/{id}" ],
"parts": {
"id": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.start_job.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "POST" ],
"url": {
"path": "/_rollup/job/{id}/_start",
"paths": [ "/_rollup/job/{id}/_start" ],
"path": "/_xpack/rollup/job/{id}/_start",
"paths": [ "/_xpack/rollup/job/{id}/_start" ],
"parts": {
"id": {
"type": "string",

4
x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.stop_job.json
View File

@ -3,8 +3,8 @@
"documentation": "",
"methods": [ "POST" ],
"url": {
"path": "/_rollup/job/{id}/_stop",
"paths": [ "/_rollup/job/{id}/_stop" ],
"path": "/_xpack/rollup/job/{id}/_stop",
"paths": [ "/_xpack/rollup/job/{id}/_stop" ],
"parts": {
"id": {
"type": "string",

22
x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
View File

@ -282,7 +282,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
assertThat(createRollupJobResponse.get("acknowledged"), equalTo(Boolean.TRUE));
// start the rollup job
final Request startRollupJobRequest = new Request("POST", "/_xpack/rollup/job/rollup-job-test/_start");
final Request startRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-job-test/_start");
Map<String, Object> startRollupJobResponse = entityAsMap(client().performRequest(startRollupJobRequest));
assertThat(startRollupJobResponse.get("started"), equalTo(Boolean.TRUE));
@ -341,7 +341,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
assertThat(createRollupJobResponse.get("acknowledged"), equalTo(Boolean.TRUE));
// start the rollup job
final Request startRollupJobRequest = new Request("POST", "/_xpack/rollup/job/rollup-id-test/_start");
final Request startRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-id-test/_start");
Map<String, Object> startRollupJobResponse = entityAsMap(client().performRequest(startRollupJobRequest));
assertThat(startRollupJobResponse.get("started"), equalTo(Boolean.TRUE));
@ -373,14 +373,14 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
assertRollUpJob("rollup-id-test");
// stop the rollup job to force a state save, which will upgrade the ID
final Request stopRollupJobRequest = new Request("POST", "/_rollup/job/rollup-id-test/_stop");
final Request stopRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-id-test/_stop");
Map<String, Object> stopRollupJobResponse = entityAsMap(client().performRequest(stopRollupJobRequest));
assertThat(stopRollupJobResponse.get("stopped"), equalTo(Boolean.TRUE));
waitForRollUpJob("rollup-id-test", equalTo("stopped"));
// start the rollup job again
final Request startRollupJobRequest = new Request("POST", "/_rollup/job/rollup-id-test/_start");
final Request startRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-id-test/_start");
Map<String, Object> startRollupJobResponse = entityAsMap(client().performRequest(startRollupJobRequest));
assertThat(startRollupJobResponse.get("started"), equalTo(Boolean.TRUE));
@ -622,12 +622,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
waitForRollUpJob(rollupJob, expectedStates);
// check that the rollup job is started using the RollUp API
final Request getRollupJobRequest;
if (isRunningAgainstOldCluster()) {
getRollupJobRequest = new Request("GET", "/_xpack/rollup/job/" + rollupJob);
} else {
getRollupJobRequest = new Request("GET", "/_rollup/job/" + rollupJob);
}
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Map<String, Object> getRollupJobResponse = entityAsMap(client().performRequest(getRollupJobRequest));
Map<String, Object> job = getJob(getRollupJobResponse, rollupJob);
if (job != null) {
@ -673,12 +668,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
private void waitForRollUpJob(final String rollupJob, final Matcher<?> expectedStates) throws Exception {
assertBusy(() -> {
final Request getRollupJobRequest;
if (isRunningAgainstOldCluster()) {
getRollupJobRequest = new Request("GET", "/_xpack/rollup/job/" + rollupJob);
} else {
getRollupJobRequest = new Request("GET", "/_rollup/job/" + rollupJob);
}
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Response getRollupJobResponse = client().performRequest(getRollupJobRequest);
assertThat(getRollupJobResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus()));

10
x-pack/qa/multi-node/src/test/java/org/elasticsearch/multi_node/RollupIT.java
View File

@ -105,7 +105,7 @@ public class RollupIT extends ESRestTestCase {
client().performRequest(bulkRequest);
// create the rollup job
final Request createRollupJobRequest = new Request("PUT", "/_rollup/job/rollup-job-test");
final Request createRollupJobRequest = new Request("PUT", "/_xpack/rollup/job/rollup-job-test");
int pageSize = randomIntBetween(2, 50);
createRollupJobRequest.setJsonEntity("{"
+ "\"index_pattern\":\"rollup-*\","
@ -127,7 +127,7 @@ public class RollupIT extends ESRestTestCase {
assertThat(createRollupJobResponse.get("acknowledged"), equalTo(Boolean.TRUE));
// start the rollup job
final Request startRollupJobRequest = new Request("POST", "_rollup/job/rollup-job-test/_start");
final Request startRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-job-test/_start");
Map<String, Object> startRollupJobResponse = toMap(client().performRequest(startRollupJobRequest));
assertThat(startRollupJobResponse.get("started"), equalTo(Boolean.TRUE));
@ -135,7 +135,7 @@ public class RollupIT extends ESRestTestCase {
// Wait for the job to finish, by watching how many rollup docs we've indexed
assertBusy(() -> {
final Request getRollupJobRequest = new Request("GET", "_rollup/job/rollup-job-test");
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/rollup-job-test");
Response getRollupJobResponse = client().performRequest(getRollupJobRequest);
assertThat(getRollupJobResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus()));
@ -204,7 +204,7 @@ public class RollupIT extends ESRestTestCase {
waitForRollUpJob(rollupJob, states);
// check that the rollup job is started using the RollUp API
final Request getRollupJobRequest = new Request("GET", "_rollup/job/" + rollupJob);
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Map<String, Object> getRollupJobResponse = toMap(client().performRequest(getRollupJobRequest));
Map<String, Object> job = getJob(getRollupJobResponse, rollupJob);
if (job != null) {
@ -246,7 +246,7 @@ public class RollupIT extends ESRestTestCase {
private void waitForRollUpJob(final String rollupJob, String[] expectedStates) throws Exception {
assertBusy(() -> {
final Request getRollupJobRequest = new Request("GET", "_rollup/job/" + rollupJob);
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Response getRollupJobResponse = client().performRequest(getRollupJobRequest);
assertThat(getRollupJobResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus()));

8
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RollupIDUpgradeIT.java
View File

@ -88,7 +88,7 @@ public class RollupIDUpgradeIT extends AbstractUpgradeTestCase {
client().performRequest(indexRequest);
// create the rollup job
final Request createRollupJobRequest = new Request("PUT", "/_rollup/job/rollup-id-test");
final Request createRollupJobRequest = new Request("PUT", "/_xpack/rollup/job/rollup-id-test");
createRollupJobRequest.setJsonEntity("{"
+ "\"index_pattern\":\"target\","
+ "\"rollup_index\":\"rollup\","
@ -120,7 +120,7 @@ public class RollupIDUpgradeIT extends AbstractUpgradeTestCase {
client().performRequest(updateSettings);
// start the rollup job
final Request startRollupJobRequest = new Request("POST", "_rollup/job/rollup-id-test/_start");
final Request startRollupJobRequest = new Request("POST", "_xpack/rollup/job/rollup-id-test/_start");
Map<String, Object> startRollupJobResponse = entityAsMap(client().performRequest(startRollupJobRequest));
assertThat(startRollupJobResponse.get("started"), equalTo(Boolean.TRUE));
@ -225,7 +225,7 @@ public class RollupIDUpgradeIT extends AbstractUpgradeTestCase {
waitForRollUpJob(rollupJob, expectedStates);
// check that the rollup job is started using the RollUp API
final Request getRollupJobRequest = new Request("GET", "_rollup/job/" + rollupJob);
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Map<String, Object> getRollupJobResponse = entityAsMap(client().performRequest(getRollupJobRequest));
Map<String, Object> job = getJob(getRollupJobResponse, rollupJob);
if (job != null) {
@ -263,7 +263,7 @@ public class RollupIDUpgradeIT extends AbstractUpgradeTestCase {
private void waitForRollUpJob(final String rollupJob, final Matcher<?> expectedStates) throws Exception {
assertBusy(() -> {
final Request getRollupJobRequest = new Request("GET", "_rollup/job/" + rollupJob);
final Request getRollupJobRequest = new Request("GET", "_xpack/rollup/job/" + rollupJob);
Response getRollupJobResponse = client().performRequest(getRollupJobRequest);
assertThat(getRollupJobResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus()));