Fix merge conflict typo in Data Prepper (#1836)
This commit is contained in:
parent
71608d4ba6
commit
d8ff91b9f6
|
@ -2,12 +2,9 @@
|
||||||
layout: default
|
layout: default
|
||||||
title: Configure Logstash for Data Prepper
|
title: Configure Logstash for Data Prepper
|
||||||
parent: Data Prepper
|
parent: Data Prepper
|
||||||
<<<<<<< HEAD:_data-prepper/configure-logstash-data-prepper.md
|
|
||||||
nav_order: 12
|
nav_order: 12
|
||||||
=======
|
|
||||||
nav_order: 2
|
|
||||||
>>>>>>> main:_clients/data-prepper/configure-logstash-data-prepper.md
|
|
||||||
---
|
---
|
||||||
|
|
||||||
# Configure Logstash for Data Prepper
|
# Configure Logstash for Data Prepper
|
||||||
You can run Data Prepper with a Logstash configuration.
|
You can run Data Prepper with a Logstash configuration.
|
||||||
|
|
||||||
|
@ -45,4 +42,4 @@ The following output in your terminal indicates that Data Prepper is running cor
|
||||||
|
|
||||||
```
|
```
|
||||||
INFO org.opensearch.dataprepper.pipeline.ProcessWorker - log-pipeline Worker: No records received from buffer
|
INFO org.opensearch.dataprepper.pipeline.ProcessWorker - log-pipeline Worker: No records received from buffer
|
||||||
```
|
```
|
||||||
|
|
Loading…
Reference in New Issue