From b76325f421ae43e4db186e257aa49796128e77b2 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 25 Jun 2025 17:31:38 -0500 Subject: [PATCH 1/9] publish logstash plugins to be consumed by logstash-docs-md --- conf.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/conf.yaml b/conf.yaml index 772e9337285eb..6305401152b2d 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1644,6 +1644,23 @@ contents: repo: docs path: shared/legacy-attrs.asciidoc exclude_branches: [ 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0] + - title: Logstash Plugins + prefix: en/logstash-plugins + current: main + branches: [ main ] + index: docs/plugins/index.asciidoc + private: 1 + chunk: 1 + noindex: 1 + tags: Logstash/Plugin Reference + subject: Logstash + sources: + - + repo: logstash-docs + path: docs/plugins + - + repo: docs + path: shared/attributes.asciidoc - title: Logstash Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs From 3dfa97d9ca60c31a97e1e96a8b765c184fbf1d22 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 25 Jun 2025 18:30:19 -0500 Subject: [PATCH 2/9] attempt to fix broken links --- conf.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 6305401152b2d..f1ea0416968fc 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1646,18 +1646,23 @@ contents: exclude_branches: [ 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0] - title: Logstash Plugins prefix: en/logstash-plugins - current: main - branches: [ main ] - index: docs/plugins/index.asciidoc + current: 8.19 + branches: [ { 8.19: 8.x } ] + index: docs/index.x.asciidoc private: 1 chunk: 1 noindex: 1 tags: Logstash/Plugin Reference subject: Logstash sources: + - + repo: logstash + path: docs/ - repo: logstash-docs path: docs/plugins + map_branches: + main: 8.19 - repo: docs path: shared/attributes.asciidoc From 0d0a257870263235c97b74f68cf750a71c8bfea6 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 26 Jun 2025 17:00:48 -0500 Subject: [PATCH 3/9] reorg conf --- conf.yaml | 64 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/conf.yaml b/conf.yaml index f1ea0416968fc..15cca5b383f40 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1644,28 +1644,6 @@ contents: repo: docs path: shared/legacy-attrs.asciidoc exclude_branches: [ 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0] - - title: Logstash Plugins - prefix: en/logstash-plugins - current: 8.19 - branches: [ { 8.19: 8.x } ] - index: docs/index.x.asciidoc - private: 1 - chunk: 1 - noindex: 1 - tags: Logstash/Plugin Reference - subject: Logstash - sources: - - - repo: logstash - path: docs/ - - - repo: logstash-docs - path: docs/plugins - map_branches: - main: 8.19 - - - repo: docs - path: shared/attributes.asciidoc - title: Logstash Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -3097,6 +3075,48 @@ contents: path: /docs/kr prefix: elasticsearch-extra/x-pack-elasticsearch + ################################################################## + ## DO NOT DELETE !! + ## This book is used to generate the Markdown files that end up + ## in the elastic/logstash-docs-md repo. Those files are used to + ## publish the pages in this section of the new docs site: + ## https://www.elastic.co/docs/reference/logstash/plugins + ## + ## For more context see: https://github.com/elastic/docs/pull/3235 + ################################################################## + - title: Logstash Plugins only 👻 + prefix: en/logstash-plugins-only + # We're using `8.19` because it is the latest branch of the + # logstash repo that contains AsciiDoc files. We will NOT + # actually be using the `8.19` content in + # https://www.elastic.co/docs/reference/logstash/plugins. + # That content will come from the logstash-docs repo's + # `main` branch. + current: 8.19 + branches: [ { 8.19: 9.x } ] + index: docs/index.x.asciidoc + private: 1 + chunk: 1 + # We do _not_ want these pages to be indexed. + noindex: 1 + tags: Logstash/Plugin Reference + subject: Logstash + sources: + - + repo: logstash + path: docs/ + - + repo: logstash-docs + path: docs/plugins + # Use the files on the `main` branch instead of on the + # `8.19` branch just for plugin pages coming from the + # logstash-docs repo. + map_branches: + main: 8.19 + - + repo: docs + path: shared/attributes.asciidoc + redirects: - prefix: en/ From 0e9b6607126334349c8bb7bfc1b3a22ddd786bb9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Fri, 27 Jun 2025 14:14:47 -0500 Subject: [PATCH 4/9] maybe less confusing to use main... --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 15cca5b383f40..bd4982a27583e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3093,7 +3093,7 @@ contents: # That content will come from the logstash-docs repo's # `main` branch. current: 8.19 - branches: [ { 8.19: 9.x } ] + branches: [ { 8.19: main } ] index: docs/index.x.asciidoc private: 1 chunk: 1 From c4b4e016f338671d09a9038a7678e003880ef2d8 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 7 Jul 2025 14:49:01 -0500 Subject: [PATCH 5/9] try 9.0 --- conf.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/conf.yaml b/conf.yaml index bd4982a27583e..3865f287402a8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3086,14 +3086,8 @@ contents: ################################################################## - title: Logstash Plugins only 👻 prefix: en/logstash-plugins-only - # We're using `8.19` because it is the latest branch of the - # logstash repo that contains AsciiDoc files. We will NOT - # actually be using the `8.19` content in - # https://www.elastic.co/docs/reference/logstash/plugins. - # That content will come from the logstash-docs repo's - # `main` branch. - current: 8.19 - branches: [ { 8.19: main } ] + current: 9.0 + branches: { 9.0: 9.x } index: docs/index.x.asciidoc private: 1 chunk: 1 @@ -3102,17 +3096,9 @@ contents: tags: Logstash/Plugin Reference subject: Logstash sources: - - - repo: logstash - path: docs/ - repo: logstash-docs path: docs/plugins - # Use the files on the `main` branch instead of on the - # `8.19` branch just for plugin pages coming from the - # logstash-docs repo. - map_branches: - main: 8.19 - repo: docs path: shared/attributes.asciidoc From 66aa9447edab7ddebabfd676da817b39114c058c Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 7 Jul 2025 16:23:09 -0500 Subject: [PATCH 6/9] fix branches --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 3865f287402a8..c83a15db7fe8b 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3087,7 +3087,7 @@ contents: - title: Logstash Plugins only 👻 prefix: en/logstash-plugins-only current: 9.0 - branches: { 9.0: 9.x } + branches: [ { 9.0: 9.x } ] index: docs/index.x.asciidoc private: 1 chunk: 1 From ea4917f267df8bf2e5254f3b333c2734d33a89b7 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 7 Jul 2025 16:25:20 -0500 Subject: [PATCH 7/9] update index --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index c83a15db7fe8b..3bd85b774badc 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3088,7 +3088,7 @@ contents: prefix: en/logstash-plugins-only current: 9.0 branches: [ { 9.0: 9.x } ] - index: docs/index.x.asciidoc + index: docs/index.asciidoc private: 1 chunk: 1 # We do _not_ want these pages to be indexed. From 6d3719d63c11f43b636223bdd9cf6f95f9a65c5f Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 7 Jul 2025 17:40:30 -0500 Subject: [PATCH 8/9] update index --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 3bd85b774badc..1b288023fb30a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3088,7 +3088,7 @@ contents: prefix: en/logstash-plugins-only current: 9.0 branches: [ { 9.0: 9.x } ] - index: docs/index.asciidoc + index: docs/plugins/index.asciidoc private: 1 chunk: 1 # We do _not_ want these pages to be indexed. From 8870662ca8654cea4f77c622d8c5f03df96d43eb Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 7 Jul 2025 19:01:25 -0500 Subject: [PATCH 9/9] update branches --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 1b288023fb30a..2fdd857fd7227 100644 --- a/conf.yaml +++ b/conf.yaml @@ -3087,7 +3087,7 @@ contents: - title: Logstash Plugins only 👻 prefix: en/logstash-plugins-only current: 9.0 - branches: [ { 9.0: 9.x } ] + branches: [ 9.0 ] index: docs/plugins/index.asciidoc private: 1 chunk: 1