Skip to content

Commit ed25287

Browse files
committed
rename to recover_failure_document processor
1 parent 497382e commit ed25287

File tree

10 files changed

+52
-52
lines changed

10 files changed

+52
-52
lines changed

docs/changelog/133360.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pr: 133360
2-
summary: Add remediate processor to remediate failurestore docs
2+
summary: Add recover_failure_document processor to remediate failurestore docs
33
area: Ingest Node
44
type: feature
55
issues: []

docs/reference/enrich-processor/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Refer to [Enrich your data](docs-content://manage-data/ingest/transform-enrich/d
156156
[`lowercase` processor](/reference/enrich-processor/lowercase-processor.md) and [`uppercase` processor](/reference/enrich-processor/uppercase-processor.md)
157157
: Converts a string field to lowercase or uppercase.
158158

159-
[`remediate` processor](/reference/enrich-processor/remediate-processor.md)
159+
[`recover_failure_document` processor](/reference/enrich-processor/recover-failure-document-processor.md)
160160
: Converts failure store document to its original format.
161161

162162
[`split` processor](/reference/enrich-processor/split-processor.md)

docs/reference/enrich-processor/remediate-processor.md renamed to docs/reference/enrich-processor/recover-failure-document-processor.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
---
2-
navigation_title: "Remediate"
2+
navigation_title: "Recover Failure Document"
33
mapped_pages:
4-
- https://www.elastic.co/guide/en/elasticsearch/reference/current/remediate-processor.html
4+
- https://www.elastic.co/guide/en/elasticsearch/reference/current/recover_failure_document-processor.html
55
---
66

7-
# Remediate processor [remediate-processor]
7+
# Recover Failure Document processor [recover_failure_document-processor]
88

99
Remediates documents that have been stored in a data stream's failure store by restoring them to their original format. This processor is designed to work with documents that failed during ingestion and were automatically stored in the failure store with additional error metadata and document structure wrapping.
1010

11-
The remediate processor performs the following operations:
11+
The Recover Failure Document processor performs the following operations:
1212

1313
* Extracts the original document source from the `document.source` field
1414
* Restores the original index name from `document.index` to the document metadata
1515
* Restores the original routing value from `document.routing` to the document metadata (if present)
1616
* Removes the failure-related fields (`error` and `document`) from the document
1717
* Places all original source fields back at the root level of the document
1818

19-
$$$remediate-options$$$
19+
$$$recover_failure_document-options$$$
2020

2121
| Name | Required | Default | Description |
2222
| --- | --- | --- | --- |
@@ -26,15 +26,15 @@ $$$remediate-options$$$
2626
| `on_failure` | no | - | Handle failures for the processor. See [Handling pipeline failures](docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md#handling-pipeline-failures). |
2727
| `tag` | no | - | Identifier for the processor. Useful for debugging and metrics. |
2828

29-
## Examples [remediate-processor-ex]
29+
## Examples [recover_failure_document-processor-ex]
3030

3131
```console
3232
POST _ingest/pipeline/_simulate
3333
{
3434
"pipeline": {
3535
"processors": [
3636
{
37-
"remediate": {}
37+
"recover_failure_document": {}
3838
}
3939
]
4040
},
@@ -98,7 +98,7 @@ POST _ingest/pipeline/_simulate
9898
"pipeline": {
9999
"processors": [
100100
{
101-
"remediate": {}
101+
"recover_failure_document": {}
102102
}
103103
]
104104
},

docs/reference/enrich-processor/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ toc:
3232
- file: pipeline-processor.md
3333
- file: redact-processor.md
3434
- file: registered-domain-processor.md
35-
- file: remediate-processor.md
35+
- file: recover-failure-document-processor.md
3636
- file: remove-processor.md
3737
- file: rename-processor.md
3838
- file: reroute-processor.md

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/plugins/IngestCommonPluginBridge.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.elasticsearch.logstashbridge.plugins;
1010

1111
import org.elasticsearch.ingest.common.IngestCommonPlugin;
12-
import org.elasticsearch.ingest.common.RemediateProcessor;
12+
import org.elasticsearch.ingest.common.RecoverFailureDocumentProcessor;
1313
import org.elasticsearch.logstashbridge.StableBridgeAPI;
1414
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
1515

@@ -41,7 +41,7 @@ public class IngestCommonPluginBridge implements IngestPluginBridge {
4141
public static final String LOWERCASE_PROCESSOR_TYPE = org.elasticsearch.ingest.common.LowercaseProcessor.TYPE;
4242
public static final String NETWORK_DIRECTION_PROCESSOR_TYPE = org.elasticsearch.ingest.common.NetworkDirectionProcessor.TYPE;
4343
public static final String REGISTERED_DOMAIN_PROCESSOR_TYPE = org.elasticsearch.ingest.common.RegisteredDomainProcessor.TYPE;
44-
public static final String REMEDIATE_PROCESSOR_TYPE = RemediateProcessor.TYPE;
44+
public static final String RECOVER_FAILURE_DOCUMENT_PROCESSOR_TYPE = RecoverFailureDocumentProcessor.TYPE;
4545
public static final String REMOVE_PROCESSOR_TYPE = org.elasticsearch.ingest.common.RemoveProcessor.TYPE;
4646
public static final String RENAME_PROCESSOR_TYPE = org.elasticsearch.ingest.common.RenameProcessor.TYPE;
4747
public static final String REROUTE_PROCESSOR_TYPE = org.elasticsearch.ingest.common.RerouteProcessor.TYPE;

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
6464
entry(NetworkDirectionProcessor.TYPE, new NetworkDirectionProcessor.Factory(parameters.scriptService)),
6565
entry(PipelineProcessor.TYPE, new PipelineProcessor.Factory(parameters.ingestService)),
6666
entry(RegisteredDomainProcessor.TYPE, new RegisteredDomainProcessor.Factory()),
67-
entry(RemediateProcessor.TYPE, new RemediateProcessor.Factory()),
67+
entry(RecoverFailureDocumentProcessor.TYPE, new RecoverFailureDocumentProcessor.Factory()),
6868
entry(RemoveProcessor.TYPE, new RemoveProcessor.Factory(parameters.scriptService)),
6969
entry(RenameProcessor.TYPE, new RenameProcessor.Factory(parameters.scriptService)),
7070
entry(RerouteProcessor.TYPE, new RerouteProcessor.Factory()),

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RemediateProcessor.java renamed to modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RecoverFailureDocumentProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
* - Removing the "error" and "document" fields from the root
2424
* - Restoring the original source fields at the root of the document
2525
*/
26-
public final class RemediateProcessor extends AbstractProcessor {
26+
public final class RecoverFailureDocumentProcessor extends AbstractProcessor {
2727

28-
public static final String TYPE = "remediate";
28+
public static final String TYPE = "recover_failure_document";
2929

30-
RemediateProcessor(String tag, String description) {
30+
RecoverFailureDocumentProcessor(String tag, String description) {
3131
super(tag, description);
3232
}
3333

@@ -77,14 +77,14 @@ public String getType() {
7777

7878
public static final class Factory implements Processor.Factory {
7979
@Override
80-
public RemediateProcessor create(
80+
public RecoverFailureDocumentProcessor create(
8181
Map<String, Processor.Factory> registry,
8282
String processorTag,
8383
String description,
8484
Map<String, Object> config,
8585
ProjectId projectId
8686
) throws Exception {
87-
return new RemediateProcessor(processorTag, description);
87+
return new RecoverFailureDocumentProcessor(processorTag, description);
8888
}
8989
}
9090
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@
1717

1818
import static org.hamcrest.Matchers.equalTo;
1919

20-
public class RemediateProcessorFactoryTests extends ESTestCase {
20+
public class RecoverFailureDocumentProcessorFactoryTests extends ESTestCase {
2121

22-
private RemediateProcessor.Factory factory;
22+
private RecoverFailureDocumentProcessor.Factory factory;
2323

2424
@Before
2525
public void init() {
26-
factory = new RemediateProcessor.Factory();
26+
factory = new RecoverFailureDocumentProcessor.Factory();
2727
}
2828

2929
public void testCreate() throws Exception {
30-
RemediateProcessor.Factory factory = new RemediateProcessor.Factory();
30+
RecoverFailureDocumentProcessor.Factory factory = new RecoverFailureDocumentProcessor.Factory();
3131
Map<String, Object> config = new HashMap<>();
3232

3333
String processorTag = randomAlphaOfLength(10);
34-
RemediateProcessor processor = factory.create(null, processorTag, null, config, null);
34+
RecoverFailureDocumentProcessor processor = factory.create(null, processorTag, null, config, null);
3535

3636
assertThat(processor.getTag(), equalTo(processorTag));
3737
}
3838

3939
public void testCreateWithDescription() throws Exception {
40-
RemediateProcessor.Factory factory = new RemediateProcessor.Factory();
40+
RecoverFailureDocumentProcessor.Factory factory = new RecoverFailureDocumentProcessor.Factory();
4141
Map<String, Object> config = new HashMap<>();
4242

4343
String processorTag = randomAlphaOfLength(10);
4444
String description = randomAlphaOfLength(20);
45-
RemediateProcessor processor = factory.create(null, processorTag, description, config, null);
45+
RecoverFailureDocumentProcessor processor = factory.create(null, processorTag, description, config, null);
4646

4747
assertThat(processor.getTag(), equalTo(processorTag));
4848
assertThat(processor.getDescription(), equalTo(description));

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemediateProcessorTests.java renamed to modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RecoverFailureDocumentProcessorTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import static org.hamcrest.Matchers.equalTo;
2121
import static org.hamcrest.Matchers.is;
2222

23-
public class RemediateProcessorTests extends ESTestCase {
23+
public class RecoverFailureDocumentProcessorTests extends ESTestCase {
2424

25-
private static Processor createRemediateProcessor() {
26-
return new RemediateProcessor(randomAlphaOfLength(8), null);
25+
private static Processor createRecoverFailureDocumentProcessor() {
26+
return new RecoverFailureDocumentProcessor(randomAlphaOfLength(8), null);
2727
}
2828

2929
private static IngestDocument createFailureDoc(
@@ -55,8 +55,8 @@ private static IngestDocument createFailureDoc(
5555
return new IngestDocument(sourceAndMetadata, ingestMetadata);
5656
}
5757

58-
public void testRemediate_basic() throws Exception {
59-
Processor processor = createRemediateProcessor();
58+
public void testRecoverFailureDocument_basic() throws Exception {
59+
Processor processor = createRecoverFailureDocumentProcessor();
6060

6161
Map<String, Object> originalSource = new HashMap<>();
6262
originalSource.put("a", 1);
@@ -80,8 +80,8 @@ public void testRemediate_basic() throws Exception {
8080
assertThat(doc.hasField("document", true), is(false));
8181
}
8282

83-
public void testRemediate_withRouting() throws Exception {
84-
Processor processor = createRemediateProcessor();
83+
public void testRecoverFailureDocument_withRouting() throws Exception {
84+
Processor processor = createRecoverFailureDocumentProcessor();
8585

8686
Map<String, Object> originalSource = new HashMap<>();
8787
originalSource.put("nested", Map.of("k", "v"));
@@ -97,8 +97,8 @@ public void testRemediate_withRouting() throws Exception {
9797
assertThat(doc.hasField("document", true), is(false));
9898
}
9999

100-
public void testRemediate_missingDocument_throws() {
101-
Processor processor = createRemediateProcessor();
100+
public void testRecoverFailureDocument_missingDocument_throws() {
101+
Processor processor = createRecoverFailureDocumentProcessor();
102102

103103
Map<String, Object> sourceAndMetadata = new HashMap<>();
104104
sourceAndMetadata.put("_index", "failure-index");
@@ -112,8 +112,8 @@ public void testRemediate_missingDocument_throws() {
112112
assertThat(e.getMessage(), containsString("document"));
113113
}
114114

115-
public void testRemediate_missingSourceInsideDocument_throws() {
116-
Processor processor = createRemediateProcessor();
115+
public void testRecoverFailureDocument_missingSourceInsideDocument_throws() {
116+
Processor processor = createRecoverFailureDocumentProcessor();
117117

118118
Map<String, Object> sourceAndMetadata = new HashMap<>();
119119
sourceAndMetadata.put("_index", "failure-index");

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/340_remediate_processor.yml renamed to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/340_recover_failure_document_processor.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ setup:
3535
field: count
3636
value: "not_a_number" # This will cause a mapping failure
3737

38-
# Create a remediation-pipeline with remediate processor
38+
# Create a remediation-pipeline with recover_failure_document processor
3939
- do:
4040
ingest.put_pipeline:
4141
id: "remediation_pipeline"
4242
body:
4343
description: "Pipeline to remediate failed documents"
4444
processors:
45-
- remediate: {}
45+
- recover_failure_document: {}
4646

4747
---
4848
teardown:
4949
- do:
5050
indices.delete_data_stream:
51-
name: test-logs-remediate
51+
name: test-logs-recover_failure_document
5252
ignore: 404
5353

5454
- do:
@@ -67,11 +67,11 @@ teardown:
6767
ignore: 404
6868

6969
---
70-
"Test remediate processor with data stream failure store":
70+
"Test recover_failure_document processor with data stream failure store":
7171
# Create the data stream by indexing a document
7272
- do:
7373
index:
74-
index: test-logs-remediate
74+
index: test-logs-recover_failure_document
7575
routing: custom-route-123
7676
pipeline: failing_pipeline
7777
body:
@@ -82,20 +82,20 @@ teardown:
8282
# Wait for the failure store to be populated
8383
- do:
8484
indices.refresh:
85-
index: ".fs-test-logs-remediate-*"
85+
index: ".fs-test-logs-recover_failure_document-*"
8686

8787
# Check that document went to failure store
8888
- do:
8989
search:
90-
index: ".fs-test-logs-remediate-*"
90+
index: ".fs-test-logs-recover_failure_document-*"
9191
body:
9292
query:
9393
match_all: {}
9494

9595
- match: { hits.total.value: 1 }
9696
- match: { hits.hits.0._source.document.source.message: "test message" }
9797
- match: { hits.hits.0._source.document.source.count: "not_a_number" }
98-
- match: { hits.hits.0._source.document.index: "test-logs-remediate" }
98+
- match: { hits.hits.0._source.document.index: "test-logs-recover_failure_document" }
9999
- match: { hits.hits.0._source.document.routing: "custom-route-123" }
100100
- is_true: hits.hits.0._source.error
101101

@@ -108,28 +108,28 @@ teardown:
108108
body:
109109
pipeline:
110110
processors:
111-
- remediate: {}
111+
- recover_failure_document: {}
112112
docs:
113113
- _source: $original_source
114-
_index: "test-logs-remediate"
114+
_index: "test-logs-recover_failure_document"
115115
_id: "${failure_doc_id}"
116116

117117
# Check that it is using the remediated format
118-
- match: { docs.0.doc._index: "test-logs-remediate" }
118+
- match: { docs.0.doc._index: "test-logs-recover_failure_document" }
119119
- match: { docs.0.doc._routing: "custom-route-123" }
120120
- match: { docs.0.doc._source.message: "test message" }
121121
- match: { docs.0.doc._source.count: "not_a_number" }
122122
- is_false: docs.0.doc._source.error
123123
- is_false: docs.0.doc._source.document
124124

125125
---
126-
"Test remediate processor error handling - missing document field":
126+
"Test recover_failure_document processor error handling - missing document field":
127127
- do:
128128
ingest.simulate:
129129
body:
130130
pipeline:
131131
processors:
132-
- remediate: {}
132+
- recover_failure_document: {}
133133
docs:
134134
- _source:
135135
error: "simulated failure"
@@ -141,13 +141,13 @@ teardown:
141141
- match: { docs.0.error.reason: "field [document] not present as part of path [document]" }
142142

143143
---
144-
"Test remediate processor error handling - missing source field":
144+
"Test recover_failure_document processor error handling - missing source field":
145145
- do:
146146
ingest.simulate:
147147
body:
148148
pipeline:
149149
processors:
150-
- remediate: {}
150+
- recover_failure_document: {}
151151
docs:
152152
- _source:
153153
error: "simulated failure"

0 commit comments

Comments
 (0)