Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.xpack.core.action.XPackInfoAction;
import org.elasticsearch.xpack.core.action.XPackInfoRequestBuilder;
import org.elasticsearch.xpack.core.ccr.client.CcrClient;
import org.elasticsearch.xpack.core.datastreams.DataStreamClient;
import org.elasticsearch.xpack.core.enrich.client.EnrichClient;
import org.elasticsearch.xpack.core.frozen.action.FreezeIndexAction;
import org.elasticsearch.xpack.core.ilm.client.ILMClient;
Expand Down Expand Up @@ -45,6 +46,7 @@ public class XPackClient {
private final MachineLearningClient machineLearning;
private final ILMClient ilmClient;
private final EnrichClient enrichClient;
private final DataStreamClient dataStreamClient;

public XPackClient(Client client) {
this.client = Objects.requireNonNull(client, "client");
Expand All @@ -56,6 +58,7 @@ public XPackClient(Client client) {
this.machineLearning = new MachineLearningClient(client);
this.ilmClient = new ILMClient(client);
this.enrichClient = new EnrichClient(client);
this.dataStreamClient = new DataStreamClient(client);
}

public Client es() {
Expand Down Expand Up @@ -94,6 +97,10 @@ public EnrichClient enrichClient() {
return enrichClient;
}

public DataStreamClient dataStreamClient() {
return dataStreamClient;
}

public XPackClient withHeaders(Map<String, String> headers) {
return new XPackClient(client.filterWithHeader(headers));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.SharedGroupFactory;
import org.elasticsearch.transport.Transport;
import org.elasticsearch.xpack.core.action.CreateDataStreamAction;
import org.elasticsearch.xpack.core.action.DataStreamsStatsAction;
import org.elasticsearch.xpack.core.action.DeleteDataStreamAction;
import org.elasticsearch.xpack.core.action.GetDataStreamAction;
import org.elasticsearch.xpack.core.action.XPackInfoAction;
import org.elasticsearch.xpack.core.action.XPackUsageAction;
import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage;
Expand Down Expand Up @@ -489,7 +493,12 @@ public List<ActionType<? extends ActionResponse>> getClientActions() {
DeleteAsyncResultAction.INSTANCE,
// Point in time
OpenPointInTimeAction.INSTANCE,
ClosePointInTimeAction.INSTANCE
ClosePointInTimeAction.INSTANCE,
// Data streams,
CreateDataStreamAction.INSTANCE,
GetDataStreamAction.INSTANCE,
DeleteDataStreamAction.INSTANCE,
DataStreamsStatsAction.INSTANCE
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* 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.core.datastreams;

import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.xpack.core.action.CreateDataStreamAction;
import org.elasticsearch.xpack.core.action.DataStreamsStatsAction;
import org.elasticsearch.xpack.core.action.DeleteDataStreamAction;
import org.elasticsearch.xpack.core.action.GetDataStreamAction;

import java.util.Objects;

public class DataStreamClient {

private final ElasticsearchClient client;

public DataStreamClient(ElasticsearchClient client) {
this.client = Objects.requireNonNull(client);
}

public void createDataStream(CreateDataStreamAction.Request request, ActionListener<AcknowledgedResponse> listener) {
client.execute(CreateDataStreamAction.INSTANCE, request, listener);
}

public ActionFuture<AcknowledgedResponse> createDataStream(CreateDataStreamAction.Request request) {
final PlainActionFuture<AcknowledgedResponse> listener = PlainActionFuture.newFuture();
client.execute(CreateDataStreamAction.INSTANCE, request, listener);
return listener;
}

public void getDataStream(GetDataStreamAction.Request request, ActionListener<GetDataStreamAction.Response> listener) {
client.execute(GetDataStreamAction.INSTANCE, request, listener);
}

public ActionFuture<GetDataStreamAction.Response> getDataStream(GetDataStreamAction.Request request) {
final PlainActionFuture<GetDataStreamAction.Response> listener = PlainActionFuture.newFuture();
client.execute(GetDataStreamAction.INSTANCE, request, listener);
return listener;
}

public void deleteDataStream(DeleteDataStreamAction.Request request, ActionListener<AcknowledgedResponse> listener) {
client.execute(DeleteDataStreamAction.INSTANCE, request, listener);
}

public ActionFuture<AcknowledgedResponse> deleteDataStream(DeleteDataStreamAction.Request request) {
final PlainActionFuture<AcknowledgedResponse> listener = PlainActionFuture.newFuture();
client.execute(DeleteDataStreamAction.INSTANCE, request, listener);
return listener;
}

public void dataStreamsStats(DataStreamsStatsAction.Request request, ActionListener<DataStreamsStatsAction.Response> listener) {
client.execute(DataStreamsStatsAction.INSTANCE, request, listener);
}

public ActionFuture<DataStreamsStatsAction.Response> dataStreamsStats(DataStreamsStatsAction.Request request) {
final PlainActionFuture<DataStreamsStatsAction.Response> listener = PlainActionFuture.newFuture();
client.execute(DataStreamsStatsAction.INSTANCE, request, listener);
return listener;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* 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;

import org.elasticsearch.client.Client;
import org.elasticsearch.xpack.core.XPackClient;
import org.elasticsearch.xpack.core.action.CreateDataStreamAction;
import org.elasticsearch.xpack.core.action.DataStreamsStatsAction;
import org.elasticsearch.xpack.core.action.DeleteDataStreamAction;
import org.elasticsearch.xpack.core.action.GetDataStreamAction;
import org.elasticsearch.xpack.core.datastreams.DataStreamClient;

import static org.hamcrest.Matchers.equalTo;

public class DataStreamTransportClientIT extends ESXPackSmokeClientTestCase {

public void testTransportClientUsage() {
Client client = getClient();
XPackClient xPackClient = new XPackClient(client);
DataStreamClient dataStreamClient = xPackClient.dataStreamClient();

dataStreamClient.createDataStream(new CreateDataStreamAction.Request("logs-http-eu1")).actionGet();

GetDataStreamAction.Request getDataStreamRequest = new GetDataStreamAction.Request(new String[]{"logs-http-eu1"});
GetDataStreamAction.Response response = dataStreamClient.getDataStream(getDataStreamRequest).actionGet();
assertThat(response.getDataStreams().size(), equalTo(1));
assertThat(response.getDataStreams().get(0).getDataStream().getName(), equalTo("logs-http-eu1"));

DataStreamsStatsAction.Response dataStreamStatsResponse =
dataStreamClient.dataStreamsStats(new DataStreamsStatsAction.Request()).actionGet();
assertThat(dataStreamStatsResponse.getDataStreamCount(), equalTo(1));

DeleteDataStreamAction.Request deleteDataStreamRequest = new DeleteDataStreamAction.Request(new String[]{"logs-http-eu1"});
dataStreamClient.deleteDataStream(deleteDataStreamRequest).actionGet();
}

}