From 750e0695d264653396422c618435f42333e5b21c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 6 Jan 2022 12:29:52 +0000 Subject: [PATCH 1/5] Rename master to main for Beats project --- conf.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4c3647631b071..b64f2403502db 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1793,8 +1793,8 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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, 1.3, 1.2, 1.1, 1.0.1] - live: *stacklive + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + live: *stacklivemain chunk: 1 tags: Libbeat/Reference subject: libbeat @@ -1818,8 +1818,8 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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 ] - live: *stacklive + branches: [ {main: master}, 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 ] + live: *stacklivemain chunk: 1 tags: Auditbeat/Reference respect_edit_url_overrides: true @@ -1871,8 +1871,8 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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, 1.3, 1.2, 1.1, 1.0.1] - live: *stacklive + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + live: *stacklivemain chunk: 1 tags: Filebeat/Reference respect_edit_url_overrides: true @@ -1927,7 +1927,7 @@ contents: current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc branches: [ master, 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 ] - live: *stacklive + live: *stacklivemain chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true @@ -1975,8 +1975,8 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ master, 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 ] - live: *stacklive + branches: [ {main: master}, 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 ] + live: *stacklivemain chunk: 1 tags: Heartbeat/Reference respect_edit_url_overrides: true @@ -2022,8 +2022,8 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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 ] - live: *stacklive + branches: [ {main: master}, 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 ] + live: *stacklivemain chunk: 1 tags: Metricbeat/Reference respect_edit_url_overrides: true @@ -2079,8 +2079,8 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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, 1.3, 1.2, 1.1, 1.0.1] - live: *stacklive + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + live: *stacklivemain chunk: 1 tags: Packetbeat/Reference respect_edit_url_overrides: true @@ -2122,8 +2122,8 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ master, 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, 1.3, 1.2, 1.1 ] - live: *stacklive + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + live: *stacklivemain chunk: 1 tags: Winlogbeat/Reference respect_edit_url_overrides: true @@ -2165,8 +2165,8 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: master - branches: [ master, 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 ] - live: *stacklive + branches: [ {main: master}, 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 ] + live: *stacklivemain chunk: 1 tags: Devguide/Reference subject: Beats @@ -2196,7 +2196,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ master, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true From 1f2d20efc1096b5c104377ab869db14aceed6db1 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 3 Feb 2022 10:39:12 +0000 Subject: [PATCH 2/5] Update conf.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: István Zoltán Szabó --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index b64f2403502db..2bf76b2216985 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1926,7 +1926,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ master, 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 ] + branches: [ {main: master}, 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 ] live: *stacklivemain chunk: 1 tags: Functionbeat/Reference From 0ee7f0eee392c801dd9e6e57f2864ea55cbbf697 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 3 Feb 2022 11:07:39 +0000 Subject: [PATCH 3/5] beats: missing master reference --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 2bf76b2216985..24b0d3b79a3fb 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2164,7 +2164,7 @@ contents: - title: Beats Developer Guide prefix: en/beats/devguide index: docs/devguide/index.asciidoc - current: master + current: main branches: [ {main: master}, 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 ] live: *stacklivemain chunk: 1 From 8872b20e7031ea34f834d6de755ed2b493cda85d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 3 Feb 2022 11:18:17 +0000 Subject: [PATCH 4/5] beats: no more master branch --- conf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 24b0d3b79a3fb..57383fd1f6542 100644 --- a/conf.yaml +++ b/conf.yaml @@ -155,7 +155,6 @@ contents: repo: beats path: libbeat/docs exclude_branches: [ 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 ] - map_branches: *mapMainToMaster - repo: elasticsearch path: docs/ From 3ad948673d584353270b7f336a5cb4c520d16d65 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 3 Feb 2022 12:36:53 +0000 Subject: [PATCH 5/5] beats: no more master branch --- conf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 5f86d9b162e6b..9aa36b3c08ad3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1201,7 +1201,6 @@ contents: repo: beats path: libbeat/docs exclude_branches: [ 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 ] - map_branches: *mapMainToMaster - repo: docs path: shared/versions/stack/{version}.asciidoc