Skip to content
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

Rework Clients, Tools, and Data Prepper section #1794

Merged
merged 3 commits into from
Nov 7, 2022
Merged

Rework Clients, Tools, and Data Prepper section #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1979d4b
Rework Clients, Tools, and Data Prepper section
Naarcha-AWS Nov 2, 2022
70c1385
Add new Data Prepper files
Naarcha-AWS Nov 7, 2022
43d29ed
Merge main, fix conflicts
Naarcha-AWS Nov 7, 2022
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
293 changes: 0 additions & 293 deletions _clients/data-prepper/pipelines.md
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ collections:
clients:
permalink: /:collection/:path/
output: true
data-prepper:
permalink: /:collection/:path/
output: true
tools:
permalink: /:collection/:path/
output: true
api-reference:
permalink: /:collection/:path/
output: true
Expand Down Expand Up @@ -113,7 +119,13 @@ just_the_docs:
name: Notifications plugin
nav_fold: true
clients:
name: Clients and tools
name: Clients
nav_fold: true
data-prepper:
name: Data Prepper
nav_fold: true
tools:
name: Tools
nav_fold: true
api-reference:
name: API reference
Expand Down
4 changes: 4 additions & 0 deletions ...repper/configure-logstash-data-prepper.md → ...repper/configure-logstash-data-prepper.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
layout: default
title: Configure Logstash for Data Prepper
parent: Data Prepper
<<<<<<< HEAD:_data-prepper/configure-logstash-data-prepper.md
nav_order: 12
=======
nav_order: 2
>>>>>>> main:_clients/data-prepper/configure-logstash-data-prepper.md
---
# Configure Logstash for Data Prepper
You can run Data Prepper with a Logstash configuration.
Expand Down
5 changes: 3 additions & 2 deletions ...ts/data-prepper/data-prepper-reference.md → _data-prepper/data-prepper-reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
layout: default
title: Configuration reference
parent: Data Prepper
nav_order: 3
nav_order: 30
redirect_from:
- /clients/data-prepper/data-prepper-reference/
---

# Data Prepper configuration reference
Expand Down
5 changes: 3 additions & 2 deletions _clients/data-prepper/get-started.md → _data-prepper/get-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
layout: default
title: Get Started
parent: Data Prepper
nav_order: 1
nav_order: 10
redirect_from:
- /clients/data-prepper/get-started/
---

# Get started with Data Prepper
Expand Down
10 changes: 7 additions & 3 deletions _clients/data-prepper/index.md → _data-prepper/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
---
layout: default
title: Data Prepper
nav_order: 120
has_children: true
title: Data Prepper
nav_order: 1
has_children: false
has_toc: false
redirect_from:
- /clients/tools/data-prepper/
- /clients/data-prepper/
- /clients/data-prepper/index/
---

# Data Prepper
Expand Down
4 changes: 4 additions & 0 deletions _clients/data-prepper/migrate-open-distro.md → _data-prepper/migrate-open-distro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
layout: default
title: Migrating from Open Distro Data Prepper
parent: Data Prepper
<<<<<<< HEAD:_data-prepper/migrate-open-distro.md
nav_order: 11
=======
nav_order: 2
>>>>>>> main:_clients/data-prepper/migrate-open-distro.md
---

# Migrating from Open Distro Data Prepper
Expand Down
Loading