Skip to content

[ML] [Data Frame] adding and modifying auditor messages #42722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2019
Merged

[ML] [Data Frame] adding and modifying auditor messages #42722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26f4af6
[ML] [Data Frame] adding and modifying auditor messages
benwtrent May 30, 2019
8ff9bc9
Update DataFrameTransformTask.java
benwtrent May 31, 2019
e67c892
Merge branch 'master' into feature/ml-df-add-more-notifications
benwtrent Jun 3, 2019
e2264fa
Merge branch 'feature/ml-df-add-more-notifications' of github.com:ben…
benwtrent Jun 3, 2019
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
10 changes: 8 additions & 2 deletions ...ava/org/elasticsearch/xpack/dataframe/action/TransportDeleteDataFrameTransformAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,24 @@
import org.elasticsearch.transport.TransportService;
import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction;
import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction.Request;
import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor;
import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager;

import java.io.IOException;

public class TransportDeleteDataFrameTransformAction extends TransportMasterNodeAction<Request, AcknowledgedResponse> {

private final DataFrameTransformsConfigManager transformsConfigManager;
private final DataFrameAuditor auditor;

@Inject
public TransportDeleteDataFrameTransformAction(TransportService transportService, ActionFilters actionFilters, ThreadPool threadPool,
ClusterService clusterService, IndexNameExpressionResolver indexNameExpressionResolver,
DataFrameTransformsConfigManager transformsConfigManager) {
DataFrameTransformsConfigManager transformsConfigManager, DataFrameAuditor auditor) {
super(DeleteDataFrameTransformAction.NAME, transportService, clusterService, threadPool, actionFilters,
Request::new, indexNameExpressionResolver);
this.transformsConfigManager = transformsConfigManager;
this.auditor = auditor;
}

@Override
Expand Down Expand Up @@ -65,7 +68,10 @@ protected void masterOperation(Request request, ClusterState state, ActionListen
} else {
// Task is not running, delete the configuration document
transformsConfigManager.deleteTransform(request.getId(), ActionListener.wrap(
r -> listener.onResponse(new AcknowledgedResponse(r)),
r -> {
auditor.info(request.getId(), "Deleted data frame transform.");
listener.onResponse(new AcknowledgedResponse(r));
},
listener::onFailure));
}
}
Expand Down
11 changes: 9 additions & 2 deletions ...n/java/org/elasticsearch/xpack/dataframe/action/TransportPutDataFrameTransformAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
import org.elasticsearch.xpack.core.security.authz.permission.ResourcePrivileges;
import org.elasticsearch.xpack.core.security.support.Exceptions;
import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor;
import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager;
import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot;

Expand All @@ -65,19 +66,22 @@ public class TransportPutDataFrameTransformAction
private final Client client;
private final DataFrameTransformsConfigManager dataFrameTransformsConfigManager;
private final SecurityContext securityContext;
private final DataFrameAuditor auditor;

@Inject
public TransportPutDataFrameTransformAction(Settings settings, TransportService transportService, ThreadPool threadPool,
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
ClusterService clusterService, XPackLicenseState licenseState,
DataFrameTransformsConfigManager dataFrameTransformsConfigManager, Client client) {
DataFrameTransformsConfigManager dataFrameTransformsConfigManager, Client client,
DataFrameAuditor auditor) {
super(PutDataFrameTransformAction.NAME, transportService, clusterService, threadPool, actionFilters,
PutDataFrameTransformAction.Request::new, indexNameExpressionResolver);
this.licenseState = licenseState;
this.client = client;
this.dataFrameTransformsConfigManager = dataFrameTransformsConfigManager;
this.securityContext = XPackSettings.SECURITY_ENABLED.get(settings) ?
new SecurityContext(settings, threadPool.getThreadContext()) : null;
this.auditor = auditor;
}

@Override
Expand Down Expand Up @@ -234,7 +238,10 @@ private void putDataFrame(DataFrameTransformConfig config, ActionListener<Acknow

// <5> Return the listener, or clean up destination index on failure.
ActionListener<Boolean> putTransformConfigurationListener = ActionListener.wrap(
putTransformConfigurationResult -> listener.onResponse(new AcknowledgedResponse(true)),
putTransformConfigurationResult -> {
auditor.info(config.getId(), "Created data frame transform.");
listener.onResponse(new AcknowledgedResponse(true));
},
listener::onFailure
);

Expand Down
5 changes: 2 additions & 3 deletions ...java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,10 @@ protected void masterOperation(StartDataFrameTransformAction.Request request,

if(dest.length == 0) {
auditor.info(request.getId(),
"Could not find destination index [" + destinationIndex + "]." +
" Creating index with deduced mappings.");
"Creating destination index [" + destinationIndex + "] with deduced mappings.");
createDestinationIndex(config, createOrGetIndexListener);
} else {
auditor.info(request.getId(), "Destination index [" + destinationIndex + "] already exists.");
auditor.info(request.getId(), "Using existing destination index [" + destinationIndex + "].");
ClientHelper.executeAsyncWithOrigin(client.threadPool().getThreadContext(),
ClientHelper.DATA_FRAME_ORIGIN,
client.admin()
Expand Down
16 changes: 9 additions & 7 deletions ...me/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ public synchronized void start(Long startingCheckpoint, ActionListener<Response>
logger.info("Updating state for data frame transform [{}] to [{}]", transform.getId(), state.toString());
persistStateToClusterState(state, ActionListener.wrap(
task -> {
auditor.info(transform.getId(), "Updated state to [" + state.getTaskState() + "]");
auditor.info(transform.getId(),
"Updated data frame transform state to [" + state.getTaskState() + "].");
long now = System.currentTimeMillis();
// kick off the indexer
triggered(new Event(schedulerJobName(), now, now));
Expand Down Expand Up @@ -293,10 +294,9 @@ void persistStateToClusterState(DataFrameTransformState state,
synchronized void markAsFailed(String reason, ActionListener<Void> listener) {
taskState.set(DataFrameTransformTaskState.FAILED);
stateReason.set(reason);
auditor.error(transform.getId(), reason);
persistStateToClusterState(getState(), ActionListener.wrap(
r -> {
listener.onResponse(null);
},
r -> listener.onResponse(null),
listener::onFailure
));
}
Expand Down Expand Up @@ -560,6 +560,8 @@ protected void doSaveState(IndexerState indexerState, Map<String, Object> positi
},
statsExc -> {
logger.error("Updating stats of transform [" + transformConfig.getId() + "] failed", statsExc);
auditor.warning(getJobId(),
"Failure updating stats of transform: " + statsExc.getMessage());
next.run();
}
));
Expand Down Expand Up @@ -588,7 +590,7 @@ protected void onFinish(ActionListener<Void> listener) {
try {
super.onFinish(listener);
long checkpoint = transformTask.currentCheckpoint.incrementAndGet();
auditor.info(transformTask.getTransformId(), "Finished indexing for data frame transform checkpoint [" + checkpoint + "]");
auditor.info(transformTask.getTransformId(), "Finished indexing for data frame transform checkpoint [" + checkpoint + "].");
logger.info(
"Finished indexing for data frame transform [" + transformTask.getTransformId() + "] checkpoint [" + checkpoint + "]");
listener.onResponse(null);
Expand All @@ -599,14 +601,14 @@ protected void onFinish(ActionListener<Void> listener) {

@Override
protected void onStop() {
auditor.info(transformConfig.getId(), "Indexer has stopped");
auditor.info(transformConfig.getId(), "Data frame transform has stopped.");
logger.info("Data frame transform [{}] indexer has stopped", transformConfig.getId());
transformTask.shutdown();
}

@Override
protected void onAbort() {
auditor.info(transformConfig.getId(), "Received abort request, stopping indexer");
auditor.info(transformConfig.getId(), "Received abort request, stopping data frame transform.");
logger.info("Data frame transform [" + transformConfig.getId() + "] received abort request, stopping indexer");
transformTask.shutdown();
}
Expand Down