From d696c8e5e353d5c325aa1eb5029c35b3c45e54b8 Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Mon, 23 Aug 2021 10:19:17 +0300 Subject: [PATCH 0001/1049] ece: Update branches for upcoming 2.12.0 release Updates the branches for: ECE, ecctl and the Terraform Provider for the upcoming ECE 2.12.0 release. Signed-off-by: Marc Lopez Rubio --- conf.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index 9ac7fc480c787..a0282b512feb9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -757,8 +757,8 @@ contents: prefix: en/cloud-enterprise tags: CloudEnterprise/Reference subject: ECE - current: ms-59 - branches: [ {'ms-59': 2.11}, {'ms-57': 2.10}, {'ms-53': 2.9}, {'ms-49': 2.8}, {'ms-47': 2.7}, {'release-ms-41': 2.6}, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.1, 1.0 ] + current: ms-62 + branches: [ {'ms-62': 2.12}, {'ms-59': 2.11}, {'ms-57': 2.10}, {'ms-53': 2.9}, {'ms-49': 2.8}, {'ms-47': 2.7}, {'release-ms-41': 2.6}, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.1, 1.0 ] index: docs/cloud-enterprise/index.asciidoc chunk: 2 private: 1 @@ -774,6 +774,7 @@ contents: repo: cloud-assets path: docs map_branches: &mapCloudEceToCloudAssets + ms-62: master ms-59: master ms-57: master ms-53: master @@ -793,6 +794,7 @@ contents: repo: clients-team path: docs/examples/elastic-cloud/php map_branches: &mapCloudEceToClientsTeam + ms-62: master ms-59: master ms-57: master ms-53: master @@ -860,8 +862,8 @@ contents: prefix: en/ecctl tags: CloudControl/Reference subject: ECCTL - current: 1.5 - branches: [ master, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + current: 1.6 + branches: [ master, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] index: docs/index.asciidoc chunk: 1 sources: @@ -872,8 +874,8 @@ contents: prefix: en/tpec tags: CloudTerraform/Reference subject: TPEC - current: 0.1 - branches: [ master, 0.1 ] + current: 0.2 + branches: [ master, 0.2, 0.1 ] index: docs-elastic/index.asciidoc single: 1 chunk: 1 From 629b75c5704e6f3cd17229dcfd80dc08768e8b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Thu, 16 Sep 2021 14:22:06 +0200 Subject: [PATCH 0002/1049] Updates the master.asciidoc version to 8.0.0-alpha2. (#2206) --- shared/versions/stack/master.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 8f9aea512c5d9..4dc1cf716b441 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -1,12 +1,12 @@ -:version: 8.0.0-alpha1 +:version: 8.0.0-alpha2 //// bare_version never includes -alpha or -beta //// :bare_version: 8.0.0 -:logstash_version: 8.0.0-alpha1 -:elasticsearch_version: 8.0.0-alpha1 -:kibana_version: 8.0.0-alpha1 -:apm_server_version: 8.0.0-alpha1 +:logstash_version: 8.0.0-alpha2 +:elasticsearch_version: 8.0.0-alpha2 +:kibana_version: 8.0.0-alpha2 +:apm_server_version: 8.0.0-alpha2 :branch: master :minor-version: 8.0 :major-version: 8.x From f540dd0fbbb7250e07580fca87d6704bc4a9b23e Mon Sep 17 00:00:00 2001 From: Adam Locke Date: Thu, 16 Sep 2021 09:23:28 -0400 Subject: [PATCH 0003/1049] 7.14.2 version bump Increments version for the 7.14.2 release **DO NOT MERGE UNTIL RELEASE DAY** --- shared/versions/stack/7.14.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.14.asciidoc b/shared/versions/stack/7.14.asciidoc index 65e0bc9e07b85..6fa2dae78801d 100644 --- a/shared/versions/stack/7.14.asciidoc +++ b/shared/versions/stack/7.14.asciidoc @@ -1,12 +1,12 @@ -:version: 7.14.1 +:version: 7.14.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.14.1 -:logstash_version: 7.14.1 -:elasticsearch_version: 7.14.1 -:kibana_version: 7.14.1 -:apm_server_version: 7.14.1 +:bare_version: 7.14.2 +:logstash_version: 7.14.2 +:elasticsearch_version: 7.14.2 +:kibana_version: 7.14.2 +:apm_server_version: 7.14.2 :branch: 7.14 :minor-version: 7.14 :major-version: 7.x From a2849dfbf7ac34acf723b53e95230ebc14c87ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Mon, 20 Sep 2021 10:13:56 +0200 Subject: [PATCH 0004/1049] Renames deprecated Java API to Java Transport Client. (#2220) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 63355599d30a4..e1e7823bf45f3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -612,7 +612,7 @@ contents: - repo: elasticsearch-rs path: docs/ - - title: Java API (deprecated) + - title: Java Transport Client (deprecated) prefix: java-api current: *stackcurrent branches: [ 7.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] From c58a8fcdc98425795dc96e480198a70d1477ea3d Mon Sep 17 00:00:00 2001 From: Sebastien Guilloux Date: Mon, 20 Sep 2021 11:33:03 +0200 Subject: [PATCH 0005/1049] Add ECK 1.8 to the list of ECK branches (#2218) We are about to release ECK 1.8.0, this commit adds the 1.8 branch to the list of branches to build docs for. --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index e1e7823bf45f3..87c41f78b6dd1 100644 --- a/conf.yaml +++ b/conf.yaml @@ -878,7 +878,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 1.7 - branches: [ master, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ master, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From 6713b8d604911d0bedd9a9b6c57a1547c187d3e5 Mon Sep 17 00:00:00 2001 From: Greg Back Date: Mon, 20 Sep 2021 14:32:22 -0400 Subject: [PATCH 0006/1049] Fix building TOCs when version != branch This code was looking in directories named after the branch, not the version. As a result, we weren't getting version dropdowns in the TOCs on the right side of the page when the version (directory) didn't match the branch. Fixes #1930 --- lib/ES/Book.pm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 7282399e42142..8644efa19d6ed 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -218,11 +218,13 @@ sub build { # that information right now. $toc->write( $self->{raw_dir}, $dir, $self->{temp_dir} ); for ( @{ $self->branches } ) { - $self->_update_title_and_version_drop_downs( $dir->subdir( $_ ), $_ ); + my $version = $self->branch_title($_); + $self->_update_title_and_version_drop_downs( $dir->subdir( $version ), $_ ); } $self->_update_title_and_version_drop_downs( $dir->subdir( 'current' ) , $self->current ); for ( @{ $self->branches } ) { - $self->_update_title_and_version_drop_downs( $self->{raw_dir}->subdir( $_ ), $_ ); + my $version = $self->branch_title($_); + $self->_update_title_and_version_drop_downs( $self->{raw_dir}->subdir( $version ), $_ ); } $self->_update_title_and_version_drop_downs( $self->{raw_dir}->subdir( 'current' ) , $self->current ); } @@ -259,8 +261,8 @@ sub _build_book { my ( $self, $branch, $pm, $rebuild, $latest ) = @_; my $version = $self->branch_title($branch); - my $raw_branch_dir = $self->{raw_dir}->subdir( $version ); - my $branch_dir = $self->dir->subdir($version); + my $raw_version_dir = $self->{raw_dir}->subdir( $version ); + my $version_dir = $self->dir->subdir($version); my $source = $self->source; my $index = $self->index; my $section_title = $self->section_title($version); @@ -279,8 +281,8 @@ sub _build_book { if ( $self->single ) { build_single( $first_path->file($index), - $raw_branch_dir, - $branch_dir, + $raw_version_dir, + $version_dir, version => $version, lang => $lang, edit_urls => $edit_urls, @@ -303,8 +305,8 @@ sub _build_book { else { build_chunked( $first_path->file($index), - $raw_branch_dir, - $branch_dir, + $raw_version_dir, + $version_dir, version => $version, lang => $lang, edit_urls => $edit_urls, @@ -344,7 +346,7 @@ sub _build_book { #=================================== sub _update_title_and_version_drop_downs { #=================================== - my ( $self, $branch_dir, $branch ) = @_; + my ( $self, $version_dir, $branch ) = @_; my $title = '
  • ' . $self->title . ': '; $title .= ' + + + + +
    + {null} +
    + )); + }); + + test("selects the consoleAlternative from the props", () => { + expect(select.value).toBe("console"); + }); + }); + describe("when the console alternative isn't in the options", () => { const picker = render(<_AlternativePicker consoleAlternative="bort" diff --git a/resources/web/docs_js/components/alternative_picker.jsx b/resources/web/docs_js/components/alternative_picker.jsx index 31ae94148dda5..6c20155149ef1 100644 --- a/resources/web/docs_js/components/alternative_picker.jsx +++ b/resources/web/docs_js/components/alternative_picker.jsx @@ -17,8 +17,8 @@ const alternativePrettyName = rawName => { } }; -const AlternativeChoice = ({name: name}) => { - return ; +const AlternativeChoice = ({name: name, disabled: disabled}) => { + return ; }; export class _AlternativePicker extends Component { @@ -49,7 +49,8 @@ export class _AlternativePicker extends Component { items.push(); for (const name of Object.keys(consoleAlternatives)) { sawChoice |= name === consoleAlternative; - items.push(); + let disabled = this.props.langs ? !this.props.langs.includes(name) : false; + items.push(); } /* If value isn't in the list then *make* it and we'll render our standard diff --git a/resources/web/docs_js/components/console_widget.jsx b/resources/web/docs_js/components/console_widget.jsx index ddcc28a9b8a78..01c7e5fdee2b5 100644 --- a/resources/web/docs_js/components/console_widget.jsx +++ b/resources/web/docs_js/components/console_widget.jsx @@ -74,7 +74,7 @@ export const ConsoleForm = connect((state, props) => export const ConsoleWidget = props => { const modalAction = () => props.openModal(ConsoleForm, {setting: props.setting, url_label: props.url_label}); return
    - +
    props.copyAsCurl({ diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index.js index d3ead1a7bb755..61bccada25e17 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index.js @@ -75,7 +75,8 @@ export function init_console_widgets() { $('div.console_widget').each(function() { const div = $(this), snippet = div.attr('data-snippet'), - consoleText = div.prev().text() + '\n'; + consoleText = div.prev().text() + '\n', + langs = div.attr("class").split(" ").filter(c => c.startsWith("has-")).map(function(string) { return string.substring(4) }); return mount(div, ConsoleWidget, {setting: "console", url_label: 'Enter the URL of the Console editor', @@ -83,7 +84,8 @@ export function init_console_widgets() { configure_text: 'Configure Console URL', addPretty: true, consoleText, - snippet}); + snippet, + langs}); }); } From 7a2b148dd659e9f5e3bf7edb640c051717b3c0ae Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Tue, 20 Jun 2023 11:33:49 -0700 Subject: [PATCH 0518/1049] Apply suggestions from code review Co-authored-by: James Rodewig --- conf.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index e36a260765a97..cc69bb55b9aa4 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2735,6 +2735,7 @@ contents: current: cn branches: [ {cn: 2.x} ] chunk: 1 + noindex: 1 private: 1 lang: zh_cn tags: Elasticsearch/Definitive Guide @@ -2749,6 +2750,7 @@ contents: index: index.asciidoc current: cn branches: [ {cn: 6.0} ] + noindex: 1 lang: zh_cn tags: Elasticsearch/PHP subject: Elasticsearch @@ -2763,6 +2765,7 @@ contents: branches: [ {cn: 6.0} ] lang: zh_cn chunk: 1 + noindex: 1 private: 1 tags: Kibana/Reference subject: Kibana @@ -2780,6 +2783,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ja tags: Elasticsearch/Reference @@ -2797,6 +2801,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ja tags: Logstash/Reference @@ -2811,6 +2816,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ja tags: Kibana/Reference @@ -2824,7 +2830,8 @@ contents: index: docs/jp/gs-index.asciidoc current: 5.4 branches: [ 5.4 ] - chunk: 1 + chunk: 1 + noindex: 1 private: 1 lang: ja tags: X-Pack/Reference @@ -2851,6 +2858,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ko tags: Elasticsearch/Reference @@ -2868,6 +2876,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ko tags: Logstash/Reference @@ -2882,6 +2891,7 @@ contents: current: 5.4 branches: [ 5.4, 5.3 ] chunk: 1 + noindex: 1 private: 1 lang: ko tags: Kibana/Reference @@ -2896,6 +2906,7 @@ contents: current: 5.4 branches: [ 5.4 ] chunk: 1 + noindex: 1 private: 1 lang: ko tags: X-Pack/Reference From ba7091187a206b48abe03450eedd7fc48dab1dc1 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 21 Jun 2023 09:36:04 +0200 Subject: [PATCH 0519/1049] Bumps docs version to 8.8.2 --- shared/versions/stack/8.8.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.8.asciidoc b/shared/versions/stack/8.8.asciidoc index dae884fd76ccb..92c72e2c587d1 100644 --- a/shared/versions/stack/8.8.asciidoc +++ b/shared/versions/stack/8.8.asciidoc @@ -1,12 +1,12 @@ -:version: 8.8.1 +:version: 8.8.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.8.1 -:logstash_version: 8.8.1 -:elasticsearch_version: 8.8.1 -:kibana_version: 8.8.1 -:apm_server_version: 8.8.1 +:bare_version: 8.8.2 +:logstash_version: 8.8.2 +:elasticsearch_version: 8.8.2 +:kibana_version: 8.8.2 +:apm_server_version: 8.8.2 :branch: 8.8 :minor-version: 8.8 :major-version: 8.x From 1366a06cb51a93c929dfef103d9792c4c8b82c7e Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 21 Jun 2023 09:59:51 +0200 Subject: [PATCH 0520/1049] Bumps docs version to 7.17.11 --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index e5f0f1a8a2a22..06ab8bdc8cf7b 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.10 +:version: 7.17.11 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.10 -:logstash_version: 7.17.10 -:elasticsearch_version: 7.17.10 -:kibana_version: 7.17.10 -:apm_server_version: 7.17.10 +:bare_version: 7.17.11 +:logstash_version: 7.17.11 +:elasticsearch_version: 7.17.11 +:kibana_version: 7.17.11 +:apm_server_version: 7.17.11 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 639ae31d81b5dd6c63c535939d84f41c0c4493f4 Mon Sep 17 00:00:00 2001 From: Bharat Pasupula Date: Wed, 21 Jun 2023 15:43:59 +0200 Subject: [PATCH 0521/1049] prepare for 8.9 release --- conf.yaml | 4 ++-- shared/versions/stack/master.asciidoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 995c97c7fcfbe..4f3226be58c87 100644 --- a/conf.yaml +++ b/conf.yaml @@ -244,8 +244,8 @@ contents: - title: Elastic Common Schema (ECS) Reference prefix: en/ecs current: 8.8 - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ main, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ main, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc chunk: 2 tags: Elastic Common Schema (ECS)/Reference diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index a21d765c2cfe2..af0b43951e6c5 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: master +:ecs_version: 8.9 :esf_version: master ////////// From c9340735ca1059883c8611f3b0447bf0d6c83f5b Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 21 Jun 2023 07:27:31 -0700 Subject: [PATCH 0522/1049] Add 8.9 version attributes (#2703) --- shared/versions/stack/8.9.asciidoc | 63 +++++++++++++++++++++++++++ shared/versions/stack/master.asciidoc | 14 +++--- 2 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 shared/versions/stack/8.9.asciidoc diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc new file mode 100644 index 0000000000000..40f87d94792e6 --- /dev/null +++ b/shared/versions/stack/8.9.asciidoc @@ -0,0 +1,63 @@ +:version: 8.9.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.9.0 +:logstash_version: 8.9.0 +:elasticsearch_version: 8.9.0 +:kibana_version: 8.9.0 +:apm_server_version: 8.9.0 +:branch: 8.9 +:minor-version: 8.9 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: master +:esf_version: master + +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: main +:apm-go-branch: 2.x +:apm-ios-branch: 0.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 3.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index a21d765c2cfe2..fee6f1dee5179 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -1,14 +1,14 @@ -:version: 8.9.0 +:version: 8.10.0 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.9.0 -:logstash_version: 8.9.0 -:elasticsearch_version: 8.9.0 -:kibana_version: 8.9.0 -:apm_server_version: 8.9.0 +:bare_version: 8.10.0 +:logstash_version: 8.10.0 +:elasticsearch_version: 8.10.0 +:kibana_version: 8.10.0 +:apm_server_version: 8.10.0 :branch: master -:minor-version: 8.9 +:minor-version: 8.10 :major-version: 8.x :prev-major-version: 7.x :prev-major-last: 7.17 From 3a56f0666d135bfa309ff0df60cef9221c1b9830 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 22 Jun 2023 10:07:33 -0700 Subject: [PATCH 0523/1049] Update conf.yaml for 8.9 branches (#2704) --- conf.yaml | 110 +++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4f3226be58c87..c4ef67f9b6f7a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -127,7 +127,7 @@ contents: prefix: en/welcome-to-elastic current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] live: [ 8.8 ] chunk: 1 tags: Elastic/Welcome @@ -146,7 +146,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -220,7 +220,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -273,7 +273,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -288,13 +288,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -310,7 +310,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -328,7 +328,7 @@ contents: repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/sql/qa @@ -364,7 +364,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -401,7 +401,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -427,7 +427,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -443,7 +443,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -467,7 +467,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -489,7 +489,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -502,7 +502,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -515,7 +515,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -528,7 +528,7 @@ contents: - title: .NET Clients prefix: net-api current: 8.1 - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] live: [ main, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net @@ -544,7 +544,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -573,7 +573,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -599,8 +599,8 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] - live: [ main, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + live: [ main, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] index: docs/index.asciidoc chunk: 1 tags: Clients/Rust @@ -699,7 +699,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -909,7 +909,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -924,7 +924,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -936,11 +936,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -962,7 +962,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -979,7 +979,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -996,7 +996,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -1029,7 +1029,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -1046,7 +1046,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -1061,7 +1061,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6 ] live: [ main, 8.6 ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -1076,7 +1076,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -1091,7 +1091,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -1106,7 +1106,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -1123,7 +1123,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -1140,7 +1140,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 2 @@ -1178,7 +1178,7 @@ contents: prefix: guide index: docs/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] live: *stacklive chunk: 2 tags: APM Guide @@ -1663,7 +1663,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1712,7 +1712,7 @@ contents: - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1728,7 +1728,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1743,11 +1743,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1771,7 +1771,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1869,7 +1869,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1894,7 +1894,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1947,7 +1947,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -2002,7 +2002,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Functionbeat/Reference @@ -2051,7 +2051,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -2098,7 +2098,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -2155,7 +2155,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -2198,7 +2198,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2241,7 +2241,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -2272,7 +2272,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -2520,7 +2520,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.8 ] + branches: [ {main: master}, 8.9, 8.8 ] live: [] chunk: 1 tags: ESRE/Guide From f714bdb5a806e835b0dc3d349808f1403a2e5a37 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 27 Jun 2023 16:10:19 -0400 Subject: [PATCH 0524/1049] ESS - Change current to MS-94 --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index c4ef67f9b6f7a..c51d29f807bbe 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.8 stacklive: &stacklive [ 8.8, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-92 + cloudSaasCurrent: &cloudSaasCurrent ms-94 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-81: master From de7a83764afb3c38e3df7d5e3556fedbe0000070 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Fri, 30 Jun 2023 13:05:46 -0400 Subject: [PATCH 0525/1049] Temporarily pause Kibana link checks (#2710) The checker isn't skipping GitHub links as intended. This is blocking https://github.com/elastic/kibana/pull/160535. I think we can fix this by updating the [check_kibana_links](https://github.com/elastic/docs/blob/master/build_docs.pl#L381) function, but I don't want to halt the above PR while we research. --- build_docs.pl | 3 +- .../all_books_broken_link_detection_spec.rb | 154 +++++++++--------- 2 files changed, 80 insertions(+), 77 deletions(-) diff --git a/build_docs.pl b/build_docs.pl index 2132d3404df89..6161efede9d34 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -330,7 +330,8 @@ sub check_links { $link_checker->check; - check_kibana_links( $build_dir, $link_checker ) if exists $Conf->{repos}{kibana}; + # Temporarily pause Kibana link checks. See https://github.com/elastic/kibana/pull/160535 + # check_kibana_links( $build_dir, $link_checker ) if exists $Conf->{repos}{kibana}; # Comment out due to build errors # check_elasticsearch_links( $build_dir, $link_checker ) if exists $Conf->{repos}{elasticsearch}; if ( $link_checker->has_bad || $Opts->{warnlinkcheck}) { diff --git a/integtest/spec/all_books_broken_link_detection_spec.rb b/integtest/spec/all_books_broken_link_detection_spec.rb index b21c6c5bf9e44..142855003c559 100644 --- a/integtest/spec/all_books_broken_link_detection_spec.rb +++ b/integtest/spec/all_books_broken_link_detection_spec.rb @@ -137,81 +137,83 @@ include_context 'there is a broken relative link in the docs', true include_examples 'there are broken links in the docs' end - describe 'when there is a broken link in kibana' do - include_context 'there is a broken link in kibana', true - include_examples 'there are broken links in kibana', 'foo' - end - describe 'when a link in kibana goes to the website outside the guide' do - include_context 'there is a kibana link', true, - '${ELASTIC_WEBSITE_URL}not-part-of-the-guide', false - include_examples 'all links are ok' - end - describe 'when there is a broken Elasticsearch Guide link in Kibana' do - include_context 'there is a kibana link', true, - '${ELASTICSEARCH_DOCS}missing-page.html', true - include_examples 'there are broken links in kibana', - 'en/elasticsearch/reference/master/missing-page.html' - end - describe 'when there is a broken Kibana guide link' do - include_context 'there is a kibana link', true, - '${KIBANA_DOCS}not-a-kibana-page.html', true - include_examples 'there are broken links in kibana', - 'en/kibana/master/not-a-kibana-page.html' - end - describe 'when there is a broken ES Plugin link' do - include_context 'there is a kibana link', true, - '${PLUGIN_DOCS}not-valid-plugin.html', true - include_examples 'there are broken links in kibana', - 'en/elasticsearch/plugins/master/not-valid-plugin.html' - end - describe 'when there is a broken Fleet link' do - include_context 'there is a kibana link', true, - '${FLEET_DOCS}not-a-fleet-page.html', true - include_examples 'there are broken links in kibana', - 'en/fleet/master/not-a-fleet-page.html' - end - describe 'when there is a broken APM link' do - include_context 'there is a kibana link', true, - '${APM_DOCS}not-an-apm-page.html', true - include_examples 'there are broken links in kibana', - 'en/apm/not-an-apm-page.html' - end - describe 'when there is a broken Stack link' do - include_context 'there is a kibana link', true, - '${STACK_DOCS}not-a-stack-page.html', true - include_examples 'there are broken links in kibana', - 'en/elastic-stack/master/not-a-stack-page.html' - end - describe 'when there is a broken Security link' do - include_context 'there is a kibana link', true, - '${SECURITY_SOLUTION_DOCS}not-a-security-page.html', true - include_examples 'there are broken links in kibana', - 'en/security/master/not-a-security-page.html' - end - describe 'when there is a broken Stack Getting Started link' do - include_context 'there is a kibana link', true, - '${STACK_GETTING_STARTED}not-a-page.html', true - include_examples 'there are broken links in kibana', - 'en/elastic-stack-get-started/master/not-a-page.html' - end - describe 'when there is a broken App Search link' do - include_context 'there is a kibana link', true, - '${APP_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/app-search/master/not-a-search-page.html' - end - describe 'when there is a broken Enterprise Search link' do - include_context 'there is a kibana link', true, - '${ENTERPRISE_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/enterprise-search/master/not-a-search-page.html' - end - describe 'when there is a broken Workplace Search link' do - include_context 'there is a kibana link', true, - '${WORKPLACE_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/workplace-search/master/not-a-search-page.html' - end + # describe 'when there is a broken link in kibana' do + # include_context 'there is a broken link in kibana', true + # include_examples 'there are broken links in kibana', 'foo' + # end + # describe 'when a link in kibana goes to the website outside the guide' do + # include_context 'there is a kibana link', true, + # '${ELASTIC_WEBSITE_URL}not-part-of-the-guide', false + # include_examples 'all links are ok' + # end + # describe 'when there is a broken Elasticsearch Guide link in Kibana' do + # include_context 'there is a kibana link', true, + # '${ELASTICSEARCH_DOCS}missing-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/elasticsearch/reference/master/missing-page.html' + # end + # describe 'when there is a broken Kibana guide link' do + # include_context 'there is a kibana link', true, + # '${KIBANA_DOCS}not-a-kibana-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/kibana/master/not-a-kibana-page.html' + # end + # describe 'when there is a broken ES Plugin link' do + # include_context 'there is a kibana link', true, + # '${PLUGIN_DOCS}not-valid-plugin.html', true + # include_examples 'there are broken links in kibana', + # 'en/elasticsearch/plugins/master/not-valid-plugin.html' + # end + # describe 'when there is a broken Fleet link' do + # include_context 'there is a kibana link', true, + # '${FLEET_DOCS}not-a-fleet-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/fleet/master/not-a-fleet-page.html' + # end + # describe 'when there is a broken APM link' do + # include_context 'there is a kibana link', true, + # '${APM_DOCS}not-an-apm-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/apm/not-an-apm-page.html' + # end + # describe 'when there is a broken Stack link' do + # include_context 'there is a kibana link', true, + # '${STACK_DOCS}not-a-stack-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/elastic-stack/master/not-a-stack-page.html' + # end + # rubocop:disable LineLength + # describe 'when there is a broken Security link' do + # include_context 'there is a kibana link', true, + # '${SECURITY_SOLUTION_DOCS}not-a-security-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/security/master/not-a-security-page.html' + # end + # rubocop:enable LineLength + # describe 'when there is a broken Stack Getting Started link' do + # include_context 'there is a kibana link', true, + # '${STACK_GETTING_STARTED}not-a-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/elastic-stack-get-started/master/not-a-page.html' + # end + # describe 'when there is a broken App Search link' do + # include_context 'there is a kibana link', true, + # '${APP_SEARCH_DOCS}not-a-search-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/app-search/master/not-a-search-page.html' + # end + # describe 'when there is a broken Enterprise Search link' do + # include_context 'there is a kibana link', true, + # '${ENTERPRISE_SEARCH_DOCS}not-a-search-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/enterprise-search/master/not-a-search-page.html' + # end + # describe 'when there is a broken Workplace Search link' do + # include_context 'there is a kibana link', true, + # '${WORKPLACE_SEARCH_DOCS}not-a-search-page.html', true + # include_examples 'there are broken links in kibana', + # 'en/workplace-search/master/not-a-search-page.html' + # end describe 'when using --keep_hash and --sub_dir together like a PR test' do describe 'when there is a broken link in one of the books being built' do convert_before do |src, dest| @@ -340,7 +342,7 @@ def self.setup(src, dest) .sub_dir(src.repo('kibana'), 'main') .convert(expect_failure: true) end - include_examples 'there are broken links in kibana', 'bar' + # include_examples 'there are broken links in kibana', 'bar' end end end From 5101872951a42cc6b0072620280c74e8f925fa4e Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 30 Jun 2023 12:27:59 -0700 Subject: [PATCH 0526/1049] Add ELASTIC_GITHUB to link checker (#2712) Co-authored-by: James Rodewig --- build_docs.pl | 5 +- .../all_books_broken_link_detection_spec.rb | 159 +++++++++--------- 2 files changed, 83 insertions(+), 81 deletions(-) diff --git a/build_docs.pl b/build_docs.pl index 6161efede9d34..58441f425a549 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -330,8 +330,7 @@ sub check_links { $link_checker->check; - # Temporarily pause Kibana link checks. See https://github.com/elastic/kibana/pull/160535 - # check_kibana_links( $build_dir, $link_checker ) if exists $Conf->{repos}{kibana}; + check_kibana_links( $build_dir, $link_checker ) if exists $Conf->{repos}{kibana}; # Comment out due to build errors # check_elasticsearch_links( $build_dir, $link_checker ) if exists $Conf->{repos}{elasticsearch}; if ( $link_checker->has_bad || $Opts->{warnlinkcheck}) { @@ -379,7 +378,7 @@ sub check_kibana_links { $path =~ s!\$\{(?:baseUrl|ELASTIC_WEBSITE_URL)\}guide/!!; # We don't want to check any links to www.elastic.co that aren't # part of the docs. - return "" if $path =~ m/\$\{(?:baseUrl|ELASTIC_WEBSITE_URL)\}.*/; + return "" if $path =~ m/\$\{(?:baseUrl|ELASTIC_WEBSITE_URL|ELASTIC_GITHUB)\}.*/; # Otherwise, return the link to check return ( split /#/, $path ); } diff --git a/integtest/spec/all_books_broken_link_detection_spec.rb b/integtest/spec/all_books_broken_link_detection_spec.rb index 142855003c559..675e151d5e486 100644 --- a/integtest/spec/all_books_broken_link_detection_spec.rb +++ b/integtest/spec/all_books_broken_link_detection_spec.rb @@ -137,83 +137,86 @@ include_context 'there is a broken relative link in the docs', true include_examples 'there are broken links in the docs' end - # describe 'when there is a broken link in kibana' do - # include_context 'there is a broken link in kibana', true - # include_examples 'there are broken links in kibana', 'foo' - # end - # describe 'when a link in kibana goes to the website outside the guide' do - # include_context 'there is a kibana link', true, - # '${ELASTIC_WEBSITE_URL}not-part-of-the-guide', false - # include_examples 'all links are ok' - # end - # describe 'when there is a broken Elasticsearch Guide link in Kibana' do - # include_context 'there is a kibana link', true, - # '${ELASTICSEARCH_DOCS}missing-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/elasticsearch/reference/master/missing-page.html' - # end - # describe 'when there is a broken Kibana guide link' do - # include_context 'there is a kibana link', true, - # '${KIBANA_DOCS}not-a-kibana-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/kibana/master/not-a-kibana-page.html' - # end - # describe 'when there is a broken ES Plugin link' do - # include_context 'there is a kibana link', true, - # '${PLUGIN_DOCS}not-valid-plugin.html', true - # include_examples 'there are broken links in kibana', - # 'en/elasticsearch/plugins/master/not-valid-plugin.html' - # end - # describe 'when there is a broken Fleet link' do - # include_context 'there is a kibana link', true, - # '${FLEET_DOCS}not-a-fleet-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/fleet/master/not-a-fleet-page.html' - # end - # describe 'when there is a broken APM link' do - # include_context 'there is a kibana link', true, - # '${APM_DOCS}not-an-apm-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/apm/not-an-apm-page.html' - # end - # describe 'when there is a broken Stack link' do - # include_context 'there is a kibana link', true, - # '${STACK_DOCS}not-a-stack-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/elastic-stack/master/not-a-stack-page.html' - # end - # rubocop:disable LineLength - # describe 'when there is a broken Security link' do - # include_context 'there is a kibana link', true, - # '${SECURITY_SOLUTION_DOCS}not-a-security-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/security/master/not-a-security-page.html' - # end - # rubocop:enable LineLength - # describe 'when there is a broken Stack Getting Started link' do - # include_context 'there is a kibana link', true, - # '${STACK_GETTING_STARTED}not-a-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/elastic-stack-get-started/master/not-a-page.html' - # end - # describe 'when there is a broken App Search link' do - # include_context 'there is a kibana link', true, - # '${APP_SEARCH_DOCS}not-a-search-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/app-search/master/not-a-search-page.html' - # end - # describe 'when there is a broken Enterprise Search link' do - # include_context 'there is a kibana link', true, - # '${ENTERPRISE_SEARCH_DOCS}not-a-search-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/enterprise-search/master/not-a-search-page.html' - # end - # describe 'when there is a broken Workplace Search link' do - # include_context 'there is a kibana link', true, - # '${WORKPLACE_SEARCH_DOCS}not-a-search-page.html', true - # include_examples 'there are broken links in kibana', - # 'en/workplace-search/master/not-a-search-page.html' - # end + describe 'when there is a broken link in kibana' do + include_context 'there is a broken link in kibana', true + include_examples 'there are broken links in kibana', 'foo' + end + describe 'when a link in kibana goes to the website outside the guide' do + include_context 'there is a kibana link', true, + '${ELASTIC_WEBSITE_URL}not-part-of-the-guide', false + include_examples 'all links are ok' + end + describe 'when a link in kibana goes to an Elastic GitHub URL' do + include_context 'there is a kibana link', true, + '${ELASTIC_GITHUB}kibana/issues/new/choose', false + include_examples 'all links are ok' + end + describe 'when there is a broken Elasticsearch Guide link in Kibana' do + include_context 'there is a kibana link', true, + '${ELASTICSEARCH_DOCS}missing-page.html', true + include_examples 'there are broken links in kibana', + 'en/elasticsearch/reference/master/missing-page.html' + end + describe 'when there is a broken Kibana guide link' do + include_context 'there is a kibana link', true, + '${KIBANA_DOCS}not-a-kibana-page.html', true + include_examples 'there are broken links in kibana', + 'en/kibana/master/not-a-kibana-page.html' + end + describe 'when there is a broken ES Plugin link' do + include_context 'there is a kibana link', true, + '${PLUGIN_DOCS}not-valid-plugin.html', true + include_examples 'there are broken links in kibana', + 'en/elasticsearch/plugins/master/not-valid-plugin.html' + end + describe 'when there is a broken Fleet link' do + include_context 'there is a kibana link', true, + '${FLEET_DOCS}not-a-fleet-page.html', true + include_examples 'there are broken links in kibana', + 'en/fleet/master/not-a-fleet-page.html' + end + describe 'when there is a broken APM link' do + include_context 'there is a kibana link', true, + '${APM_DOCS}not-an-apm-page.html', true + include_examples 'there are broken links in kibana', + 'en/apm/not-an-apm-page.html' + end + describe 'when there is a broken Stack link' do + include_context 'there is a kibana link', true, + '${STACK_DOCS}not-a-stack-page.html', true + include_examples 'there are broken links in kibana', + 'en/elastic-stack/master/not-a-stack-page.html' + end + describe 'when there is a broken Security link' do + include_context 'there is a kibana link', true, + '${SECURITY_SOLUTION_DOCS}not-a-security-page.html', true + include_examples 'there are broken links in kibana', + 'en/security/master/not-a-security-page.html' + end + describe 'when there is a broken Stack Getting Started link' do + include_context 'there is a kibana link', true, + '${STACK_GETTING_STARTED}not-a-page.html', true + include_examples 'there are broken links in kibana', + 'en/elastic-stack-get-started/master/not-a-page.html' + end + describe 'when there is a broken App Search link' do + include_context 'there is a kibana link', true, + '${APP_SEARCH_DOCS}not-a-search-page.html', true + include_examples 'there are broken links in kibana', + 'en/app-search/master/not-a-search-page.html' + end + describe 'when there is a broken Enterprise Search link' do + include_context 'there is a kibana link', true, + '${ENTERPRISE_SEARCH_DOCS}not-a-search-page.html', true + include_examples 'there are broken links in kibana', + 'en/enterprise-search/master/not-a-search-page.html' + end + describe 'when there is a broken Workplace Search link' do + include_context 'there is a kibana link', true, + '${WORKPLACE_SEARCH_DOCS}not-a-search-page.html', true + include_examples 'there are broken links in kibana', + 'en/workplace-search/master/not-a-search-page.html' + end describe 'when using --keep_hash and --sub_dir together like a PR test' do describe 'when there is a broken link in one of the books being built' do convert_before do |src, dest| @@ -342,7 +345,7 @@ def self.setup(src, dest) .sub_dir(src.repo('kibana'), 'main') .convert(expect_failure: true) end - # include_examples 'there are broken links in kibana', 'bar' + include_examples 'there are broken links in kibana', 'bar' end end end From 583d4d1ebbb7059e024b91cc65b02295a5dfdd1b Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Thu, 6 Jul 2023 16:35:38 +0200 Subject: [PATCH 0527/1049] Add an attribute for ES|QL --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 4a5308fb4302d..023a39f331384 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -249,6 +249,7 @@ Common words and phrases :functionbeat: Functionbeat :journalbeat: Journalbeat :es-sql: {es} SQL +:esql: ES|QL :elastic-agent: {agent} :k8s: Kubernetes :log-driver-long: Elastic Logging Plugin for Docker From 02aa746b094da8f9f899076f4bfae5a6c46b2c2b Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Fri, 7 Jul 2023 15:30:05 -0400 Subject: [PATCH 0528/1049] Add attribute for "Elastic Artifact Registry" (#2714) We have an attribute for the Elastic Package Registry. For consistency, we should also have one for the Elastic Artifact Registry. --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 023a39f331384..ebce8b7e8cd6c 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -228,6 +228,7 @@ Ingest terms :package-manager: Elastic Package Manager :integrations: Integrations :package-registry: Elastic Package Registry +:artifact-registry: Elastic Artifact Registry ////////// Common words and phrases From f6c09a2ab8b77a3c2863a229e58af57e44afc266 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Mon, 10 Jul 2023 11:13:02 -0400 Subject: [PATCH 0529/1049] Enable edit links on `master`/`main` branches (#2715) Re-enables `Edit` links for the `master`/`main` branches of docs. When https://github.com/elastic/docs/pull/2690 disabled indexing for these branches, it also removed the `Edit` links as an unintended side effect. Closes https://github.com/elastic/platform-docs-team/issues/119 --- integtest/spec/all_books_spec.rb | 72 ++++++++++++++++++++++++++------ lib/ES/Book.pm | 1 + 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 231dd08b64f84..1f7ef7855d3c1 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -602,16 +602,58 @@ def self.setup_example(repo, lang, hash) context 'when the book has "live" branches' do convert_all_before_context do |src| repo = src.repo_with_index 'repo', 'test' + repo.switch_to_new_branch '0.10' repo.switch_to_new_branch '0.9_oldbutlive' repo.switch_to_new_branch '0.8_nonlive' book = src.book 'Test' book.source repo, 'index.asciidoc' - book.branches = ['master', '0.9_oldbutlive', '0.8_nonlive'] - book.live_branches = ['master', '0.9_oldbutlive'] + book.branches = ['master', '0.10', '0.9_oldbutlive', '0.8_nonlive'] + book.live_branches = ['0.10', '0.9_oldbutlive'] + book.current_branch = '0.10' end let(:repo) { @src.repo 'repo' } - page_context 'the current branch', 'html/test/master/index.html' do + page_context 'the master branch', + 'html/test/master/index.html' do + it 'contains the noindex flag' do + expect(contents).to include(<<~HTML.strip) + + HTML + end + context 'the live versions drop down' do + it 'contains only the live branches' do + expect(body).to include(<<~HTML.strip) + + HTML + end + end + context 'the other versions drop down' do + it 'contains all branches' do + expect(body).to include(<<~HTML.strip) + other versions: + HTML + end + end + it 'includes the prelim docs header' do + expect(body).to include <<~HTML +
    + You are looking at preliminary documentation for a future release. + Not what you want? See the + current release documentation. +
    + HTML + end + end + page_context "the master branch's chap", + 'html/test/master/chapter.html' do + let(:edit_url) { "#{repo.root}/edit/master/index.asciidoc" } + it 'contains an edit_me link' do + expect(body).to include <<~HTML.strip + edit + HTML + end + end + page_context 'the current branch', 'html/test/0.10/index.html' do it "doesn't contain the noindex flag" do expect(contents).not_to include(<<~HTML.strip) @@ -620,14 +662,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains only the live branches' do expect(body).to include(<<~HTML.strip) - + HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end @@ -635,8 +677,9 @@ def self.setup_example(repo, lang, hash) expect(body).not_to include 'class="page_header"' end end - page_context "the live branch's chapter", 'html/test/master/chapter.html' do - let(:edit_url) { "#{repo.root}/edit/master/index.asciidoc" } + page_context "the current branch's chap", + 'html/test/0.10/chapter.html' do + let(:edit_url) { "#{repo.root}/edit/0.10/index.asciidoc" } it 'contains an edit_me link' do expect(body).to include <<~HTML.strip edit @@ -652,14 +695,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains only the live branches' do expect(body).to include(<<~HTML.strip) - + HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end @@ -691,13 +734,16 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains the deprecated branch' do expect(body).to include(<<~HTML.strip) - + + HTML + end end it 'includes the "dead" version header' do expect(body).to include <<~HTML diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 2369bb0c12d22..0648f64113bd8 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -519,6 +519,7 @@ sub private { #=================================== my ( $self, $branch ) = @_; return 1 if $self->{private}; + return 0 if $branch =~ /^(master|main)$/; return 0 if grep( /^$branch$/, @{ $self->{live_branches} } ); return 1; } From 06821f880d0f1f50ab7b855e90f2e6aeafd6adcf Mon Sep 17 00:00:00 2001 From: Chris Cressman Date: Tue, 11 Jul 2023 16:20:54 -0400 Subject: [PATCH 0530/1049] Formally publish ESRE book (#2716) - Move book from "Docs in Development" to "Elastic Stack" - Add "live" versions to enable search engine indexing https://github.com/elastic/enterprise-search-team/issues/4741 --- conf.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/conf.yaml b/conf.yaml index bbb0d39f562fe..6a5fe3f239d51 100644 --- a/conf.yaml +++ b/conf.yaml @@ -242,6 +242,23 @@ contents: - repo: docs path: shared/settings.asciidoc + - title: Elasticsearch Relevance Engine (ESRE) + prefix: en/esre + index: esre-docs/index.asciidoc + private: 1 + current: *stackcurrent + branches: [ {main: master}, 8.9, 8.8 ] + live: [ 8.9, 8.8 ] + chunk: 1 + tags: ESRE/Guide + subject: ESRE + sources: + - + repo: enterprise-search-pubs + path: esre-docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs current: 8.8 @@ -2328,23 +2345,6 @@ contents: - repo: docs path: shared/attributes.asciidoc - - title: Elasticsearch Relevance Engine (ESRE) - prefix: en/esre - index: esre-docs/index.asciidoc - private: 1 - current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8 ] - live: [] - chunk: 1 - tags: ESRE/Guide - subject: ESRE - sources: - - - repo: enterprise-search-pubs - path: esre-docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - title: Legacy Documentation sections: From 957ba195bd8041ad38f6eb02d91f3e6e7eefcfa6 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:53:03 -0400 Subject: [PATCH 0531/1049] Add a link on the landing page to Introducing Elastic Docs (#2719) --- extra/docs_landing.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 89267cf7160bd..979c4ab38ee38 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -367,6 +367,9 @@

  • Troubleshooting and FAQs
    • +
  • + Introducing Elastic documentation +
  • Meetups and virtual events
    • From d0e9071cce55986e9acb61b401de7fe512ca1adf Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Mon, 24 Jul 2023 11:23:14 +0200 Subject: [PATCH 0532/1049] ECK: add 2.9 version (#2720) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 6a5fe3f239d51..5781042eba0c0 100644 --- a/conf.yaml +++ b/conf.yaml @@ -884,7 +884,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.8 - branches: [ {main: master}, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ {main: master}, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From ad48e0903533aa954e8c63dc4d86870612a55d87 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 25 Jul 2023 04:06:27 -0700 Subject: [PATCH 0533/1049] Bumps current version to 8.9 (#2722) --- conf.yaml | 6 +++--- shared/versions/stack/8.8.asciidoc | 2 +- shared/versions/stack/8.9.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.yaml b/conf.yaml index 5781042eba0c0..50c6c1181f772 100644 --- a/conf.yaml +++ b/conf.yaml @@ -76,8 +76,8 @@ contents_title: Welcome to Elastic Docs # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.8 - stacklive: &stacklive [ 8.8, 7.17 ] + stackcurrent: &stackcurrent 8.9 + stacklive: &stacklive [ 8.9, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-92 @@ -261,7 +261,7 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - current: 8.8 + current: 8.9 branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ main, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc diff --git a/shared/versions/stack/8.8.asciidoc b/shared/versions/stack/8.8.asciidoc index 92c72e2c587d1..cbb00f7c7d42b 100644 --- a/shared/versions/stack/8.8.asciidoc +++ b/shared/versions/stack/8.8.asciidoc @@ -29,7 +29,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 40f87d94792e6..c0540768b8ce6 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index e5f16f1fc3371..c6d15759d1392 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.8.asciidoc[] +include::8.9.asciidoc[] From c934669d25acbfa595e99583656ff813485db03e Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 25 Jul 2023 07:06:41 -0400 Subject: [PATCH 0534/1049] Bumps docs version to 7.17.12 (#2718) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 06ab8bdc8cf7b..82542aad9bf50 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.11 +:version: 7.17.12 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.11 -:logstash_version: 7.17.11 -:elasticsearch_version: 7.17.11 -:kibana_version: 7.17.11 -:apm_server_version: 7.17.11 +:bare_version: 7.17.12 +:logstash_version: 7.17.12 +:elasticsearch_version: 7.17.12 +:kibana_version: 7.17.12 +:apm_server_version: 7.17.12 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 546791f65c502908b2df5f02cc4aa72b48f2fb69 Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Tue, 25 Jul 2023 15:33:37 +0200 Subject: [PATCH 0535/1049] ECK: Promote 2.9 version to current (#2721) * ECK: add 2.9 version * ECK: promote 2.9 version --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 50c6c1181f772..46c9d3c9de4b4 100644 --- a/conf.yaml +++ b/conf.yaml @@ -883,7 +883,7 @@ contents: prefix: en/cloud-on-k8s tags: Kubernetes/Reference subject: ECK - current: 2.8 + current: 2.9 branches: [ {main: master}, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 From f2a36ffe6a1b41be1c3633e6d81dc550eb2aa7a4 Mon Sep 17 00:00:00 2001 From: Arianna Laudazzi <46651782+alaudazzi@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:14:00 +0200 Subject: [PATCH 0536/1049] ESS - Change current to MS-95 --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 4f7263cc7d5a7..332343e404d8e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.9 stacklive: &stacklive [ 8.9, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-94 + cloudSaasCurrent: &cloudSaasCurrent ms-95 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: master From 6405619c072128f03a7d39a5c2e35cde1d38f9bd Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Fri, 28 Jul 2023 10:47:01 -0400 Subject: [PATCH 0537/1049] Update ECS docs to version 8.9 (#2725) --- shared/versions/stack/8.9.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index c0540768b8ce6..3175ee66fcf58 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: master +:ecs_version: 8.9 :esf_version: master ////////// From f74377496dae944f3f12dbd881c83b9c680f7035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Tue, 1 Aug 2023 14:52:42 +0200 Subject: [PATCH 0538/1049] Releases 8.9 branch for .NET Client docs. (#2727) --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4f7263cc7d5a7..4645081766b65 100644 --- a/conf.yaml +++ b/conf.yaml @@ -545,9 +545,9 @@ contents: path: .doc/ - title: .NET Clients prefix: net-api - current: 8.1 + current: 8.9 branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] - live: [ main, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] + live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net subject: Clients From c7abe686750e57e6cfdef5bb4ed51a0c744fe8dd Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 9 Aug 2023 16:51:53 -0400 Subject: [PATCH 0539/1049] Fix Azure Marketplace link (#2731) --- extra/docs_landing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 979c4ab38ee38..ed3e55f7906eb 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -336,7 +336,7 @@

    AWS Marketplace

  • - Azure Marketplace + Azure Marketplace
  • GCP Marketplace From 2a646e572946fd5109a24ebaa28e042ef439a03d Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Thu, 10 Aug 2023 14:47:37 +0100 Subject: [PATCH 0540/1049] Add esql qa resources to conf.yaml --- conf.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf.yaml b/conf.yaml index 4645081766b65..ea746e445d4e6 100644 --- a/conf.yaml +++ b/conf.yaml @@ -347,6 +347,11 @@ contents: path: x-pack/qa/sql # only exists from 6.3 to 6.5 exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: x-pack/plugin/esql/qa/testFixtures/src/main/resources + # only exists from 8.11 (and the feature/esql branch) + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/sql/qa From 1c3c7d2c9bdca24647483bc2ec8f7cbfc14b2108 Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Thu, 10 Aug 2023 15:52:54 +0100 Subject: [PATCH 0541/1049] Update conf.yaml Co-authored-by: Abdon Pijpelink --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index ea746e445d4e6..802d580c6a41e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -351,7 +351,7 @@ contents: repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources # only exists from 8.11 (and the feature/esql branch) - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/sql/qa From 7cd268d1b6f046d83d9b673853ccde2da5df98c1 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Mon, 14 Aug 2023 16:30:07 +0100 Subject: [PATCH 0542/1049] Add ESQL sq resource for the main branch --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 802d580c6a41e..f70670b376cf9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -350,8 +350,8 @@ contents: - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources - # only exists from 8.11 (and the feature/esql branch) - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + # only exists from 8.11 + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/sql/qa From b27a4a369339c9b1e901f60e848b29240f21c9c3 Mon Sep 17 00:00:00 2001 From: Chris Berkhout Date: Tue, 15 Aug 2023 18:44:44 +0200 Subject: [PATCH 0543/1049] Prepare for ECS 8.10.0 release. --- conf.yaml | 4 ++-- shared/versions/stack/master.asciidoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 802d580c6a41e..74967159fc726 100644 --- a/conf.yaml +++ b/conf.yaml @@ -262,8 +262,8 @@ contents: - title: Elastic Common Schema (ECS) Reference prefix: en/ecs current: 8.9 - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ main, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] + branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc chunk: 2 tags: Elastic Common Schema (ECS)/Reference diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 467a8713efe58..f38f6f29e565e 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.9 +:ecs_version: 8.10 :esf_version: master ////////// From 57bf2e4eeaa717bca66a62709a35c918415b6892 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 15 Aug 2023 15:28:25 -0500 Subject: [PATCH 0544/1049] Move some book-scoped attributes from /observability-docs (#2735) * move urls to other web pages to shared attributes * move common term attributes to docs repo * move non-stack version attributes to docs repo * Update attributes.asciidoc * remove descriptions from attributes.asciidoc --------- Co-authored-by: Brandon Morelli --- shared/attributes.asciidoc | 44 +++++++++++++++++++++++++++ shared/versions/stack/8.9.asciidoc | 5 +++ shared/versions/stack/master.asciidoc | 5 +++ 3 files changed, 54 insertions(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index ebce8b7e8cd6c..e3d2000773ec9 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -129,6 +129,44 @@ Elastic-level pages :time-units: {ref}/api-conventions.html#time-units :byte-units: {ref}/api-conventions.html#byte-units +////////// +APM agents +The if directives below are required for versions 6.3-7.4 of the legacy APM Get started book. +Without these if directives, the links below fail and break the build. +////////// + +ifdef::apm-py-branch[] +:apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} +endif::[] + +ifdef::apm-node-branch[] +:apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} +endif::[] + +ifdef::apm-rum-branch[] +:apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} +endif::[] + +ifdef::apm-ruby-branch[] +:apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} +endif::[] + +ifdef::apm-java-branch[] +:apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} +endif::[] + +ifdef::apm-go-branch[] +:apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} +endif::[] + +ifdef::apm-ios-branch[] +:apm-ios-ref-v: https://www.elastic.co/guide/en/apm/agent/swift/{apm-ios-branch} +endif::[] + +ifdef::apm-dotnet-branch[] +:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} +endif::[] + ////////// Elastic Cloud ////////// @@ -172,6 +210,7 @@ Kibana app and UI names :apm-app: APM app :uptime-app: Uptime app +:synthetics-app: Synthetics app :logs-app: Logs app :metrics-app: Metrics app :infrastructure-app: Infrastructure app @@ -421,6 +460,11 @@ Do not use `endpoint-cloud-sec` in versions 8.5.0 and newer :apm-rum-agents: Elastic APM RUM JavaScript agents :apm-lambda-ext: Elastic APM AWS Lambda extension +:project-monitors: project monitors +:project-monitors-cap: Project monitors +:private-location: Private Location +:private-locations: Private Locations + :pwd: YOUR_PASSWORD :esh: ES-Hadoop diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 3175ee66fcf58..44916d2174353 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -61,3 +61,8 @@ ECS Logging :ecs-logging-php: master :ecs-logging-python: master :ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 467a8713efe58..a4cd926422c18 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -61,3 +61,8 @@ ECS Logging :ecs-logging-php: master :ecs-logging-python: master :ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 From 2463c0a8b1fa71634dbd6641c0804c224a89f340 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:48:12 -0400 Subject: [PATCH 0545/1049] Add 'Elastic Serverless' shared attribute (#2738) * Add 'Elastic Serverless' shared attribute * Replace with short and full versions * Add base path for Serverless docs site --- shared/attributes.asciidoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index e3d2000773ec9..06acb239f56de 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -175,6 +175,9 @@ Elastic Cloud :ess: Elasticsearch Service :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes +:serverless-full: Elastic Serverless +:serverless-short: Serverless +:serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-trial: https://www.elastic.co/cloud/elasticsearch-service/signup?baymax=docs-body&elektra=docs :ess-product: https://www.elastic.co/cloud/elasticsearch-service?baymax=docs-body&elektra=docs From a3c77d8542d472f8720ed8129a97fbc2ffe26ac8 Mon Sep 17 00:00:00 2001 From: benironside <91905639+benironside@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:19:25 -0700 Subject: [PATCH 0546/1049] Creates 8.10 version attributes file --- shared/versions/stack/8.10.asciidoc | 68 +++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 shared/versions/stack/8.10.asciidoc diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc new file mode 100644 index 0000000000000..5c668c781a755 --- /dev/null +++ b/shared/versions/stack/8.10.asciidoc @@ -0,0 +1,68 @@ +:version: 8.10.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.10.0 +:logstash_version: 8.10.0 +:elasticsearch_version: 8.10.0 +:kibana_version: 8.10.0 +:apm_server_version: 8.10.0 +:branch: 8.10.0 +:minor-version: 8.10 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.10 +:esf_version: master + +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: main +:apm-go-branch: 2.x +:apm-ios-branch: 0.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 3.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 From cb0ea0385f93e9f0bf9f067d90f9e1f0c6337066 Mon Sep 17 00:00:00 2001 From: Chris Cressman Date: Thu, 17 Aug 2023 07:58:47 -0400 Subject: [PATCH 0547/1049] Bumps docs version to 8.9.1 (#2729) --- shared/versions/stack/8.9.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 44916d2174353..13d37b6a5f5c9 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -1,12 +1,12 @@ -:version: 8.9.0 +:version: 8.9.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.9.0 -:logstash_version: 8.9.0 -:elasticsearch_version: 8.9.0 -:kibana_version: 8.9.0 -:apm_server_version: 8.9.0 +:bare_version: 8.9.1 +:logstash_version: 8.9.1 +:elasticsearch_version: 8.9.1 +:kibana_version: 8.9.1 +:apm_server_version: 8.9.1 :branch: 8.9 :minor-version: 8.9 :major-version: 8.x From 6ef266e788968bdf4e0b029555fdd298b75a5aba Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 17 Aug 2023 10:05:59 -0700 Subject: [PATCH 0548/1049] Remove kibana dependencies (#2739) --- conf.yaml | 8 -------- doc_build_aliases.sh | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/conf.yaml b/conf.yaml index 2054c3629497e..28a969743e1d6 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1192,10 +1192,6 @@ contents: - repo: docs path: shared/attributes.asciidoc - - - repo: kibana - path: docs - exclude_branches: [ 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 ] - title: Application Performance Monitoring (APM) base_dir: en/apm sections: @@ -1707,10 +1703,6 @@ contents: - repo: stack-docs path: docs/en - - - repo: kibana - path: docs - exclude_branches: [ 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 ] - title: SIEM Guide prefix: en/siem/guide current: 7.8 diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 51cee4b4b5b16..a276abc7fb411 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -85,7 +85,7 @@ alias docbldsoold=docbldso alias docbldaz='$GIT_HOME/docs/build_docs --doc $GIT_HOME/azure-marketplace/docs/index.asciidoc --chunk 1' # Solutions -alias docbldsec='$GIT_HOME/docs/build_docs --doc $GIT_HOME/security-docs/docs/index.asciidoc --resource $GIT_HOME/stack-docs/docs --resource=$GIT_HOME/kibana/docs --chunk 1' +alias docbldsec='$GIT_HOME/docs/build_docs --doc $GIT_HOME/security-docs/docs/index.asciidoc --resource $GIT_HOME/stack-docs/docs --chunk 1' alias docbldepd='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/endpoint/index.asciidoc --chunk 1' @@ -110,10 +110,10 @@ alias docbldeesr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/enterprise-search-ru alias docbldewsn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/enterprise-search-pubs/client-docs/workplace-search-node/index.asciidoc --single' # Observability Guide 8.8 and later -alias docbldob='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 2 --resource $GIT_HOME/apm-server/docs/guide --resource=$GIT_HOME/kibana/docs --resource=$GIT_HOME/ingest-docs/docs' +alias docbldob='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 2 --resource $GIT_HOME/apm-server/docs/guide --resource=$GIT_HOME/ingest-docs/docs' # Observability Guide 8.7 and earlier -alias docbldob='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 2 --resource $GIT_HOME/beats/libbeat/docs --resource $GIT_HOME/apm-server/docs/guide --resource=$GIT_HOME/kibana/docs --resource=$GIT_HOME/ingest-docs/docs' +alias docbldobold='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 2 --resource $GIT_HOME/beats/libbeat/docs --resource $GIT_HOME/apm-server/docs/guide --resource=$GIT_HOME/ingest-docs/docs' # Observability Legacy alias docbldmet='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/metrics/index.asciidoc --chunk 1' From 37376b9c2514dd1b471dd84ba1fc113d849f7944 Mon Sep 17 00:00:00 2001 From: Karen Metts <35154725+karenzone@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:17:14 -0400 Subject: [PATCH 0549/1049] Make Ingest Architecture docs generally available (#2742) Set Ingest Arch docs to 8.9 --- conf.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/conf.yaml b/conf.yaml index 28a969743e1d6..8457e5faa5c48 100644 --- a/conf.yaml +++ b/conf.yaml @@ -272,6 +272,22 @@ contents: - repo: ecs path: docs/ + - title: Elastic Ingest Reference Architectures + prefix: en/ingest + current: *stackcurrent + index: docs/en/ingest-arch/index.asciidoc + branches: [ {main: master}, 8.9 ] + live: [ 8.9 ] + chunk: 1 + tags: Ingest/Reference + subject: Ingest + sources: + - + repo: ingest-docs + path: docs/en + - + repo: docs + path: shared/attributes.asciidoc - title: Azure Marketplace and Resource Manager (ARM) template prefix: en/elastic-stack-deploy current: 7.11 @@ -2326,22 +2342,6 @@ contents: - repo: docs path: shared/attributes.asciidoc - - title: Ingest Reference Architectures - prefix: en/ingest - current: main - index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master} ] - noindex: 1 - chunk: 1 - tags: Ingest/Reference - subject: Ingest - sources: - - - repo: ingest-docs - path: docs/en - - - repo: docs - path: shared/attributes.asciidoc - title: Legacy Documentation sections: From b076e4262691d0d8fe066f26aa2a1650056e222a Mon Sep 17 00:00:00 2001 From: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com> Date: Thu, 24 Aug 2023 18:37:05 -0700 Subject: [PATCH 0550/1049] Updates conf.yaml refs to include 8.10 branch (#2743) Co-authored-by: James Rodewig Co-authored-by: lcawl --- conf.yaml | 118 ++++++++++++++-------------- shared/versions/stack/8.10.asciidoc | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/conf.yaml b/conf.yaml index 763b200ea0b58..68cfb61a4056e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -128,7 +128,7 @@ contents: prefix: en/welcome-to-elastic current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] live: [ 8.8 ] chunk: 1 tags: Elastic/Welcome @@ -147,7 +147,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -221,7 +221,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -247,8 +247,8 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8 ] - live: [ 8.9, 8.8 ] + branches: [ {main: master}, 8.10, 8.9, 8.8 ] + live: [ 8.10, 8.9, 8.8 ] chunk: 1 tags: ESRE/Guide subject: ESRE @@ -276,8 +276,8 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.9 ] - live: [ 8.9 ] + branches: [ {main: master}, 8.10, 8.9 ] + live: [ 8.10, 8.9 ] chunk: 1 tags: Ingest/Reference subject: Ingest @@ -307,7 +307,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -322,13 +322,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -344,7 +344,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -362,7 +362,7 @@ contents: repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -403,7 +403,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -440,7 +440,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -466,7 +466,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -482,7 +482,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -506,7 +506,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -528,7 +528,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x ] + branches: [ {main: master}, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -541,7 +541,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -554,7 +554,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -567,7 +567,7 @@ contents: - title: .NET Clients prefix: net-api current: 8.9 - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net @@ -583,7 +583,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -612,7 +612,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -638,8 +638,8 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] - live: [ main, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] index: docs/index.asciidoc chunk: 1 tags: Clients/Rust @@ -738,7 +738,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -950,7 +950,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -965,7 +965,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -977,11 +977,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1003,7 +1003,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -1020,7 +1020,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -1037,7 +1037,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -1070,7 +1070,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -1087,7 +1087,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -1102,7 +1102,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ main, 8.6 ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -1117,7 +1117,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -1132,7 +1132,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -1147,7 +1147,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -1164,7 +1164,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -1181,7 +1181,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 2 @@ -1215,7 +1215,7 @@ contents: prefix: guide index: docs/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -1700,7 +1700,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1745,7 +1745,7 @@ contents: - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1761,7 +1761,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1776,11 +1776,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1804,7 +1804,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1902,7 +1902,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1927,7 +1927,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1980,7 +1980,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -2035,7 +2035,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Functionbeat/Reference @@ -2084,7 +2084,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -2131,7 +2131,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -2188,7 +2188,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -2231,7 +2231,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2274,7 +2274,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -2305,7 +2305,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -2830,7 +2830,7 @@ contents: index: docs/jp/gs-index.asciidoc current: 5.4 branches: [ 5.4 ] - chunk: 1 + chunk: 1 noindex: 1 private: 1 lang: ja diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 5c668c781a755..218aed9237af4 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -7,7 +7,7 @@ bare_version never includes -alpha or -beta :elasticsearch_version: 8.10.0 :kibana_version: 8.10.0 :apm_server_version: 8.10.0 -:branch: 8.10.0 +:branch: 8.10 :minor-version: 8.10 :major-version: 8.x :prev-major-version: 7.x From 6ea09d940fcb89009d6c730e4db913ea6cf7a163 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Sat, 26 Aug 2023 14:19:40 -0400 Subject: [PATCH 0551/1049] Add roboto mono font (#2744) ESQL is going to use it. --- integtest/spec/all_books_spec.rb | 2 + resources/web/lib/roboto-mono/LICENSE.txt | 202 +++++++++++++++++ .../roboto-mono-latin-400-normal.woff | Bin 0 -> 15160 bytes .../roboto-mono-latin-400-normal.woff2 | Bin 0 -> 12312 bytes resources/web/lib/roboto-mono/roboto-mono.css | 7 + resources/web/styles.css.licenses | 204 ++++++++++++++++++ resources/web/styles.pcss | 1 + 7 files changed, 416 insertions(+) create mode 100644 resources/web/lib/roboto-mono/LICENSE.txt create mode 100644 resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff create mode 100644 resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff2 create mode 100644 resources/web/lib/roboto-mono/roboto-mono.css diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 1f7ef7855d3c1..48ffd22317f2b 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -68,9 +68,11 @@ def self.has_license(name, heading) has_license 'Bootstrap', 'The MIT License (MIT)' has_license 'Inter', 'SIL OPEN FONT LICENSE' has_license 'Noto Sans Japanese', 'SIL OPEN FONT LICENSE' + has_license 'Roboto Mono', 'APACHE LICENSE' end file_context 'html/static/Inter-Medium.5d08e0ba.woff2' file_context 'html/static/NotoSansJP-Black.df80409c.woff2' + file_context 'html/static/roboto-mono-latin-400-normal.b1632429.woff2' file_context 'html/sitemap.xml' do it 'has an entry for the chapter' do expect(contents).to include(<<~XML) diff --git a/resources/web/lib/roboto-mono/LICENSE.txt b/resources/web/lib/roboto-mono/LICENSE.txt new file mode 100644 index 0000000000000..75b52484ea471 --- /dev/null +++ b/resources/web/lib/roboto-mono/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff b/resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff new file mode 100644 index 0000000000000000000000000000000000000000..f319fbfa46a9c546ad2b4f68e2b6f9267cdfc5d8 GIT binary patch literal 15160 zcmYkjV{j(j_ceUQw(W^+8xz~MZQHgvNhY~s+nCr+Cbq3f^5*{ipAYY;UbTC#+WV-g ztNQHj<)I)U0RRDfH(o9P;(u0s_S^p-^Pl(sZ;~o%A^-r0*f+=i4UQCyU`z!SMwV~R z_uE(dhN0_>lBMgi#%=kJgKc?*u`}}g9+!LaI}iUG#DFgl9(yA@ zvv2O?JBIOlexU*(2H}nlF0SAEg8dzX`Cr_Z9l*@d+3Y))_q%@p)PJyqj1BW#H!(Cd zG~6*}GG;O|baJ|fF-nxKp&K_+{K+UiWv)2(lWxpJ(a6vU5d8IpvjYIUg~9NAC;yjc z#67_k6qFVeFay{Vw9ZU z2ExPR|CC*ag^#`ez`?=RtkUERTw(?VI5Z%9{I6ex(IALGMQq5v_fHWqF|sDjLejnx zcHG~)XMt$URCKVwj^`2xi;bGt;?@(ztUE#$;8<2S>2!;RUr%i%YX=(w)=N`FR z{33Q&o9#AQ{_hHY8I`eZTs+7Lb;f_fO1?Z3XWg zBkqi@Jh#-QDIFq9MH(pIop2o|+Wn$bbSFtVxFmN7J<$5un$n{n?diDRe|VzmO3s6i z5f?2MRx&x)s}xRUa<&rh->&&CatViEJl#$O$*l0DJLG5*ruEAXb&pCii7MDJwi5AED7kojMV^}psmU9E1b&6fa$Ayk<#utuG zSyO3(u4M>ThCX9k+NQc;9T%^<@h@bUZNrqg&PAOX)W&7~0z>De+E5R=IY;8!_uhX$ zc_3e303^@#Djz6AG|8vu>6!z3;B(EA^%79c&W*EuV@HIUVHMK2gP9_!lV7K&vgd4&Bs&?e3IykM?I~2r-S?7_o*Dt+E^5HD^cWS{U@&E z1auN;WKR&puHZnSK!iB`Qod2DiJ{EnM~!~SGySI*%4)+wD_6fG0dP@mB9gCa$^l9< z|7=gvM8^Gl?YiE7F#21#{5nSB&6NkVP$952NVn)BHk3!r8bJua!tw~Ej`WT|4tY3y zZ%OFLKSjmo+jB>^?_V2XuC!-nzwa$Ij8E#Bz}-cd9lgY=WJwm8?|xcDXa zWl78=gsk4W)WOsKBEpt@w|*X@q#vs3K#GJ^ zkg%KHuRCBkiC^4>x4Azmw2@5frZ$1V1tK-z`<44rgm|_m0|i{+O1VcTMFEHu{TjaB zTJ}b6yIAJMJ7ai=gO6YFxMTvl?Jy~h-Kw#F%Bf8#dz69l`+@p8-lZ&~QNf{-7=+T3)`{TN^S>0^j9ZckIpZYwTO00XH@PjWC*usnhDR%4^4fp> z0suPaxUk{lA*SC~z(YhOO17-o;)lYCYN1E}As!#Sy)D>TY$%kUU%PYp0W#_5!Bed` zQw7t-Wk(0S9!|ryt5%06UoG;5c~|$dpyrm4gBG&%aYHPKyLn_7k%ha&v|MZ9w{fvNSW@9v$4g8j7=4A-njU?c+X!bJWnu|B$yqU=)0;MweFu}6kWc6Z9UPiwqUlH4c`7Tdk&gHTg8&EgHYr> zIY#O~j=S-~;peq#4*UTV^0g1JeK~Z=4cG>e=AQYmhApZ_(T?LVUB%{fp}8j=niOl@ z2HTLd+A^*iKJkDC(7utTzrM*Z8vjn<_y1s5e@IbR|Mv!j&Xw^Hs(LH(N09=vm7gj6 z@*E!w`DLNXP!&5op(grf_z0GzJBJB>Rlw_Ez_j{9;}4)o?C#0Xar=Rw{lZI8cf@Hg zJS=J`uwO_A8E{DJf&&kBdy&_G>iUj0RepBfyW3#4r!7;KgPkG;3yNw1e0C@!OR96rR2x_FT!;&qtJ`!eONcmj!081B7yL(X8(EgF zDN|zLh+DrZiVfD#QYhOOmZKTeADzPPJh|{$1}NutV|6Ouy7FT~s?8e3KUS6)je|uI z-tg22v-UlR^fkJlpa``w#F%Ot!UP`MOtV9dYV7x&RoMJZrH{8GBLwyyR0mHNmbSiC zZZhX3Yj|N{U#mAYIX%yx%Y7Y=*tl?%jmTjuudQz@VWKg+#s|c5F`~O}ihH!k+e^p> zB*CorqyPc9dWWO&h%1P*6_Cfrap92u&D2V7`^>Ypx93Hg#dMEbjwn7Wm2&7cUs#q?tG>?mYAh;&o$JXJtaeuz@*3z269>>|C&V-6E7p%O`21D?6=WFB46wggZ%(IK=wk{CDHfl#&5^HVL20(N@;pYV09Z&`s z-=BK*q8TTKs?x068@AJg?rJh1R=qT0TeBg{*w|#?K%>@;C@G@F3Al{zSs2&zSiZzY zJtA5VpEy=27;fjVAqwWmvU8LsXG9n=HYa9G)n$NM>UA}3k%7d+%7@hU{_G~jRI2TP zn3_00)mDd}FC)49DFwH7FOnfmdIRf7S1{CIP|)Sv-gYuSk-@+)M%&}+-NofF#s%cU zZU0326V%oK`p*9k(Ig=7`ZV}@jkUXHfFUS@+tC%{vH3cfvf}7E1YOEM!Wu-u9|=#C zmL)!xuzE~aG$6DGN=LHH!cVw`-4v7~Pg2i|s4GgZuP^7iXj`OLu$}Z?MK$CytV7S%ze(>1&oL_kS>J-^ouoU}Z>E))+HRsoL zmz#ApHOHPrr7=}@S)nP*w0|&x>fMM5z{q7cw?SjtwWHFM9bSr16fGCi`Telkgvr_iZMJuyzVbZ^2JMm734pW@%u!+$ z>Qp&f1ROaZ`P^zIm_SK7WY5&MRqs++ZLk>Ua;8!A^QFkqKcuDG{Zl&T zcCDAJw|w(;fL3m6XR7H;y-nzcQ9SWO!S_wxC7MGnm9saLehwS4$&nzwE67QaW+FXR8y1)4E8~kwpwqk$zcVPfOxzL5~Nm+D625V9yV@Fb&bo)_d-mHc8jMS zo0mR*he=m&;hYk5G6uB{Cp9;1txIb;sWkLM*;$>^kb8arr4LoVEqh(JJUZRh@JaFMXp4jL|5xf_vwC|VR-qzH{mb|2n zE-j1s^FH4~iqrW)0=me4Vk}L^zkVRi`)@>VG)(Z6zhoTt2(d zj=th~Eec3`J{bt_v{m;I7(omh#2WQxP+OU_ud008+gum-?q+tW<}zeKfaPrUpwtPm zAAL*zrv=mp0_|+7s(pNN%$9)c>{F{NSW|S&V?oj7Q#&gUjZ!`?eRv6Y9i%2FEmnfAu-M%t3myL-hlwOT! zj+5i3G?klI1Ti^#b|rd+)yk7&s)i3L#Ma$3E2Bx4PUDzGDWWf`=-e;f2y$a zg5HOlYxMGNdCNix6KpJ*k^*4L$wGHq@9Qd<21%6W-?VS>@}ib7G!yX#GrWQKzi1aI z)_`->TqaoX%r;ICQZsshfib|&YCpQIszANFSt?<)fAaqL#XPxGSsRkJsDA-+mgE7} zFO)bz&pvi|q|6Y3A&@sF=myIRoBA{^-8rcY*`28z57G1PR|#?+eyvW@RNUvW?O$mB z1jP%cUKhG}ew>lfei-enUolCd6wV$(3Hmwv{z-g)JE%|jo}F&l3>yf_;hve6P;5!H zBiNjo2B7gFH*Os@W=q~z?BTsj)F}qJ;jDXqRu%C4EMJU5Sg8q0sPJ_q@XX`s!RWk! z0bLfkqvNQvGh$%jbowJIZ=jINGkg`2%HQMx(af3~2j?6|%c^_Wv&qW}#kB3Yk87w9 zdkiD(WuLb`z3V)}ERbv^;`BKhM{vfAO5RU!4SezlTL-2J-eUhw+>cD{*AXDU?p1QO{K|w3&u{J z_d-0}Q;^lBD5!U868&)cm>0NLk0qfYNR*(aHoW(sMyJmXQcz`YjZ1+ej%#PD4aTUb z%=d)B^=iJd5@06F2YGBHDe3p2;SsI#1OXZ)MqF1bz6r~?@8tRO{)ugAG+OwtsubYv z=rGD*5MK-s8QQAFQ;?6$bFiFrazp0-JKO(v07eYmnX}Wb)>lY5ju3JQ$S$7 zf1<{roW6yoVE%Kj?IBHY|3ZxK{m(cB9;X_i17*$dffynL$U!tN5Uu7icI#H5lex73l>bCjxU=sK7Fid|la z(L%afJ`sL-og0LgyG!5x;k`Wf}YOCwImgUNYe*K_?!o#XuRBqO0 zFDGSF0J6)91^26j@Q()fTblI+{3>_SEJ*^3+a#IY5vge6R_z`>tZ~$&vpH8D{KZVX zXBmbpDyK=8ZgY5tuHQMgOZBW-T{5j=lFScH!P>YFJ-rIgwkLRbhkQxz2?A*i4-!?L99z>okgE z=}sv)Kr7~)hPqOFD&b+uVdu$%{V-)!de7sy8KJqGH5XydndzD3oiS6=^8{=APo5^M zowyoqUI51GHSuZr1T6AdutG6^>kBx#Osk5u%wLVX{ekU$Qc=z#qq!@4-|lj9D0^RT za$=@kd>DI(u#Fl(SK|L<=NO3lf>;N7-dX|TxYK!}RmXV0F^ObVrHG%_x2&cLW&>p_ zcU;`irof75&ol8L0PNd5p7-V3s85(u+IVnLgeC=BM)^rDDedGCy=*4*jy9-!Q77f|0Q_R!YLsZE`$p23 z!L|pqFq0_}eks?xoFzNG6vQRSL8VhoI`ZKmD}kBt6*`DWQ6xr!h6F>6u2Ve=YJw!` zKCQZdiWbfcdJg@IB1^quLJpj!dW1i*`dT?9e%NoK=8*V2qU9A%_NA48wiKS;`$1Px zQ4_znL8lYohsjH34jW$FP&5y0Y_2OFu}V0GmE+H~{vhQZu&kMoIW5AJE#nwy!t~KG zUo2bWgaAkP?MG?cD8$H640ABL#F6qGd69$h47B7e+2=^jWq6P)1Ufd<7AdNSm*TW0 zz7f#jNtrE|x6-M={HH=;Wg;|OynM`A0Y{sF%jP`zCJmz?Jc(ub@g*z z7ZAbw{>>28C6HjnH5nvttUTzx;Gf?a?4m3L=wPRSF6d+O$d#)Hut~IHWzUeLT9RVojA~8+q?dzOz_=Hsig5S zq5!)(^4?n)3+2nhMBsk}50anmgvE{6Kb6)@%Pm$McV2n+mfG99sGYU%a${9in)hcN zFFf!U#Ih^y6)v=s=(o<9-}m{>_4oWPQ7Teg=;%d_m(g?gH;oI-P~)^32+g82Fj=7& zxF6fz+3Xc7L1JHkY2!^j0L zot+!cHG=sm3>RDJ0&}oJUjZ3kiEBdel6y_^tm_0p+|rGNZ|N?6pWNC6@Qh7c{$ILz z>4s^~gb&_U|B#;EpeEB(RkbZV=wjdr!|WaVH2htSOe+SJXb-c=Yo@YT>%+Xe`wLeX zW5vT^LdL*5g|Q%x7it%+j>AOw6? z>5XF=koq!(ZZ;p+o887tZ*J3QXCQI-x$4*<>nfeW~fABLphtjq5D z5JtK8tNU;|ts(J^6>b6c)!9qxY99l|_L;sHiO^vJ>^xs0qT~?%io4Esu`71Ys}muI zJ%b-<@|lXW!~k3Igu*Xl!9hz9I|?wq2Ls=;gNPFpS+*96R4>$d)#A}Q%2h^EObHdx zFLBx^e&Om4%j&cVblHwhZ-}4T@^`PZQ_9@!x-~+o=IJVe!U=Y3lFNH<+A4)IC39I$ zq6G$rN4H_Ri10e%@)Yo{6}=2$y1!=mSII7HzK+#V>2vIAF$Y3XGl*DrNI)_I=53f0 zLicFt&C3;skg(A?YE;cB#!7F;hb89yi<>gBhMMgO6Bv_jx^b6haf{j(iPMtJbOj1@ z%#p=Aj7T*~l-(esBE^2u(QC`}`nMqdtMre8enMo!gVTBJyq?$Z=z2IeL%Gx!1`JW?ypfsgsJ&gAoXBm@4CU z%5Iy>;~X3-L#`YmzpaBpFoZA^0uVV|9-lJ9x5p`8{8h-Z_^jmWW)Azo|F)d0Cpi)9;c=8pD^LR zb?*w38KFeABR0n#z*3OMKSzAj3s`x+?{jW%(+xn|9XcyMrOiLO^GrQTP8+^ zva?JQq_i=n>fZ74fY^7$WvEPH2jc`hQ>c$efdH&exH}@aWl|=~$zNTL#ILrO zLeRTd@{D{PGm8k~tLf2%y4O^0j&Z0~VJMhoVs~BtL~iPrjMr9=Y**l57&6fJ3GzFd z&0{{aKn!*kL>ftVM#JO1w+NF1*~v73h~X-Hz)5GQLw4{NP!P7LMn4qA$|G3%6YI0E zfnd_K&|`HJBa(m6(lTn|&loZ>(G!94B(7s=PNK)x=G)iquS0vN)k2{e&=BhLO~oAm zjzDhN9xf}dKbLg@Mb+LIRt-OQy~~wXU!<1?m6MnX>p3daJV|jHle?6UN>!VA=rlIO z@oOZ0DC{`m>k!{52yOfl*_`CME1Q{#awwbIKQv#~Qc#o;;(SD3m7|aRtFjd^d5xq2 z{%`aR*eY3(Ai8D!q9jZP6M~WTj;!sC{cp!n_@^4n>l-Fb!{MVTi&}PXT%Gna9f$+N znq4z0mA4;=(CP095N^B(o+J@WQj>zIhDZmr?5|O4(m&00oN>1Cd3nnP3eEjSt!pil zGzFrOQVgTSY)=uoan{XwSUb4n$xJoQHxOsVpd2sRNo;nRW_C+4KM6;PNspk`TQ%*T zYHozDCirNp;D^MrMABl#rj@RH(s0>x@(>$m zs}+CTwAxmCtI1Ada7`X5u?hcXpGrqe7bvUajN!)TI<-)W6{fy)z#AOq(H`- zoj^BPe0o!wH?7b7leUy2e+p7S8=csJ>Haso|MG9s3rdZa)7QXYeR(<*aK2(urerW9 zWeieRvc@6y!Y1KUFtO*e6*j{~l&u>>eT(;_bbj8`wUl+UB5}OXRzbM4DX^mCtjwji zW784b`?Wn>1L}?PN1)|}G+nlon2E;7?`<%pdn#dU_)sS|)<++6JRK@bSi z<}zg{)iZLf=0CO-OZ#&2Cb~3gj?&Q>!=r6?1I5NM!_FR(#F zNO7PqtOQn@NB3dC$0vyNXPaabY}BOP9J-8q)Jr;HX+&EdPebf@@#P&>uYKCe{VViq zLC!(-tmD)x7OFG5&thkY=w9}KVQGZVV0tcBx88W{cY*2~7q`>O=kSOrUTW44%BB3O z4s`_O@GKwE-{2 z^fgNoBqu%DFuQqL){VP1wNCv{(t^kd)&E>CQ)muB#x1cIg4@Z zOtXi)Z;~r9MmGM_I3eEFz=UZ{*2B)gpuM%(P2q60;jWZs;YgAHzZG6Ka;)t zP~v!WZ@EA>KI7KI{3Di}OR6&{4Yi{(ISa+nild3Eyd#1!P6mFmK9Q`RNR#U#cF03N z7s!32lm>e5Ns!i6dwBErP}I8uS@Zav+rd@Ps)9lD*4Gr0^BswA{>*lv6**#L*6qA; z%WIaZRmRe|RsU5PJH(7~7=eo|)`%9c6-GpnV({52S zrklX43|Snp?kj4G{tDTgA6A!L#y#qincc3kmkzJ^lo@mlg{J8rq;6JVL7dB^;_|Ea z+>jU<3{4`gWeWE~nFhU0Icc$tmMeF_Awsl>$*;J4OuBubq=5lGyhYaK%5^qZ#tb!1 zd+q9enmq^4(P!K+6RAa{j{w;dJP^bhe=FR#U@ZFG5m!FbL9Eqp=>XSG&yXOXW#3e; z3iC%A$jihc5i`l3^2UE+4D$g$SC%+97E8~UBQ~^YX)LDlvqc^gTf*6+v6I>f!N(+z zNC|CE7tvoZ*yF`_{80Zgo5<{@aQ|@!4^n_F|NO%d?E5x`o*M-}>=bGhbBEILl`xC) zAgP&sMRf4=g;Fioq+Yb`HexIbW!)_WW3cKx_Amsf`(q`i}($F1PLismLqY1M2Ex5wObQo+1kB#zzR0!N+pn#4!G#Q=8{a16x|kkW81K=NlqHvRmNuJsUrWafos(6Apx0K4L=#6aJD$ssPSu zZK#Rl$&%Lm_#+Q@s)cgH%BPA&@OqqVHnXUXM5RHU-4zuxk>l^^u-4&m{3MtiiDaox z{ccmqNKato$tCFraer(leCKd6`&|Jp&<1n=Nc_kdBw8Yv?o24-fv$L1P$gwVVmRY- zypa?H?YwWn|MdLW{ReanPgzg+;9(p%&;nZ^9{9?v$Oa>)$6zr2WwKfSEH=kcAq$;e ztJPR6MtAlb4T0a%Mf-ZY``tfc>y@}U06orU6R*T#MbC+=wn`AIePTbpq(oDP&#mQh zvxo5lOy@b@&W}xtpEm+ZFjpDgoRjx?%dy6p3G+}Lq-+k7daf@-K0*$-kg(XCa7vEa zxzf{UpvkF2N8{FJN{yD4*qKLKQT6dgwVox-zwX^)u9aU z+Qi^q=^6yPuhos&^i!BvJCSImL~P#-!|&h2&Vw*Ht0LVIF9B@H`C%n?Dv_;<+Mz3Y zFuO)L%rhTq643-87otBBGZ}0AR$H{L6Ac8I5;PPn4SMI-lXTg>=C}vWw*L6d+c$`| zgRBlat*oa}0qyxgLm*ekTQBHqU0Ww8+cUXJi>__m=Uo4ZxIL8h$^buK{)lV5H+@{@TbIkjuyC#bCo*OZ=69VNU<+6Jt6J zni{ZX;%<~CC9GX6%fC{3p!9eZ6HV-d;tcgib@?V;h~nv;o9v(y?dDTisUh#6Yt^J6 z4@ct9OTeAlhbw9yHlEi^der)UxF3JPCNwcGtiU_#dou;J(#Pype|VW?GWWZ3_|HF|0HiP4 z7mjz#JHvncz%7AQYsf*);$t-uVI+|K33Kw<2J(>^3;hG;-0tv!w>UNQ@Y8$V(#BuRyT_F|w(w=P=?lCU6vYd_ooMVp|mx-cT|6V7S>5=$l}?*6Uo{+n^p8j&Ig+N*kw9P zLa;`3A6IF@v5`<*rE zZ_!2)h5916Clixy?%OsGttq-~niR@ev0XcQESnU7$`(ojY^m<1}y9!i;`P zOZpn`Z#3S=);>OVTQ)!meV~j-FqRWz!c54OYFzsUIMCGkWdis-qkjItk&GYZK77TL z%#o+Q|LK@DS1mUh5Fg{&WiWg_Lo6S5zIzF>1=QL6dqZKvn6ay$l?%~@^WPps8w zxAsmJvycXgxbj0h?YnEsiz|EEK=^>h`g$M`r2%m`s&t|LB`gSp%Gi$|eJ&dW*U6=> zm$MO!&T|YC*-9o_1|Tw;xJqK)>IXwQIikW9KF0^!)r505KzkA4qH(p==zKNpe8%MV z9OPw7(2SX;1nkS7tnL3;;1v!;FUngxlOTmuL~O%G7|zL-y>S&c>6-S4D^4QG#z+^^X<_Gv**|k*Dsi#I))4L z?a`@lyn6xdFc-d_0NFNsl>6exN`wXn5lXZLVIaOMLSK0fxVijLfo|JSAW+pySAzPt z3Szy7h~0v(i&%-N>yMpVenij#ZD#TrzYFb~5WH3&;{~BlG@Z*;R-%xEn6K|CNIYwF za$fDDO&Os6k>k*EZB;H%-0P1xYkjsI5dM6)R9J|MUmD&&_uk(p?-+enGLyGB_FjHH zN60?%FYiRl66ZsTzrnF=8G>AYJ;ca8bsFBto>&%p(+)QTCRXyuhHc%Lkn>C_ zICT+7tgX=B`lG7D8N@(QQ`dGrb}W`cT->nA#lXu;Q=T$ALf+) z^z#>@QbLh5<^2G2w1VHz`dCjaU18&UUjP~kn_$A%>)6L8sGR?mU%#u0r>}oppkE_J z`bMG~BQ2pqm-BI1E1r(e{VGPq!8=rw8y8`Q)v$jvPo@5A+sv_X#XQBM+z6yTePC`B<>IJfkBTh& zYkm35tK%A8_eZwZK~2;?Lllb7XO-2iYuX$qrJgi#>}{-EvY`U!u)` z_2Mdq*VbkjA!B`X-<+##^)oBEq>8qc6PU__XQYd+@5{4;H2qtKwpR|Z$P=buL)b#MJ*TAD~son zrPNeJ%_yrWwfqoe%gQB9w~&geBn9Qq`>bmh*d;n=j>BYirzi6*``L_*LF6!Ml;%ZP zv);w+y5+^c*&B#9w>bNEn+KDECrkdQ|VqeU*^RdjY1bS`cEufb6Bdw6*C0yydF64Mp1W)i#_-qkIRkc7Ao z%;I1m2d}A#*;uq9Njl$n*a)7ByTY9rv!mWA>Yhn{;&ZB8!PJcSQ5VR(5~RkqD*a8n z^KL>%0{L_-6qUL~$^~N(VoW106l;~Qp^4l))ZC1@!yWIo>ylG>pCI`55>{EskZH7A6KS5i zSxu$fVf}w|_>K82V|WeMgE~5u>J$9&hn1MeMtLP!N>5PaEc>J)Y`Cv9>3n)5K~W&^ zd%ZCQQij)}(Og&mO*nx_lCBcbK1?_1IuRl*+$4`_iVC;%7>+CiPv@lgd|zS?O*WRk z!galm$^8*=>FNk#FqI+1#C15;<*=Ftr$SacvEHixWFF#UB(Ji{dd+dnwz+F{M!i&J z!!*dWUY6K;VA6;VLo31El6y0_S4~Q&>f^;Cq|P;Co<>fEf6ZrS+r(WpzV^2#so>2- z5#Nd^Kji!9<(Y4b=)FH|`%tAdR}I6`5xlS4N+Iu7boR0KTA3Urnf9Af)5D`Bg+C&f zQah|lV7a)p2d%xN7sR1{6M={H_xh%}^5xqpJyAWtE&(R1F?{8+{Oi_+4T6ixnBAXIbriP?=P+RwVysj%Rw-Uf;kb&o~ZADPNC_!P!L zJSr5JxOn%G6X*=^u(dKBclK%c#u-I{KS4zCK#g*13gJ zKW>$yJVCx+Tm^}V_7OT#)!z{xbkPlhd5mV%Os4HBF2%4g9Pu9rZn;+f2#R) zsF5a}8zCXx{OWZ|bZMT813 zrU*i$OU1K7X2}Y>JwJMQX=b_KbR7i4NQ{6KD2awQI)s)Hj^bgTD$VKt5jB*^VDeKM zRWP?~_Q7?7Rz*40_qTX&c)rQDX-1*#gKXW87Xj2_i&^QHxH;}Wl1afe;zVP9QFg-D z>R7uL3I#0!YH$;#X`*wc$2j%OQ*2G*`dE2?|D=7Sgc-~!^1UBi# zn9V!3z0Fu+;29+#hURIZ@V_dyVZC9;wQEs(Fgy3i)oNz)^TXUDmV6>E21l;#dD`mAr6e3~zE2 zJIvpDc#K8$%O=H4%}zVuhL6>K8ry%~ry6MUE18`IC(^SOeg`Fi{Bxx}?7A2|Q=Bq@CR90{5y*6J)7>fRlBxx8QWd75ex268LC83SKT^Io9f9(J1 zs7wuaq~3hKbySBJM9TqowpT(Zs(sLabOea~Z=ID~BC9Jl0A2hV$Xn`TXHxrrTBc6b zdOIDJr&TTEe`o~`B|4}8TBif1g4-XV{CvY%dPh-52s7NKJ$9Z>@f3XK0&rS0s`9rG zSot}}0z{t17%-+g*1o{g49C4FOzja?zUme7c;*PAF7mYIWjkgNjze(!t|fZ8Ion4S zqHwLh(2&gOhq8tw0aX(Q{0Aw>!l40qLXLUG=6)mT6D(k(vt?i$RVtY zMr@25yERxJ6dc$$cB1kf|GxS4$1E(r5?z5SN!E<8)W`_3H$**h91;s=jvJY0rU^5o zXs&@AJ=+J3Q040M`!B-Y#}T#;sP?!9A8$H@g{s#vx`EE9XAa`~txyhll3NuDP{aHo zPjp5F2qEf1;Rn)Du!Ep}Ie&Ss)AxflZ3>|SX62S+Kd*+eyi#nxx6DoRKNXm}kK%vk zsCVVD;OcC*V;uR1pi0`>c&=G~15Hi_{RD@_dn3^%&X&xk2mcaZ9RC8J4W9*HZ8r$x zQ~XoUGsZK*W8S0BNB0NbzgAFkMRG;fx*v|bncQ4lp6o-R>*47U4B`0^VUEj=`;N6Y zr8g;3BY&#?EdSfAy=*w-F3bHlevd1x- z&vzNqw<2nAQ%5BuAG5Smhp%G zF4`ANP|8pk@(;prA?ae6#4M(FpCL9>qaluMD1jsPbibS@=(UyKda8S2_bC%k(sU{9 ziMe;Aeq)l|2F3;TQ;(nmZ`B~T`x)x=kl;3#L9#5%3tq2Bz_)Pk|LG7t`|6T}V~g^F zFeXI-=8zHqj#^M2&-J(@c6Tr#c(GAzb9pp#^Y3?$)$FV_tg)ZIu+Kp}lw*ASVYl=j zX>9YLfzq1;;34g?x`0#!O9|n%NNe;oIn9xh2Aq#@Z!@@cgqU&l2i)m2pp(@fq18U^ z@M33(SN--k`re}WCrVr5XzV+wJ|sq8sUoz6%pvq6sf?z!_Ixr}D9Pv&G|5~tk@7`x z6vJ4RR2wNWak8Pbe-5vGub+?-Hb@K`#2R0am^|v4n`5jL9#U!RaxTO8hcG3 z;)i3li*@%TUT|IqPOORYI;^|nK#Qn%tt!EY0Chme`RH$(w!?V;TaTWlcMSwT48N4B zCMR!We0i^XCofUPZjxokc~m3z)~<1qr@A0|{Qcm2?6T4)gzmS9)%`l)ohD0I{|9R_ mqlx(c_R<^>@}&h&Efk#uf&c)}FoDbi0Bs;&VRhhffd3B}UpW#0 literal 0 HcmV?d00001 diff --git a/resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff2 b/resources/web/lib/roboto-mono/roboto-mono-latin-400-normal.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..ed384d22fd9f566df41a3a37de9f614adc7f630b GIT binary patch literal 12312 zcmV+zFz3&APew8T0RR9105BK;4gdfE09Tv<0581&0RR9100000000000000000000 z0000SHU?lnQ&d4zNC1R35eN!_nPB-93xh%c0X7081A{^YAO(d42Otaw8<#{yM|0RX z03^)YFNzArVetRqcw^M)o>WMs15@I}JVC;O?74%iExHzrCtQ`IpS|+j?vWiQdq^xW1jx}MNS=ey zH~B6x*$zR~zV7w8x*^zRhtYEuXoDb#3W!Q8QYB&m+JqR1J>87yTw0rR>ZVSY#-_N& zMSiXOxBgi4$L6u``sug52dKrIpz1+BL{z`G_55h;sVJ|`_$*u?mq%EnLt+hu;%yKN zzrQ?aTd#ns9Qykb;-GXF00ta0l7Yb{m=zZvS8KW##C<>(CW@f7o;V&fIEC zVA3Ay{eUt;rFWd)H!2E2F6mIf5&$Na**iJcg_L&Si;&Ap3R! z0ssQ9BeCLt9hU-pZuONVAn3W$Pz-`TwAE!Gh!p^U|EsgzxM6i6Jzx#M+-ODt2!9-) zUy;`V?3V`f6z~k!58RK+`prQh0&ENB|5LjEZUC@vKnq&{$mU-l01U=xQm2p`GX?sj z(^~XoTU}UC4FUguEqx%40D+-k%TyY~8PWqlI|6`Xq^@H?2ui$^f)2$;&dLHA`x2Wq zI~;JpE9h@sI*kTR=Hp4Sc0~KRyW7Fi80@H@Xq1bysv0Duhu^J`D1j-P6- zefxp>Vg3E{_jix4Kfd_*!ehnb_{Z|c%*WKnjK|Tjm*Fwtkr3sFuHzhX|B;<4*W+wl za4#Ecx4)wyxM6id>zdrM@>R8I+Vtj(%q5E()g8u`if+wsm2Fi$4^)XsDap$^FShfp zHa%Q^VdWwY_w2Q zchBfcAs(DtS$f)DFQ2oi<@c$F$4#>|y^W??vS=(Gt9f(Z=;rTxmQlESv@sO7%VG5W*Z1G# zO|~Z-e!Y!^xW6|bE6>UBtUF4*&I&Ep{{XOov-((vX!byc~TRzx(2f2@X zW<8c0zm90*;)zA>Y3kFD6KRa7OxSq0_u`&a7PvwYmx8tycBU+EpD&RpS*wV3yBzP$ zBqk+9?A&0Y;`S@zCGx`5nfoFc!4*zxB#p~W+DmYlU0wu}{(@7DwZ3g{&XeknO6!Gs zKlebr9vf1!nYHkWem8@3A(#CLea4d<3XC&MjdJhkT&Ddt= z_1wGNZLK>TUmRCXlJ`{0rnz%~U{aj6y$x{^_tWzUp>n9j3i@XT4XjO}*Z!fleeq~8G9$jf1FiU&pX#3y6=vAvLN z(RhczqY{8ysBz(SVeH9}N`Lpt(nS)MzOlxz`V~&0FbO#`TGKU$)teCz9l@TtmFcJY zvpi-23hS(7f)aIpoc%*zlgMoJQ2c0yvsay8nY%Vedg4QXuo6Shr1kS%b|D)kJ(gtX zlyNeHYm`z0>f7m{|FrX>1m^r=H9^&(86Y#|>kJcYJ18)5jO~!X%FY9e1L}SN0vr~t zF=ZLV0Xe|WLz0VESgCS;!X!=Z-i4iWyu7Kc9liZ4LuINd=WWp5_r=26Ejl!U!KNdi zzzk4d3LGOVliNl0*809ANzm}XntBLgif%<<)q%;k!xne+EonazNl*DKXWa%A}boVd|cFw8@ zsOlOxF}B^3CcrV&KMndC6-ulxZ{O|T25DMlG#wPVX_~C{E2E5roOW7AhN@U)GT#s9 za9iNDD9tq3dS@={X*^-sEceB*;({_=7(J6>clF9pZ~qS1HuFYe2|#cIsb_&*^HcOa z3FV^v>2*m#Azg$fU8I7LlQbK;QcWZij{T_M61mVe04J3bD&v*xCi>GsLWf+>ZbwLc zAu&l}Hx*xUm)tMZ3Xx^Y$$r#RHXzFH=a$!~?<`SIbyh zLIT+pslb%^8Dn;*9`V8x`?Qz{GUULcx;KgUSQCm?$D?AJOvELp(Aw4#=hDT3DYLwM zgs=B%@OXxxX^E8aq}VfJ@r8Y~tY?n7O_9k+PbBf)U)1JaMnjjp4mP$+5mXSCmr(5e z3rw;C(F~4CJ8x`F6AFS-_1nZZNh4C~WGku%FKkQAWc!YX_sd*?V-=}f(U~4B$JINT z-H~xQt{yORf!^s+JfP>ey8}ye7{NfyLt8Ew#U4&ugA@CL~@jSMIr|s{|rF z9kg$2Or#}obz`cCz~-Fo+x)cmOa#H3Z`$4nlpfu}fpaph&1E>m{K-*x2Bn8Pi?@7$zzy$d#BPx2r(F zp29l0+MkD}AhWJ1F!~jOOT}C84`a!nNizgEfEMWmzPKpa7<46-fO>nXWIzM2VE@(+ zmfQRP*kt7`Prrf1b}4zIP-s4IpikUllfJ+Y1)#@_jCiHQn-kYbbb2LHDHd(HCP;54Q`|=R10qqX4-bhxO_Vh;7N!C zcXNu>aWJi|kMWI{|f$!;z(6&QziP0tLBiQAub5Wd#cb7Mex&v<5KLQw4T+e=jFbQk5h#7JNB zDKFgMs4O>v5-BaAwqI@66PFl>;9zKvLbCJ>_+H(H#mu|?u(!BNbel-B3FFoa<=waa z6l3jy&U#x#D2r;(CZ1`hHb?of=r5m8{NCh>%n8czQ3C50XnOU>VRv5`TA<;KvT-m8 zk|r=V>FHG&wbm)^y!w&XDW)Brr&gz}uAzFG#!q-$Dp7MU-w!OFR4~3U;+Ibu2;#{O z%<7S`xhLL?viS@nANeX+Y>TLrxqD8BjBJ6v@cVw>U_d$_Xl-OY4E5xX75r3ms=yl_ zia4_%g)N44@5gOi3cNG68tJRLk4d*5n7r_FJ6h-^?y#hLq*7844DzX%_}C~6f~*Be zXXYv3FkVHbT!_?DB6sh@?X9s7iXM)cJO=~7)y9k_WPq8Zxp%v^!_)cz>Vnxv9*$&? zw|6y94z1oi`K-+m>7kk zSn`}_TV0DgWw=HH0t?vWR@K;DAsZbT*4GC4a_=jwGAFKpb`>8 za~3cOIYwiCP>=tPOWzanyc>!MN+vyASyHMGAOgXa17m{_ECBn$ML1q)X+27c6a`Ibih&+86C}Z^RxV4$e&2vd z0f~qE`}m;B?==URZuAidJeB}nDd4&{kYMcif@EYXS^@e%%!jdI&GjQAHNe``H2jkl zV79gmXMZ?7(v*B554QoqiQ^W~+e280P{YF(7bn>!a6mrJP(#&wdb(8GOi>n8ef=7d zt5h0rTtR-QQh+a-K4@oCUh?pCa+9ybSK>1Y5+*=mz-WNjUy{~%^wKSoX6*fZ?EgG& z=}>X=B_S70(cw89EuKOSH@tk|RADi0;beSyGdwpTX)iWMiz8E5mKV1iji62h*Mey} zhvNFhjTRQhjU5SpzO|6sz}jSfOoP8G39in?6>_<_ysD~V%sU`_(%%9U-rKxoKC+}` zEj{aLSy{fVWo_azpTqFps=&^@#b;jfvYwXSltEm(SMZNbi~hablXMz;XFYJW)yARr z&g<}ep(u|a;QM4E5i$SuYo}UDD`hlZzp9QE2@M3kAP+A*F|EJ4<4_B_6a5oUJCaJx zdI^h#tr3;QZQ+u6pf6?+IhtXMyTe~&o^Iqn{E^l&=r2sO>v^!|}C>FECF zn4{$%Q)xE6f0;nAdkvX!XUCP<2lu!Fj^MWG!Hz3;LHc#+-D`fyYb^qHSp>wtv#$dF z5Wadjq+`>_ulST!NcZVsP;=77&wUZ)YX)aU=g=@N(=b9UX=GG5%psj`-cBGZ@25@ez?LugF z-J5SvWS%wMSzs$?Wtm)pl9b8IUnfekQ6$a~mY{pLifm?n-nd#Dqt z2<)Pu%UJOl^(iRM7nHC*IZIv|izWwlf;H|VH=D?bMs*}-P@$JCrkZvW>ulm}t&=Ng zC+Q-(a5|wT%Ov9q1)}7OZJ`yi<2(URa7=E!^{gl_%G(=V8EG$ckWwn^YV}xfYHn(* zdn}HRG{Apo0$8yn9-YvE4L-|MayzVM6FIj!W~d-8v^x~6K|`yff2B$&lFiBbXoJ^= z>6fA`VQ?`or4Y?UOPtwk5zQ;7jGrf}HWa&s=IxCB&CK0ij2gGA3EtUsq{N?Nu#-5- zfCI51f(-Wb*;m(hZvR|=76&8RiV)4Ps=<68elW~#te|UYX}*ysvXD>9=Vj6WZ-us{L=bLi2z+EJ2)Q-9k{?d)23?hq|cN!wh&x$1|{q|uh(@l7;ZHhBN7Qlr9v|>a53Du7g~ZswFlFV0on7D@7;y3JyQj!7Q>cx-HP&nX z$NNC|+xf>Ik)bARJgUn>%MMJN?T{fi#A?5&=ycy7 zZ{T|IlzFCvG-P41I$ZhKh@AhlvchTe4p5JQ)$o2{Nn#}jlB+8BCkqHyYf|5@u@V+e z(NY@HWjVAOra<@PsVdlVc_n*~VR{s>gl&{6uaXrfuVR6)>|obsvmN>R$j&0~*u0Ts zvcw&i`fD|`o_dxneu+0H7DVTH^*@Tqu&bH4?G9BSyD5}%wwxI6`Du3V0{cME52wWL zVe#cG0R`C=ADBV#R7R8Y$rvVsvC!=6X0AM#SL{2fx2||j)OK@QJ!zM%?JAP8Xe^bi0Ps%V^^Bu#ABnD97p}XWcnrYS?bzV6(|70ihIP)l zjBRzZJ`;WuQ?qruW_>n7H#W|01101BJvZ0EhLN{JH+9O*NZ9-84zSuMDJS>$GqOUE zDZgKW9gS=XZ^fD~`3Kobx_j|UI$mR(EtdLka2Gg&H5;(k5N*c6My%d@<#0dXTi}&z zSU003F_P&xW4VVT;o6$cBr)O`>5R18xLa0S(c*u!ewy)#^!}8G-PnW4#d0}1G&BfX zW-GG%Q5-sa*jHEMci`~A1y)Joe zI@hn*HE`<+czdT8-TwR36xWF$ERK-MFg1J`vfd}mK;YJ_Z+2O1vd@k0zjAUoBCUE# zOk+1wXA8=r_ck|e78n$D=y7bDV&9*D+&=3v^jW1;E?J_?IiN0LU1i79MH6Yp@^Lwh zN8{4==B0&CMe-tf!%3x)=`dXtk2GSP!`>guId)LG%;o)So}TLL3}3_+BO83f^bs7I zfuz&n*K1-I&}HfAYJb3Q7Z=>#;(_jSJ_WeXNI9JK>(&jEGqZ-sm94DxITU~G_=KGM zwJuHc|M$QWX0B-P>Gg54PP3Ep?3#E`&qNk~Uyv@Wo3G28CpT@#VqtX=90Q8U&O=2+ zV00`d#z2ZP1hbfV!8|_J5ST|pWz2&Dl1xcOzFUY)r_+&{@7}4A6iQkUcpsDjs<*mt zci;D~PN=A96QxY>>NsyW3My|~lF>MxK;_Z+v;+C6;kzUGk^G^Q5?VG)ufN`CVU-a+ z#g}%>aTD(Gbd33h@CLRRwFK{{kK)jCsrnRLzc$915hu$`4FI19pl;ggmYcLRz|d`K z>7MS{Ar!7#>LbKbgH`eIg$S;o46DY3LZCM>&1s@VmOzfz;6C zlHy`Nc1(UiMhPx4YS{Js1f&9mSm3k(=IK{l>JtVB#8W4?-*;3K8T^oZZekIVBd7>$ z>cS~4Mjbsp{tur)!!OUj`v^##@&><6yYOl{37+)V_bf!rJGtl8Eab_M(O+{>;Xme% zd%&Op96l7+QCgwz92o_!Ry8%^@P>0onj#VujS)u<6B@)d5<?Hx{pB3Rd5jQbD-%B z-5y4bJu$CMx?+`)G|)MqsX1W&?6&oCisQGpCuf^&rVLZ9CEUx+|P zEWG>3t&56}Pi1I4qZoSMG)ag&GDw;-f9KZ9f*<7EfC!8%1gr68P%?e7A;A(tr|Z4B z|G)dg-~4^4-sZI8?jY4af24%2?AhEvN(@hgLZcNQKIt-0DQ=PC zn$YF_xH7>WTXcwfkN^R{`X24d30==J3=;895iN-Vj8P~m4iga-o|cwDIESgFn+pBT z_XXv9pfK>TfVd0ilaXX52XI(n!LH|T{lgfp_%0Cytg0VApXg+CSgcbq+| z4x;xm?NvYoAc*B=xQOpdDFP$h`c>n%M2&M5mwXkp#%Kxex z>cK#hl`xonc7FzXQ^BG|tmH6-msfVa?Q@b`n&C%HYUb=Zf}1cCe&)GWV!ftALoZ<4 zE=!}W*r=azc8bKfi}jE8_=FwBVqGeiv(Z5demKiRm9AFEY(`0dT<|6UkZ#yqT_n~& zZ+p@uRzPVZk5t&zZ&r$R_WcjjcEUPCt(~}f?v0ChT##vg)C~pc`6e|f?YSfg|1dW@O&;_;&*s-qVKO`~ABHMT`0E3#$ zz}jS{Lu>ZMzPiQUl$FKabo=GL*c#{nG`+_yH{x#A{&()oZibzA#iiUNeGdcxcd6wB87_DWN*I| zD^qsIM#~s8Mi!vW)=@DkW^6v36Q%dn7$eG3%oUumTtgRCZhO4%gvzcf+SP@!N}Wb& zkBsb-Wd+1}mr&s0aCu~uU((Ub*(i2&2L9_Sgpqd$R7RWD9I2y;?eF*9Pq1Icyz(S+ zMM@fdMKZrnmgy()ET*}*1jK=+?}4TwAuavzp^dL_d}w}>b9z#F?5R zOh~%UKh3Yij;)-9&h+YqKMK8{FIGekux+h)K}DZFredOqDj#1bOe$+mP3?^2_ER;Q zt{CYK)nEE9XOBO8w3}Q-AS=)-LT4r!hf-$1x$$DHzuAFU@Vm3`#!$I^(l+0k0MKu|+BjS<_VQr|c_Tf^8IYZ+rE z<%b2#-n=t+$F+vgNvH275NGK0ZeXvwWxnOnKxD9KbUK?z7@^aq!H+?6a7;sk<^9(h zZ9#rSlQ^BeMxz;tG-M1BJ4bl!AlXa`kzzelVd2ay_?yFi38YAL+Ap_-5;y;7?#EB| znb4NOp6azxb8uK;!~64R({)rap;??xS;Hm{L~7ORiDjj+w9f-t`tn->ER3cKI6CE% zNRC3L9UA9IpExnNPoLUl+*nE&DQLu?vq$1zEYKQi`faZ=csN{88LJRxT>@|G7~%x6 zNT!I6ktT^HqGa&(cKD>WDx5e&qi+V@TVaeaKheZSsb6?FVv~cuqOjy}zT&|NnST!c zgM)rzzytmLef@x088PsE0EjEs^fUXf%&G0g-dI~c(hPD|19)F=>4rw2ZLO~WC7XS- z6a<_ZTerVYMd&36b49(Zj6@wQ9}ukDdiQVWbn6n^ugdz&{Y$T)KT&P3sp1!WpvjIkvlGb5fi;+^T4;d`gixz+!7pDf?}AHb3?_SBkwUO&JktB1yi zmJTc(86PPgu-K|vjN2!!ZIC9&63#A>+$W9~#pfcF1Hrn~LoW`kc!w{hP!{9yjTA~L zKxN`e=ExG9@cH0wbsB3Nqh8rO+BgbWqi4?O|KzasZ_kh+4eP+{8EVAhb$+T1$Ctm| zV_N7yNdN4IVhxm`vOGta8)!Zz8f=oSBr-o;#p|96rDJ13u=zdj4X_m(RB^{uxi=<#Kcw3LQ}xOb-M* zoMF}Sc=#P}5XvWX2j25Y<@4h6>lQ4kdO;cUt}ifk0^8WW;e7ypEHHbT51GE0zX0;@ zhs#hO-n~yiV>&}ZTm>PiSXW^PwiAO+fV}&FETi}*AAP3@WX0x$+1Q|pV%02Ep|wq~ z#3or0^XL7Qy9Twq$>Ybjh;y<#5(!JL)$yi|N3*v`vvamcKpI=MOQo$zJTH<7<4&n7 zDo(0JaYEUo)EtL7CzOe#C({<6OcF`N66Hmp^3^Dk3S|W{p%kC5lATn+Jf#v4n5t@H z!DGhJG1rt1*l3bH;CYmXHrD-Lwl07J707AY*6h-2i;J_56i5zJq2Yi2d)Nq=Hv(6u zdmFpEZa#lT@AOrxSCaC7No-B*{WarP09${8g3Szc%M2z(r3bsY24|7U!P)L^>DVYz zCe{sw&0b9MW4l5=`ubjTg&_QV3BdKLukQzlOFRhd?X?oFExe|^QM9&np4XT~o-OM0 zo805Itz-jv8k`zb40g}S{$KTkuYI-VLgMD`LhW`{{%b6 zRZLG+)n>Y$S?MkQ@yo%a(g*wg5~#&@TXq6V)v!th?Qs;bJy@XY}nUcHHjyx;U2w6-D6i~Eq7U3mMw~kKwcZmDg2hNdc*Gv zk{Xl<9-If?u^VZdh*&ngJ3f-U@TZ&TJ@z}-KQQP6yl_*Kwh2JQnaO4^yYy0m9UIfY zv;T_sbYyOdUlS-I;nDJv3?o7&sSL|CVDlK}0{-ZW&--bWrF$di=Y`8tIR1uTKjmp2 z@zqWD9QMQPi_5#q=> zoUU{akxlp^T#?G~%BpsJbNYNBcSTsfKcA)Yi@oQ~+#M_?+WK+_qDt)K3eO{#_3(t0 zAii1>;>{aGN^Ru{UH~=+tWB=92ZVpWVNV+J*i(Q1eLzsF1~0blI`!O{=gj-*`IP%d z$7Uco^{m|$<1I)lx`eviG+q3muUs0X)h4+Sc%`J0C1G{kb{C8{H&uNe<+)RQ?^lNk z_!1Lb!*ioHHHFoK$;5u}MwgVDs8)ReeZ`iIfizORIv)w2^wHy=Y zw|cT#n7&7OkmBCcxgPXiU9JnmcDbnB|1EsTVBCF!kmrvio1lBA{#~d6k=Kt;+dukh z576k}4%&A(+JlH^-@m>!etP3Guzo||hK(R<`?WlOPrHi`6QRLu|KHzn{X+>-^z=+X z5Jd zNPR;?#lGfoxF{?PE}k@t{X;{g{u6Tuu`blx>&^XaC@lWL!*5=mpC3F>z+gEK|F#CT z?E&qThb4>%Z{KYh#dAoTB4#d>>qA!3!iIRs`DcJ<3d0Pn@0xG4RRl>$Do;wwkx;v; zos2p7)b}JOZ2*Uu;CtpeygBz*-d`L*b1zSs__fL+>%4iZxxXpJG9zOppge&$w61Pl z+zL^Vx1KoB7!e;+=2r8uTsL00bYWE=7YO)#p6bECVz1o0dT+yC>lW``jwcYFD%G&+ z7B=MuiKQ;lisq=(n<-;i*5K)75<2SA?d$vG*wFKT&k`4GSr>eI{f>hNEPVF!Xs>SA zIS_1f*({Aejcvf7Jc9DrA?3b)Kex^}Ww)uSC(r8EPp?)}4Vd|LnFmix-yyq?$i4)E zXBkXmx%N(+?d2&X8^M`$2EC*s9F}!xVsSV}@DG+Axi*4P(vPFx|R?J|kis7>UDS zzxk`I1CyaIWWQX)LG4%Wn2G6>uOb;DQ=0N0;d7S^yeGWhFYdlUd24*}dk zjMshixr(TCKQt@_ZT)r7##^yqa}jn=7xH?Zp5lu;L39O{v0k8O#PuYM~|dMc!u{1Vz==USI*Uj3GAE zY9J`7*IA!!5OCF1R;46gMnF!WoYdU}&!{eOJpkM2*547VrVKjKC5}Zp#RsP22BE7N z4=UmN=kI%ML!+>^7RdTr7aCRgqM3B&q1f{rO-yVd5@Vs|nB^b*U~Ac7!SZGZ>^d!g zI=K3rlfiF*(PJYLiNT`SHK~%IxXH83GY*tG(u_bNF*uZI6d)pz7#vFXnquc9D5}2< ztxZOvEU+{#AJ)`yZ4V@hK`Kv7z^J$3hDt4Ee2B`)1_Jco<+=o^Ty!^i)DRCVP%AJW zq0+Jy3pn``=KwI2=5LAKgPymqEo5@h@U+?_^I=Xx{d0`_+oGhKPh3Q>7s@y75I_VL*pz=fE{!at>sf)?l}eNMJ^n zeRPP*@QqsQGEmAUb66*%S$%26nDEdqE`ktYAcRpMkQleyge`hi2$Y`}`2dbP57FT} z3nZP)9`X&c5jMFCq!fA6&h%F<-Sf57Xc(0e+DpYtG3uRMc$+dk#)OBpXsMJ$wS4L*G2|IpP+b)+o7YR%S0{v3b&{b!eocwCGK#uy z=Eq8k38H8Md7S`{rLuW(%2AcUR$8cLLzrE5Q=)UkH67fj1VJ@=s&_plxRN{(hxaYi y8_GZp&Pi35@C5P6A&U2MXpjb9suHhj323}mXsI}Cd3Dk1JQqm+@65Nmod5tUdeylA literal 0 HcmV?d00001 diff --git a/resources/web/lib/roboto-mono/roboto-mono.css b/resources/web/lib/roboto-mono/roboto-mono.css new file mode 100644 index 0000000000000..eab3026e081cf --- /dev/null +++ b/resources/web/lib/roboto-mono/roboto-mono.css @@ -0,0 +1,7 @@ +@font-face { + font-family: 'Roboto Mono'; + font-style: normal; + font-weight: 400; + src: url(roboto-mono-latin-400-normal.woff2) format('woff2'), + url(roboto-mono-latin-400-normal.woff) format('woff'); +} diff --git a/resources/web/styles.css.licenses b/resources/web/styles.css.licenses index 6c7daf1f2030c..34f66bbbdc23a 100644 --- a/resources/web/styles.css.licenses +++ b/resources/web/styles.css.licenses @@ -200,3 +200,207 @@ * FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM * OTHER DEALINGS IN THE FONT SOFTWARE. */ +/* Roboto Mono + * APACHE LICENSE + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "[]" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright [yyyy] [name of copyright owner] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ \ No newline at end of file diff --git a/resources/web/styles.pcss b/resources/web/styles.pcss index 637e65959e1cb..0a8cb2281ce24 100644 --- a/resources/web/styles.pcss +++ b/resources/web/styles.pcss @@ -1,6 +1,7 @@ @import './lib/bootstrap/bootstrap.css'; @import './lib/inter/inter.css'; @import './lib/noto-sans-japanese/noto-sans-japanese.css'; +@import './lib/roboto-mono/roboto-mono.css'; @import './style/air_gapped.pcss'; @import './style/base_styles.pcss'; From 2514d1b68cd1adf52c6bfbb4a3c16542660bbdb3 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Thu, 31 Aug 2023 08:23:27 -0400 Subject: [PATCH 0552/1049] Update Cloud UTM parameters (#2737) Updates the UTM parameters used to track Cloud trial signups from the docs. Per Marketing, the old parameter keys (`baymax`, `elektra`) are outdated: https://elastic.slack.com/archives/C01AA2TLEUX/p1691580994671689 --- resources/web/template.html | 6 +++--- shared/attributes.asciidoc | 11 ++++++----- shared/cloud/cloud-login.asciidoc | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/web/template.html b/resources/web/template.html index cc40f987e860f..6538cd4fe8f78 100644 --- a/resources/web/template.html +++ b/resources/web/template.html @@ -100,19 +100,19 @@

    Most Popular

    Video

    - +

    Get Started with Elasticsearch

    Video

    - +

    Intro to Kibana

    Video

    - +

    ELK for Logs & Metrics
    diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 06acb239f56de..d1ef0fda86bee 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -179,12 +179,13 @@ Elastic Cloud :serverless-short: Serverless :serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current -:ess-trial: https://www.elastic.co/cloud/elasticsearch-service/signup?baymax=docs-body&elektra=docs -:ess-product: https://www.elastic.co/cloud/elasticsearch-service?baymax=docs-body&elektra=docs -:ess-console: https://cloud.elastic.co?baymax=docs-body&elektra=docs +:ess-utm-params: ?page=docs&placement=docs-body +:ess-baymax: {ess-utm-params} +:ess-trial: https://www.elastic.co/cloud/elasticsearch-service/signup{ess-utm-params} +:ess-product: https://www.elastic.co/cloud/elasticsearch-service{ess-utm-params} +:ess-console: https://cloud.elastic.co{ess-utm-params} :ess-console-name: {ess} Console -:ess-deployments: https://cloud.elastic.co/deployments?baymax=docs-body&elektra=docs -:ess-baymax: ?baymax=docs-body&elektra=docs +:ess-deployments: https://cloud.elastic.co/deployments{ess-utm-params} :ece-ref: https://www.elastic.co/guide/en/cloud-enterprise/current :eck-ref: https://www.elastic.co/guide/en/cloud-on-k8s/current :ess-leadin: You can run Elasticsearch on your own hardware or use our hosted Elasticsearch Service that is available on AWS, GCP, and Azure. {ess-trial}[Try the Elasticsearch Service for free]. diff --git a/shared/cloud/cloud-login.asciidoc b/shared/cloud/cloud-login.asciidoc index e005fea205931..0d064a3cf2efe 100644 --- a/shared/cloud/cloud-login.asciidoc +++ b/shared/cloud/cloud-login.asciidoc @@ -1,5 +1,5 @@ // tag::ess[] -. Log in to the link:https://cloud.elastic.co/?baymax=docs-body&elektra=docs[Elasticsearch Service Console]. +. Log in to the link:https://cloud.elastic.co/{ess-utm-params}[Elasticsearch Service Console]. . Select your deployment on the home page in the {ess} card or go to the deployments page. + Narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list. From cf8ca8a94bdaa794f6387802fde812a7ae93a03e Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 31 Aug 2023 14:15:47 -0700 Subject: [PATCH 0553/1049] update obs link (#2749) --- extra/docs_landing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index ed3e55f7906eb..f7ef30bff9fa8 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -234,7 +234,7 @@

    - +

    From 303232e4cfd005ffb7932f2e43a2a6bc22e07d7b Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Thu, 31 Aug 2023 19:11:10 -0400 Subject: [PATCH 0554/1049] [DOCS] Add `live` branches to ECE docs (#2748) Adds a `live` branch property to the ECE docs. This ensures that branches for 2.x docs are no longer indexed. --- conf.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf.yaml b/conf.yaml index 68cfb61a4056e..cb724eb13fb13 100644 --- a/conf.yaml +++ b/conf.yaml @@ -802,6 +802,14 @@ contents: tags: CloudEnterprise/Reference subject: ECE current: ms-92 + live: + - ms-92 + - ms-81 + - ms-78 + - ms-75 + - ms-72 + - ms-70 + - ms-69 branches: - ms-92: 3.6 - ms-81: 3.5 From f7f10f060f60d04b0853a2303bc92735116d016c Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Wed, 6 Sep 2023 13:51:18 -0500 Subject: [PATCH 0555/1049] Updates title of welcome to elastic (#2752) --- conf.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.yaml b/conf.yaml index cb724eb13fb13..849bb8c908885 100644 --- a/conf.yaml +++ b/conf.yaml @@ -70,7 +70,7 @@ repos: x-pack-kibana: https://github.com/elastic/x-pack-kibana.git x-pack-logstash: https://github.com/elastic/x-pack-logstash.git -contents_title: Welcome to Elastic Docs +contents_title: Starting with the Elasticsearch Platform and its Solutions # Each item should take the form: # : & @@ -124,15 +124,15 @@ toc_extra: extra/docs_landing.html contents: - title: Elastic Documentation sections: - - title: "Welcome to Elastic" - prefix: en/welcome-to-elastic + - title: "Starting with the Elasticsearch Platform and its Solutions" + prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] live: [ 8.8 ] chunk: 1 - tags: Elastic/Welcome - subject: Welcome to Elastic + tags: Elastic/Starting with the Elasticsearch Platform and its Solutions + subject: Starting with the Elasticsearch Platform and its Solutions sources: - repo: tech-content From 0031067a38047cf1f9b2026a0a313165f2d7ffc3 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 6 Sep 2023 15:36:23 -0400 Subject: [PATCH 0556/1049] Bump docs version to 7.17.13 (#2745) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 82542aad9bf50..a2d88dcd3ea69 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.12 +:version: 7.17.13 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.12 -:logstash_version: 7.17.12 -:elasticsearch_version: 7.17.12 -:kibana_version: 7.17.12 -:apm_server_version: 7.17.12 +:bare_version: 7.17.13 +:logstash_version: 7.17.13 +:elasticsearch_version: 7.17.13 +:kibana_version: 7.17.13 +:apm_server_version: 7.17.13 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 0c982bee324de0c8e82a74c47e34918da474bd72 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 6 Sep 2023 15:38:03 -0400 Subject: [PATCH 0557/1049] Bump docs version to 8.9.2 (#2746) --- shared/versions/stack/8.9.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 13d37b6a5f5c9..517805c1c7cf3 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -1,12 +1,12 @@ -:version: 8.9.1 +:version: 8.9.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.9.1 -:logstash_version: 8.9.1 -:elasticsearch_version: 8.9.1 -:kibana_version: 8.9.1 -:apm_server_version: 8.9.1 +:bare_version: 8.9.2 +:logstash_version: 8.9.2 +:elasticsearch_version: 8.9.2 +:kibana_version: 8.9.2 +:apm_server_version: 8.9.2 :branch: 8.9 :minor-version: 8.9 :major-version: 8.x From aad434982be1db8d9eb007bf6b70e0af78ef6cf8 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Thu, 7 Sep 2023 10:31:27 -0700 Subject: [PATCH 0558/1049] Update for a coming apm-agent-nodejs 4.x stream (#2750) * Update for a coming apm-agent-nodejs 4.x stream This also *drops* hosting the ancient 0.x, 1.x, and 2.x versions of the apm-agent-nodejs docs. * update cross-stack links * bring 4.x back to 7.0 * more changes * aws-lambda: map 4.x to stack current --------- Co-authored-by: bmorelli25 --- conf.yaml | 7 ++++--- shared/versions/stack/6.6.asciidoc | 2 +- shared/versions/stack/6.7.asciidoc | 2 +- shared/versions/stack/6.8.asciidoc | 2 +- shared/versions/stack/7.0.asciidoc | 2 +- shared/versions/stack/7.1.asciidoc | 2 +- shared/versions/stack/7.10.asciidoc | 2 +- shared/versions/stack/7.11.asciidoc | 2 +- shared/versions/stack/7.12.asciidoc | 2 +- shared/versions/stack/7.13.asciidoc | 2 +- shared/versions/stack/7.14.asciidoc | 2 +- shared/versions/stack/7.15.asciidoc | 2 +- shared/versions/stack/7.16.asciidoc | 2 +- shared/versions/stack/7.17.asciidoc | 2 +- shared/versions/stack/7.2.asciidoc | 2 +- shared/versions/stack/7.3.asciidoc | 2 +- shared/versions/stack/7.4.asciidoc | 2 +- shared/versions/stack/7.5.asciidoc | 2 +- shared/versions/stack/7.6.asciidoc | 2 +- shared/versions/stack/7.7.asciidoc | 2 +- shared/versions/stack/7.8.asciidoc | 2 +- shared/versions/stack/7.9.asciidoc | 2 +- shared/versions/stack/7.x.asciidoc | 2 +- shared/versions/stack/8.0.asciidoc | 2 +- shared/versions/stack/8.1.asciidoc | 2 +- shared/versions/stack/8.10.asciidoc | 2 +- shared/versions/stack/8.2.asciidoc | 2 +- shared/versions/stack/8.3.asciidoc | 2 +- shared/versions/stack/8.4.asciidoc | 2 +- shared/versions/stack/8.5.asciidoc | 2 +- shared/versions/stack/8.6.asciidoc | 2 +- shared/versions/stack/8.7.asciidoc | 2 +- shared/versions/stack/8.8.asciidoc | 4 ++-- shared/versions/stack/8.9.asciidoc | 4 ++-- shared/versions/stack/master.asciidoc | 4 ++-- 35 files changed, 41 insertions(+), 40 deletions(-) diff --git a/conf.yaml b/conf.yaml index 849bb8c908885..1d8ab2f52c814 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1341,9 +1341,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Node.js Agent prefix: nodejs - current: 3.x - branches: [ {main: master}, 3.x, 2.x, 1.x, 0.x ] - live: [ 3.x ] + current: 4.x + branches: [ {main: master}, 4.x, 3.x, 2.x, 1.x ] + live: [ 4.x ] index: docs/index.asciidoc tags: APM Node.js Agent/Reference subject: APM @@ -1362,6 +1362,7 @@ contents: exclude_branches: [ 2.x, 1.x, 0.x ] map_branches: 3.x: *stackcurrent + 4.x: *stackcurrent - title: APM PHP Agent prefix: php current: 1.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index 6bde654e59831..a9b2c3647f44f 100644 --- a/shared/versions/stack/6.6.asciidoc +++ b/shared/versions/stack/6.6.asciidoc @@ -20,7 +20,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 3.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.7.asciidoc b/shared/versions/stack/6.7.asciidoc index 4004ffa56439d..48c88c0a7f557 100644 --- a/shared/versions/stack/6.7.asciidoc +++ b/shared/versions/stack/6.7.asciidoc @@ -20,7 +20,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.8.asciidoc b/shared/versions/stack/6.8.asciidoc index 7a77e6f03def4..d78c455169d01 100644 --- a/shared/versions/stack/6.8.asciidoc +++ b/shared/versions/stack/6.8.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.0.asciidoc b/shared/versions/stack/7.0.asciidoc index a97312ff5f232..23f82eb41758f 100644 --- a/shared/versions/stack/7.0.asciidoc +++ b/shared/versions/stack/7.0.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.1.asciidoc b/shared/versions/stack/7.1.asciidoc index 11ea9b7aa98db..a966f14636314 100644 --- a/shared/versions/stack/7.1.asciidoc +++ b/shared/versions/stack/7.1.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.10.asciidoc b/shared/versions/stack/7.10.asciidoc index 4fe8e61a6d495..88b1b279af7dd 100644 --- a/shared/versions/stack/7.10.asciidoc +++ b/shared/versions/stack/7.10.asciidoc @@ -30,7 +30,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: master :apm-py-branch: 5.x :apm-ruby-branch: 3.x diff --git a/shared/versions/stack/7.11.asciidoc b/shared/versions/stack/7.11.asciidoc index 1ec92d4825c88..b66e8732457c1 100644 --- a/shared/versions/stack/7.11.asciidoc +++ b/shared/versions/stack/7.11.asciidoc @@ -35,7 +35,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: master :apm-py-branch: 5.x :apm-ruby-branch: 3.x diff --git a/shared/versions/stack/7.12.asciidoc b/shared/versions/stack/7.12.asciidoc index be96b4dafc67a..8dcaa6f1c5c0a 100644 --- a/shared/versions/stack/7.12.asciidoc +++ b/shared/versions/stack/7.12.asciidoc @@ -35,7 +35,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.13.asciidoc b/shared/versions/stack/7.13.asciidoc index e49f1f1f5c2f5..f85737b96a2b5 100644 --- a/shared/versions/stack/7.13.asciidoc +++ b/shared/versions/stack/7.13.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: main :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.14.asciidoc b/shared/versions/stack/7.14.asciidoc index e35febfc1eabc..95511aa890e98 100644 --- a/shared/versions/stack/7.14.asciidoc +++ b/shared/versions/stack/7.14.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.15.asciidoc b/shared/versions/stack/7.15.asciidoc index 84c5b17733aa9..b68adab27bd02 100644 --- a/shared/versions/stack/7.15.asciidoc +++ b/shared/versions/stack/7.15.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.16.asciidoc b/shared/versions/stack/7.16.asciidoc index cda059d2a8b88..ebed2641c1177 100644 --- a/shared/versions/stack/7.16.asciidoc +++ b/shared/versions/stack/7.16.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index a2d88dcd3ea69..350c096ba1851 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/7.2.asciidoc b/shared/versions/stack/7.2.asciidoc index e28ba755ea0b3..63de951bd78b0 100644 --- a/shared/versions/stack/7.2.asciidoc +++ b/shared/versions/stack/7.2.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.3.asciidoc b/shared/versions/stack/7.3.asciidoc index 54588e80c6b3d..991f922b2ec0d 100644 --- a/shared/versions/stack/7.3.asciidoc +++ b/shared/versions/stack/7.3.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.4.asciidoc b/shared/versions/stack/7.4.asciidoc index 2ace387f31199..d98c4b1f9ae3a 100644 --- a/shared/versions/stack/7.4.asciidoc +++ b/shared/versions/stack/7.4.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.5.asciidoc b/shared/versions/stack/7.5.asciidoc index cd375b6cc61fd..7c224d2a6a61a 100644 --- a/shared/versions/stack/7.5.asciidoc +++ b/shared/versions/stack/7.5.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 2.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.6.asciidoc b/shared/versions/stack/7.6.asciidoc index 3a7eb7af862a3..3b3de28402e33 100644 --- a/shared/versions/stack/7.6.asciidoc +++ b/shared/versions/stack/7.6.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.7.asciidoc b/shared/versions/stack/7.7.asciidoc index dff10663a8ef6..3ddcd0ebc3d14 100644 --- a/shared/versions/stack/7.7.asciidoc +++ b/shared/versions/stack/7.7.asciidoc @@ -25,7 +25,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.8.asciidoc b/shared/versions/stack/7.8.asciidoc index fd7ced4a19cc8..246ca9bababad 100644 --- a/shared/versions/stack/7.8.asciidoc +++ b/shared/versions/stack/7.8.asciidoc @@ -26,7 +26,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-py-branch: 5.x :apm-ruby-branch: 3.x :apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.9.asciidoc b/shared/versions/stack/7.9.asciidoc index 6687d47c95d5e..2b1a42d224f4c 100644 --- a/shared/versions/stack/7.9.asciidoc +++ b/shared/versions/stack/7.9.asciidoc @@ -26,7 +26,7 @@ APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: master :apm-py-branch: 5.x :apm-ruby-branch: 3.x diff --git a/shared/versions/stack/7.x.asciidoc b/shared/versions/stack/7.x.asciidoc index 11a51080fd15f..48f8a4eb89b18 100644 --- a/shared/versions/stack/7.x.asciidoc +++ b/shared/versions/stack/7.x.asciidoc @@ -36,7 +36,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.0.asciidoc b/shared/versions/stack/8.0.asciidoc index 377575147ddbb..350cf91ae0a0c 100644 --- a/shared/versions/stack/8.0.asciidoc +++ b/shared/versions/stack/8.0.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 5.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.1.asciidoc b/shared/versions/stack/8.1.asciidoc index 2e30fd466eb39..7345b587f8f9f 100644 --- a/shared/versions/stack/8.1.asciidoc +++ b/shared/versions/stack/8.1.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 218aed9237af4..8281519e111a7 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -43,7 +43,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.2.asciidoc b/shared/versions/stack/8.2.asciidoc index 03f421df12c27..7f70b37200d58 100644 --- a/shared/versions/stack/8.2.asciidoc +++ b/shared/versions/stack/8.2.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.3.asciidoc b/shared/versions/stack/8.3.asciidoc index 8b36b10ba59f8..04c2bc5e01e64 100644 --- a/shared/versions/stack/8.3.asciidoc +++ b/shared/versions/stack/8.3.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.4.asciidoc b/shared/versions/stack/8.4.asciidoc index 8a1f00e2c47ee..b5ebb59e808bf 100644 --- a/shared/versions/stack/8.4.asciidoc +++ b/shared/versions/stack/8.4.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.5.asciidoc b/shared/versions/stack/8.5.asciidoc index c2f0a5373fd59..e5824312b723e 100644 --- a/shared/versions/stack/8.5.asciidoc +++ b/shared/versions/stack/8.5.asciidoc @@ -38,7 +38,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.6.asciidoc b/shared/versions/stack/8.6.asciidoc index 9e333cbb84357..0ed934ad6eb08 100644 --- a/shared/versions/stack/8.6.asciidoc +++ b/shared/versions/stack/8.6.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.7.asciidoc b/shared/versions/stack/8.7.asciidoc index 7a8942a72134d..3c7f9d147c6d5 100644 --- a/shared/versions/stack/8.7.asciidoc +++ b/shared/versions/stack/8.7.asciidoc @@ -37,7 +37,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.8.asciidoc b/shared/versions/stack/8.8.asciidoc index cbb00f7c7d42b..6e8b9d6f2a3b2 100644 --- a/shared/versions/stack/8.8.asciidoc +++ b/shared/versions/stack/8.8.asciidoc @@ -18,7 +18,7 @@ bare_version never includes -alpha or -beta :kinesis_version: master ////////// -Keep the :esf_version: attribute value as master. +Keep the :esf_version: attribute value as master. ////////// ////////// @@ -43,7 +43,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 517805c1c7cf3..0dc1c8bceda8a 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -17,7 +17,7 @@ bare_version never includes -alpha or -beta :esf_version: master ////////// -Keep the :esf_version: attribute value as master. +Keep the :esf_version: attribute value as master. ////////// ////////// @@ -43,7 +43,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 7341437c3fe52..3e2f6384992ca 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -17,7 +17,7 @@ bare_version never includes -alpha or -beta :esf_version: master ////////// -Keep the :esf_version: attribute value as master. +Keep the :esf_version: attribute value as master. ////////// ////////// @@ -43,7 +43,7 @@ APM Agent versions :apm-ios-branch: 0.x :apm-java-branch: 1.x :apm-rum-branch: 5.x -:apm-node-branch: 3.x +:apm-node-branch: 4.x :apm-php-branch: 1.x :apm-py-branch: 6.x :apm-ruby-branch: 4.x From 92c8cbb674e8c484fb4dfad758a18116e4987149 Mon Sep 17 00:00:00 2001 From: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com> Date: Tue, 12 Sep 2023 06:56:27 -0700 Subject: [PATCH 0559/1049] bumps current version to 8.10 (#2756) --- conf.yaml | 6 +++--- shared/versions/stack/8.10.asciidoc | 4 ++-- shared/versions/stack/8.9.asciidoc | 2 +- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.yaml b/conf.yaml index 1d8ab2f52c814..eb679ce1a4bf8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -76,8 +76,8 @@ contents_title: Starting with the Elasticsearch Platform and its Solutions # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.9 - stacklive: &stacklive [ 8.9, 7.17 ] + stackcurrent: &stackcurrent 8.10 + stacklive: &stacklive [ 8.10, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-95 @@ -261,7 +261,7 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - current: 8.9 + current: 8.10 branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 8281519e111a7..c28fc9dce477c 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 0dc1c8bceda8a..f563564878a8b 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index c6d15759d1392..86947ff5513ca 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.9.asciidoc[] +include::8.10.asciidoc[] From 3540143d9e88475e21bdcdf941203113c2b3ba5a Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 12 Sep 2023 19:11:43 -0400 Subject: [PATCH 0560/1049] Update `/welcome-to-elastic` links (#2758) **Problem:** In https://github.com/elastic/docs/pull/2752, we updated the URL prefix and name for the "Welcome to Elastic Docs" docs. Several links and attributes still point to the old URLs. **Solution:** Change any `/welcome-to-elastic` to `/starting-with-the-elasticsearch-platform-and-its-solutions` in any links and attributes. https://github.com/elastic/website-development/issues/11616 will add related redirects. --- extra/client_docs_landing.html | 4 ++-- extra/docs_landing.html | 16 ++++++++-------- shared/attributes.asciidoc | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extra/client_docs_landing.html b/extra/client_docs_landing.html index 079e7168069f3..a29c2283ebc86 100644 --- a/extra/client_docs_landing.html +++ b/extra/client_docs_landing.html @@ -105,7 +105,7 @@

  • Rust Client -
    • + @@ -155,7 +155,7 @@

    - +

    diff --git a/extra/docs_landing.html b/extra/docs_landing.html index f7ef30bff9fa8..a67ae4e920df3 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -58,7 +58,7 @@

    Learn about Elastic

    All Elastic docs - Release docs + Release docs Videos & Webinars

    @@ -245,7 +245,7 @@

    - +

    @@ -258,7 +258,7 @@

    - +

    @@ -269,7 +269,7 @@

    - +

    @@ -280,7 +280,7 @@

    - +

    @@ -356,7 +356,7 @@

    • - How to get support + How to get support
    • Forums @@ -365,10 +365,10 @@

      Training

    • - Troubleshooting and FAQs + Troubleshooting and FAQs
    • - Introducing Elastic documentation + Introducing Elastic documentation
    • Meetups and virtual events diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index d1ef0fda86bee..ed08b4dc6ad7d 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -50,9 +50,9 @@ /////// Elastic-level pages /////// -:estc-welcome-current: https://www.elastic.co/guide/en/welcome-to-elastic/current -:estc-welcome: https://www.elastic.co/guide/en/welcome-to-elastic/{branch} -:estc-welcome-all: https://www.elastic.co/guide/en/welcome-to-elastic +:estc-welcome-current: https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current +:estc-welcome: https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/{branch} +:estc-welcome-all: https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: https://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: https://www.elastic.co/guide/en/elastic-stack/6.7 From 80028594fccdcda7453e22150df36677e6cfbdd7 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 13 Sep 2023 04:43:05 -0400 Subject: [PATCH 0561/1049] Remove unneeded dependencies from Install/Upgrade Guide (#2760) **Problem:** With https://github.com/elastic/stack-docs/pull/2495, the [Elastic Installation and Upgrade Guide](https://www.elastic.co/guide/en/elastic-stack/current/index.html) no longer requires dependencies for several repos in 8.9+ branches. **Solution:** Remove the dependencies from the docs build config. --- conf.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.yaml b/conf.yaml index eb679ce1a4bf8..b961e3bad1610 100644 --- a/conf.yaml +++ b/conf.yaml @@ -159,34 +159,34 @@ contents: - repo: apm-server path: 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: kibana path: 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: logstash path: 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ 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 ] + exclude_branches: [ main, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc From dbfdefc9611f4a0d6b399edc8863c8644bb75621 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 13 Sep 2023 04:43:36 -0400 Subject: [PATCH 0562/1049] Remove x-pack docs dir from ES book (#2753) **Problem:** With https://github.com/elastic/elasticsearch/pull/99209, the elasticsearch repo's `x-pack/docs` directory no longer contains docs for the Elasticsearch Guide in 8.10+. However, the docs build config still lists the `x-pack/docs` directory as a dependency. **Solution:** Update the docs build config to remove the `x-pack/docs` dependency for the Elasticsearch Guide in 8.10+. Depends on https://github.com/elastic/elasticsearch/pull/99209 Rel: https://github.com/elastic/platform-docs-team/issues/208 --- conf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index b961e3bad1610..a2bbec0902d76 100644 --- a/conf.yaml +++ b/conf.yaml @@ -357,7 +357,8 @@ contents: repo: elasticsearch path: x-pack/docs private: true - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + # only exists from 6.2 to 8.9 + exclude_branches: [ main, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql From 9b85e77a25dcaed5d042cf6eecb4b27f773c58f4 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Fri, 15 Sep 2023 11:49:29 -0400 Subject: [PATCH 0563/1049] Revert "bumps current version to 8.10 (#2756)" (#2762) Co-authored-by: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com> --- conf.yaml | 6 +++--- shared/versions/stack/8.10.asciidoc | 4 ++-- shared/versions/stack/8.9.asciidoc | 2 +- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.yaml b/conf.yaml index a2bbec0902d76..4fcf984536d6a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -76,8 +76,8 @@ contents_title: Starting with the Elasticsearch Platform and its Solutions # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.10 - stacklive: &stacklive [ 8.10, 7.17 ] + stackcurrent: &stackcurrent 8.9 + stacklive: &stacklive [ 8.9, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-95 @@ -261,7 +261,7 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - current: 8.10 + current: 8.9 branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index c28fc9dce477c..8281519e111a7 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: released +:release-state: unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index f563564878a8b..0dc1c8bceda8a 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index 86947ff5513ca..c6d15759d1392 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.10.asciidoc[] +include::8.9.asciidoc[] From d2b4075bb7633722e62d67be54ec156a14cc199d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Mon, 18 Sep 2023 09:50:50 +0200 Subject: [PATCH 0564/1049] ESS - Change current to MS-98. --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 4fcf984536d6a..b6dd2a08f4b0b 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.9 stacklive: &stacklive [ 8.9, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-95 + cloudSaasCurrent: &cloudSaasCurrent ms-98 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: master From c0a57c3d8efcaf9f92af518c5e4cbfc14a036a18 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Mon, 18 Sep 2023 10:18:19 -0400 Subject: [PATCH 0565/1049] Bump docs version to 8.10.1 (#2761) * Bump docs version to 8.10.1 * bumps current version to 8.10 (#2756) --------- Co-authored-by: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com> --- conf.yaml | 6 +++--- shared/versions/stack/8.10.asciidoc | 16 ++++++++-------- shared/versions/stack/8.9.asciidoc | 2 +- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4fcf984536d6a..a2bbec0902d76 100644 --- a/conf.yaml +++ b/conf.yaml @@ -76,8 +76,8 @@ contents_title: Starting with the Elasticsearch Platform and its Solutions # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.9 - stacklive: &stacklive [ 8.9, 7.17 ] + stackcurrent: &stackcurrent 8.10 + stacklive: &stacklive [ 8.10, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-95 @@ -261,7 +261,7 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - current: 8.9 + current: 8.10 branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 8281519e111a7..c87c9b0aa8f09 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -1,12 +1,12 @@ -:version: 8.10.0 +:version: 8.10.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.10.0 -:logstash_version: 8.10.0 -:elasticsearch_version: 8.10.0 -:kibana_version: 8.10.0 -:apm_server_version: 8.10.0 +:bare_version: 8.10.1 +:logstash_version: 8.10.1 +:elasticsearch_version: 8.10.1 +:kibana_version: 8.10.1 +:apm_server_version: 8.10.1 :branch: 8.10 :minor-version: 8.10 :major-version: 8.x @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index 0dc1c8bceda8a..f563564878a8b 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index c6d15759d1392..86947ff5513ca 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.9.asciidoc[] +include::8.10.asciidoc[] From c59a3750e64fe4387387ffd93aa471d09efc18b6 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Sep 2023 17:35:16 -0500 Subject: [PATCH 0566/1049] add apm php agent conditional (#2765) --- shared/attributes.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index ed08b4dc6ad7d..f4d7946127db8 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -167,6 +167,10 @@ ifdef::apm-dotnet-branch[] :apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} endif::[] +ifdef::apm-php-branch[] +:apm-php-ref-v: https://www.elastic.co/guide/en/apm/agent/php/{apm-php-branch} +endif::[] + ////////// Elastic Cloud ////////// From a9ba4ce0163549487905b6ef14f4867b0da71820 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Tue, 19 Sep 2023 07:13:17 +0000 Subject: [PATCH 0567/1049] Create catalog-info file --- catalog-info.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 catalog-info.yaml diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 0000000000000..d9e2e59a3b6cf --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,28 @@ +--- +# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pipeline-docs + description: Buildkite Pipeline for docs + links: + - title: Pipeline + url: https://buildkite.com/elastic/docs + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: docs + spec: + repository: elastic/docs + pipeline_file: ".buildkite/pipeline.yml" + teams: + ci-docs-migration-taskforce: + access_level: MANAGE_BUILD_AND_READ + everyone: + access_level: READ_ONLY From 0d0e1b88b799d73e4e8374bdbf7a303923212fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Wed, 20 Sep 2023 16:17:25 +0200 Subject: [PATCH 0568/1049] Switch to main branch for clients-team in docs build. (#2767) --- conf.yaml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/conf.yaml b/conf.yaml index a2bbec0902d76..ee05e27e768cc 100644 --- a/conf.yaml +++ b/conf.yaml @@ -82,29 +82,29 @@ variables: cloudSaasCurrent: &cloudSaasCurrent ms-95 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam - ms-92: master - ms-81: master - ms-78: master - ms-75: master - ms-72: master - ms-70: master - ms-69: master - ms-65: master - ms-62: master - ms-59: master - ms-57: master - ms-53: master - ms-49: master - ms-47: master - release-ms-41: master - 2.5: master - 2.4: master - 2.3: master - 2.2: master - 2.1: master - 2.0: master - 1.1: master - 1.0: master + ms-92: main + ms-81: main + ms-78: main + ms-75: main + ms-72: main + ms-70: main + ms-69: main + ms-65: main + ms-62: main + ms-59: main + ms-57: main + ms-53: main + ms-49: main + ms-47: main + release-ms-41: main + 2.5: main + 2.4: main + 2.3: main + 2.2: main + 2.1: main + 2.0: main + 1.1: main + 1.0: main # Use this when you're building a book that uses a "main" branch, but it has a dependency on a repo with a "master" branch mapMainToMaster: &mapMainToMaster From 58f37ee5846f1bac1c14b92e1f34acf754edfba1 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Thu, 21 Sep 2023 04:47:21 -0400 Subject: [PATCH 0569/1049] Bump docs version to 8.10.2 (#2764) --- shared/versions/stack/8.10.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index c87c9b0aa8f09..65bc158dfd676 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -1,12 +1,12 @@ -:version: 8.10.1 +:version: 8.10.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.10.1 -:logstash_version: 8.10.1 -:elasticsearch_version: 8.10.1 -:kibana_version: 8.10.1 -:apm_server_version: 8.10.1 +:bare_version: 8.10.2 +:logstash_version: 8.10.2 +:elasticsearch_version: 8.10.2 +:kibana_version: 8.10.2 +:apm_server_version: 8.10.2 :branch: 8.10 :minor-version: 8.10 :major-version: 8.x From 47dc886190ea62b0051c5cf984d19717201dd71b Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Thu, 21 Sep 2023 16:51:07 +0200 Subject: [PATCH 0570/1049] ESS - Change current to ms-97 (#2747) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index ee05e27e768cc..e6fe4283ae332 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.10 stacklive: &stacklive [ 8.10, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-95 + cloudSaasCurrent: &cloudSaasCurrent ms-97 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: main From 3758c575eedbc86d924ba2d27129dbc205825529 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:12:04 -0400 Subject: [PATCH 0571/1049] Add feature flag for Serverless (#2769) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index f4d7946127db8..3dd0030e7d5ea 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -181,6 +181,7 @@ Elastic Cloud :eck: Elastic Cloud on Kubernetes :serverless-full: Elastic Serverless :serverless-short: Serverless +:serverless-feature-flag: no :serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body From 32fd34580fb6849bfce09ebf88550c68459d84b0 Mon Sep 17 00:00:00 2001 From: Dominik Giger Date: Tue, 26 Sep 2023 10:24:00 +0200 Subject: [PATCH 0572/1049] ecctl 1.10 release: Update conf.yaml Update docs to reference latest released version. --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index e6fe4283ae332..154e8e830b52c 100644 --- a/conf.yaml +++ b/conf.yaml @@ -932,8 +932,8 @@ contents: prefix: en/ecctl tags: CloudControl/Reference subject: ECCTL - current: 1.9 - branches: [ master, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + current: 1.10 + branches: [ master, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] index: docs/index.asciidoc chunk: 1 sources: From 1997896f500bf8e5666d8a73a75883fe28214815 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:59:49 -0400 Subject: [PATCH 0573/1049] Remove Azure Marketplace and Resource Manager Template docs (#2645) Co-authored-by: James Rodewig --- conf.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/conf.yaml b/conf.yaml index 154e8e830b52c..1381d7cec7793 100644 --- a/conf.yaml +++ b/conf.yaml @@ -288,20 +288,6 @@ contents: - repo: docs path: shared/attributes.asciidoc - - title: Azure Marketplace and Resource Manager (ARM) template - prefix: en/elastic-stack-deploy - current: 7.11 - index: docs/index.asciidoc - branches: [ master, 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.7, 6.6, 6.5, 6.4, 6.3 ] - chunk: 1 - noindex: 1 - tags: Elastic Stack/Azure - subject: Azure Marketplace and Resource Manager (ARM) template - sources: - - - repo: azure-marketplace - path: docs - - title: "Elasticsearch: Store, Search, and Analyze" sections: - title: Elasticsearch Guide From 89a714152639bdde62e8591b419e5cb76ce82ca4 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 10:01:11 +0200 Subject: [PATCH 0574/1049] Add first BK pipeline --- .buildkite/build-docs.sh | 49 ++++++++++++++++++++++++++++++++++++++++ .buildkite/pipeline.yml | 6 +++++ 2 files changed, 55 insertions(+) create mode 100644 .buildkite/build-docs.sh create mode 100644 .buildkite/pipeline.yml diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh new file mode 100644 index 0000000000000..569d1cf2decc9 --- /dev/null +++ b/.buildkite/build-docs.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -euo pipefail +set +x + +# Configure the git author and committer information +export GIT_AUTHOR_NAME='Buildkite CI' +export GIT_AUTHOR_EMAIL='buildkite@elasticsearch-ci.elastic.co' +export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME +export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL + + +# From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 +# Per https://github.com/elastic/docs/issues/1821, always rebuild all +# books for PRs to the docs repo, for now. +# When https://github.com/elastic/docs/issues/1823 is fixed, this +# should be removed and the original behavior restored. +#rebuild_opt="--rebuild" + +# rebuild_opt="" +# if [[ "${ghprbCommentBody}" == *rebuild* ]]; then +# rebuild_opt="--rebuild" +# fi + +#skiplinkcheck_opt="" +#if [[ "${ghprbCommentBody}" == *skiplinkcheck* ]]; then +# skiplinkcheck_opt="--skiplinkcheck" +#fi +# +#warnlinkcheck_opt="" +#if [[ "${ghprbCommentBody}" == *warnlinkcheck* ]]; then +# warnlinkcheck_opt="--warnlinkcheck" +#fi + +# The docs build can use the ssh agent's authentication socket +# but can't use ssh keys directly so we start an ssh-agent. + +ghprbPullId=123 + +ssh-agent bash -c " + ssh-add && + ./build_docs --all \ + --target_repo git@github.com:elastic/built-docs \ + --target_branch docs_bk_${ghprbPullId} \ + --announce_preview https://docs_bk_${ghprbPullId}.docs-preview.app.elstc.co/diff \ + --announce_preview https://docs_bk_${ghprbPullId}.docs-preview.app.elstc.co/diff \ + --push \ + --reference /opt/git-mirrors/" +# $rebuild_opt $skiplinkcheck_opt $warnlinkcheck_opt" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml new file mode 100644 index 0000000000000..6e037aa46f74e --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,6 @@ +steps: + - label: "Build docs" + command: .buildkite/build-docs.sh + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 From d12cd4490d157088be7a7c6401bc4ea9c1828d14 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 10:05:19 +0200 Subject: [PATCH 0575/1049] Use a specific image name --- .buildkite/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6e037aa46f74e..d28d1114a225c 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,4 +3,5 @@ steps: command: .buildkite/build-docs.sh agents: provider: "gcp" - image: family/docs-ubuntu-2204 + #image: family/docs-ubuntu-2204 + image: "docs-ubuntu-2204-1695799161" From 4b219c008197a769f46a3ccb060d5be7d314bd0e Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 11:59:47 +0200 Subject: [PATCH 0576/1049] Update image --- .buildkite/pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index d28d1114a225c..6e037aa46f74e 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,5 +3,4 @@ steps: command: .buildkite/build-docs.sh agents: provider: "gcp" - #image: family/docs-ubuntu-2204 - image: "docs-ubuntu-2204-1695799161" + image: family/docs-ubuntu-2204 From 0888ba5bb23c77f427ac905f36938d426f9e5db9 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 15:03:45 +0200 Subject: [PATCH 0577/1049] Clone the docs repo --- .buildkite/build-docs.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index 569d1cf2decc9..d4260849ee389 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -32,6 +32,10 @@ export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL # warnlinkcheck_opt="--warnlinkcheck" #fi +git clone \ + --reference /opt/git-mirrors/elastic-docs \ + git@github.com:elastic/docs.git .docs + # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. From 98d58948258caef7f654325ceb70c93b8e030f47 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 15:59:55 +0200 Subject: [PATCH 0578/1049] Add debug statements --- .buildkite/build-docs.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index d4260849ee389..55c69035611a6 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -1,7 +1,7 @@ #!/bin/bash set -euo pipefail -set +x +set -x # Configure the git author and committer information export GIT_AUTHOR_NAME='Buildkite CI' @@ -31,11 +31,16 @@ export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL #if [[ "${ghprbCommentBody}" == *warnlinkcheck* ]]; then # warnlinkcheck_opt="--warnlinkcheck" #fi +docker images git clone \ --reference /opt/git-mirrors/elastic-docs \ git@github.com:elastic/docs.git .docs +ls -lart + + +ls -lart /opt/git-mirrors/ # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. From d6be8bd39718fd75e078f79de1fc141f604b8c84 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 16:58:30 +0200 Subject: [PATCH 0579/1049] update reference repos for Buildkite terminology --- lib/ES/BaseRepo.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ES/BaseRepo.pm b/lib/ES/BaseRepo.pm index 63e6a9fb0a5c8..1bf021cf2c969 100644 --- a/lib/ES/BaseRepo.pm +++ b/lib/ES/BaseRepo.pm @@ -22,7 +22,8 @@ sub new { $reference_subdir =~ s|/$||; $reference_subdir =~ s|:*/*\.git$||; $reference_subdir =~ s/.*[\/:]//g; - $reference_dir = $args{reference}->subdir("$reference_subdir.git"); + #$reference_dir = $args{reference}->subdir("$reference_subdir.git"); + $reference_dir = $args{reference}->subdir("elastic-$reference_subdir.git"); } return bless { From 1407d38931210d7b0ecb1e8b8a955052a840e9b8 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 27 Sep 2023 17:41:10 +0200 Subject: [PATCH 0580/1049] drop the .git in git reference repo --- lib/ES/BaseRepo.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ES/BaseRepo.pm b/lib/ES/BaseRepo.pm index 1bf021cf2c969..33244213b5ac0 100644 --- a/lib/ES/BaseRepo.pm +++ b/lib/ES/BaseRepo.pm @@ -23,7 +23,7 @@ sub new { $reference_subdir =~ s|:*/*\.git$||; $reference_subdir =~ s/.*[\/:]//g; #$reference_dir = $args{reference}->subdir("$reference_subdir.git"); - $reference_dir = $args{reference}->subdir("elastic-$reference_subdir.git"); + $reference_dir = $args{reference}->subdir("elastic-$reference_subdir"); } return bless { From f78284702b2c54fa8ab96dde298000de72843f8f Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Thu, 28 Sep 2023 09:53:52 -0400 Subject: [PATCH 0581/1049] Update `live` value for several Stack books (#2773) **Problem:** A book's `live` variable determines what versions display outside of "other versions" in the version drop down. The following books have outdated `live` values: - [Starting with the Elasticsearch Platform and its Solutions](https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/index.html) - [Elasticsearch Relevance Engine (ESRE)](https://www.elastic.co/guide/en/esre/current/index.html) - [Elasticsearch Ingest Architectures](https://www.elastic.co/guide/en/ingest/current/index.html) - [Enterprise Search Node.js client](https://www.elastic.co/guide/en/enterprise-search-clients/enterprise-search-node/current/index.html) **Solution:** Updates the `live` values for the above books. --- conf.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index 1381d7cec7793..db0d69dcd1014 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,7 +129,7 @@ contents: current: *stackcurrent index: welcome-to-elastic/index.asciidoc branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] - live: [ 8.8 ] + live: [ 8.10 ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions subject: Starting with the Elasticsearch Platform and its Solutions @@ -248,7 +248,7 @@ contents: private: 1 current: *stackcurrent branches: [ {main: master}, 8.10, 8.9, 8.8 ] - live: [ 8.10, 8.9, 8.8 ] + live: [ 8.10 ] chunk: 1 tags: ESRE/Guide subject: ESRE @@ -277,7 +277,7 @@ contents: current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc branches: [ {main: master}, 8.10, 8.9 ] - live: [ 8.10, 8.9 ] + live: [ 8.10 ] chunk: 1 tags: Ingest/Reference subject: Ingest @@ -1098,7 +1098,7 @@ contents: prefix: enterprise-search-node current: *stackcurrent branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6 ] - live: [ main, 8.6 ] + live: [ 8.10 ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js subject: Enterprise Search Clients From b888df3ca0094a5cda05c6d195fbdb67d4aa74f9 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 11:18:52 +0200 Subject: [PATCH 0582/1049] Add an emoji --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6e037aa46f74e..add8626b3d142 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ steps: - - label: "Build docs" + - label: ":white_check_mark: Build docs" command: .buildkite/build-docs.sh agents: provider: "gcp" From 194bd25896687d6e6b4979021dcf2955a3a1ff2f Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 13:30:54 +0200 Subject: [PATCH 0583/1049] Add more parameters checking --- .buildkite/build-docs.sh | 56 +++++++++++++++++++++------------------- .buildkite/pipeline.yml | 5 ++++ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index 55c69035611a6..2540fbaf7d232 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -10,6 +10,10 @@ export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL +build_args="" +rebuild_opt="" +skiplinkcheck_opt="" +warnlinkcheck_opt="" # From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 # Per https://github.com/elastic/docs/issues/1821, always rebuild all # books for PRs to the docs repo, for now. @@ -17,42 +21,40 @@ export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL # should be removed and the original behavior restored. #rebuild_opt="--rebuild" -# rebuild_opt="" -# if [[ "${ghprbCommentBody}" == *rebuild* ]]; then -# rebuild_opt="--rebuild" -# fi +if [[ "${REBUILD}" == 'true' ]]; then + rebuild_opt="--rebuild" +fi -#skiplinkcheck_opt="" -#if [[ "${ghprbCommentBody}" == *skiplinkcheck* ]]; then -# skiplinkcheck_opt="--skiplinkcheck" -#fi -# -#warnlinkcheck_opt="" -#if [[ "${ghprbCommentBody}" == *warnlinkcheck* ]]; then -# warnlinkcheck_opt="--warnlinkcheck" -#fi -docker images +if [[ "${SKIP_LINK_CHECK}" == 'true' ]]; then + skiplinkcheck_opt="--skiplinkcheck" +fi -git clone \ - --reference /opt/git-mirrors/elastic-docs \ - git@github.com:elastic/docs.git .docs +if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then + warnlinkcheck_opt="--warnlinkcheck" +fi -ls -lart +#git clone \ +# --reference /opt/git-mirrors/elastic-docs \ +# git@github.com:elastic/docs.git .docs -ls -lart /opt/git-mirrors/ +# When running on a branch or on main +if [[ "${GIT_PULL_REQUEST_ID}" != "false" ]]; then + # temporary pushing to a branch different than main until ready to switchover + build_args+= " --target_branch docs_bk_rollout" +else + build_args+= " --target_branch docs_bk_${GIT_PULL_REQUEST_ID}" + build_args+= " --announce_preview https://docs_bk_${GIT_PULL_REQUEST_ID}.docs-preview.app.elstc.co/diff" + rebuild_opt= " --rebuild" +fi + # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. - -ghprbPullId=123 - ssh-agent bash -c " ssh-add && ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ - --target_branch docs_bk_${ghprbPullId} \ - --announce_preview https://docs_bk_${ghprbPullId}.docs-preview.app.elstc.co/diff \ - --announce_preview https://docs_bk_${ghprbPullId}.docs-preview.app.elstc.co/diff \ - --push \ + $build_args \ + $rebuild_opt $skiplinkcheck_opt $warnlinkcheck_opt \ --reference /opt/git-mirrors/" -# $rebuild_opt $skiplinkcheck_opt $warnlinkcheck_opt" +# --push diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index add8626b3d142..ff3dc653c21b4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,6 +1,11 @@ steps: - label: ":white_check_mark: Build docs" command: .buildkite/build-docs.sh + # TODO - add condition to run only on master, for PR or merges + env: + REBUILD: false + SKIP_LINK_CHECK: false + WARN_LINK_CHECK: false agents: provider: "gcp" image: family/docs-ubuntu-2204 From 9506f507f8720d72b61399e03728b6c4384e0285 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 13:36:02 +0200 Subject: [PATCH 0584/1049] Fix env variable name --- .buildkite/build-docs.sh | 1 + .buildkite/pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index 2540fbaf7d232..2e75cec4ebeb9 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -14,6 +14,7 @@ build_args="" rebuild_opt="" skiplinkcheck_opt="" warnlinkcheck_opt="" + # From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 # Per https://github.com/elastic/docs/issues/1821, always rebuild all # books for PRs to the docs repo, for now. diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ff3dc653c21b4..5378724d61dbf 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: env: REBUILD: false SKIP_LINK_CHECK: false - WARN_LINK_CHECK: false + ALLOW_BROKEN_LINKS: false agents: provider: "gcp" image: family/docs-ubuntu-2204 From 670f6cf7974892455a3c6807e0df70d4177d4c89 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 13:49:11 +0200 Subject: [PATCH 0585/1049] Fix env variable name --- .buildkite/build-docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index 2e75cec4ebeb9..2a2327a195c0a 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -40,12 +40,12 @@ fi # When running on a branch or on main -if [[ "${GIT_PULL_REQUEST_ID}" != "false" ]]; then +if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then # temporary pushing to a branch different than main until ready to switchover build_args+= " --target_branch docs_bk_rollout" else - build_args+= " --target_branch docs_bk_${GIT_PULL_REQUEST_ID}" - build_args+= " --announce_preview https://docs_bk_${GIT_PULL_REQUEST_ID}.docs-preview.app.elstc.co/diff" + build_args+= " --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" + build_args+= " --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" rebuild_opt= " --rebuild" fi From eee97f03fc281d54b615ba110fe15c272fb146ac Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 14:03:40 +0200 Subject: [PATCH 0586/1049] Fix bash syntax --- .buildkite/build-docs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/build-docs.sh b/.buildkite/build-docs.sh index 2a2327a195c0a..debe04532f1ee 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/build-docs.sh @@ -42,11 +42,11 @@ fi # When running on a branch or on main if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then # temporary pushing to a branch different than main until ready to switchover - build_args+= " --target_branch docs_bk_rollout" + build_args+=" --target_branch docs_bk_rollout" else - build_args+= " --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" - build_args+= " --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" - rebuild_opt= " --rebuild" + build_args+=" --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" + build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" + rebuild_opt=" --rebuild" fi # The docs build can use the ssh agent's authentication socket From 92a83e7e3f1b5698e7056ed80d921fc0b1bf2f8d Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 15:21:16 +0200 Subject: [PATCH 0587/1049] mv build script to scripts folder --- .buildkite/pipeline.yml | 2 +- .buildkite/{ => scripts}/build-docs.sh | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) rename .buildkite/{ => scripts}/build-docs.sh (92%) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 5378724d61dbf..19d6db3abd4ae 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,6 +1,6 @@ steps: - label: ":white_check_mark: Build docs" - command: .buildkite/build-docs.sh + command: .buildkite/scripts/build-docs.sh # TODO - add condition to run only on master, for PR or merges env: REBUILD: false diff --git a/.buildkite/build-docs.sh b/.buildkite/scripts/build-docs.sh similarity index 92% rename from .buildkite/build-docs.sh rename to .buildkite/scripts/build-docs.sh index debe04532f1ee..e47f344bc8f33 100644 --- a/.buildkite/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -34,11 +34,6 @@ if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then warnlinkcheck_opt="--warnlinkcheck" fi -#git clone \ -# --reference /opt/git-mirrors/elastic-docs \ -# git@github.com:elastic/docs.git .docs - - # When running on a branch or on main if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then # temporary pushing to a branch different than main until ready to switchover @@ -57,5 +52,5 @@ ssh-agent bash -c " --target_repo git@github.com:elastic/built-docs \ $build_args \ $rebuild_opt $skiplinkcheck_opt $warnlinkcheck_opt \ - --reference /opt/git-mirrors/" -# --push + --reference /opt/git-mirrors/ \ + --push" From ca35211052dafe3e21295d849240fe23a9a1872b Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 17:34:26 +0200 Subject: [PATCH 0588/1049] Run the builds only on master for PR or merges to master --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 19d6db3abd4ae..4f3c16b50f2e9 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":white_check_mark: Build docs" command: .buildkite/scripts/build-docs.sh - # TODO - add condition to run only on master, for PR or merges + branches: "master" env: REBUILD: false SKIP_LINK_CHECK: false From 5dcc411db1ef75a0fb0de87969d2f4fcd8ecaeb5 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 29 Sep 2023 17:39:08 +0200 Subject: [PATCH 0589/1049] push merges to main to staging --- .buildkite/scripts/build-docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index e47f344bc8f33..914658472df46 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -36,8 +36,8 @@ fi # When running on a branch or on main if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then - # temporary pushing to a branch different than main until ready to switchover - build_args+=" --target_branch docs_bk_rollout" + # temporary pushing to staging instead of master until the migration is over + build_args+=" --target_branch staging" else build_args+=" --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" From a299d92dcfd102e32c1d7cc9f910da1050f97f68 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 29 Sep 2023 21:22:37 +0200 Subject: [PATCH 0590/1049] don't want to do full rebuilds on PRs Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .buildkite/scripts/build-docs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 914658472df46..1094695e8a128 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -41,7 +41,6 @@ if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then else build_args+=" --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" - rebuild_opt=" --rebuild" fi # The docs build can use the ssh agent's authentication socket From 0c3fa1aa2849d0ca71dce002b3432d95d199bf0e Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Sat, 30 Sep 2023 08:47:17 +0200 Subject: [PATCH 0591/1049] Try workaround git reference modules using symb links --- .buildkite/scripts/build-docs.sh | 10 ++++++++++ lib/ES/BaseRepo.pm | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 1094695e8a128..8246e0b9e31c9 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -43,6 +43,16 @@ else build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" fi + +## Temporary hack to test the symlink on reference repos +cd /opt/git-mirrors/ +for repo in elastic-*;do + echo $repo + ln -s $repo ${repo:8}.git +done +cd - +ls -lart opt/git-mirrors/ + # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. ssh-agent bash -c " diff --git a/lib/ES/BaseRepo.pm b/lib/ES/BaseRepo.pm index 33244213b5ac0..63e6a9fb0a5c8 100644 --- a/lib/ES/BaseRepo.pm +++ b/lib/ES/BaseRepo.pm @@ -22,8 +22,7 @@ sub new { $reference_subdir =~ s|/$||; $reference_subdir =~ s|:*/*\.git$||; $reference_subdir =~ s/.*[\/:]//g; - #$reference_dir = $args{reference}->subdir("$reference_subdir.git"); - $reference_dir = $args{reference}->subdir("elastic-$reference_subdir"); + $reference_dir = $args{reference}->subdir("$reference_subdir.git"); } return bless { From 8c3b6683427d5ca1f0c1cb9dca47c44804f544de Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Sat, 30 Sep 2023 08:53:09 +0200 Subject: [PATCH 0592/1049] disable running only on branches to test workaround --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 4f3c16b50f2e9..3ee50acd8b2b9 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":white_check_mark: Build docs" command: .buildkite/scripts/build-docs.sh - branches: "master" + #branches: "master" env: REBUILD: false SKIP_LINK_CHECK: false From 65cc3ec4bcdb285cebda8d1446d9fe597f42f56c Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Sat, 30 Sep 2023 08:57:24 +0200 Subject: [PATCH 0593/1049] fix typo --- .buildkite/scripts/build-docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 8246e0b9e31c9..cc1fec4b6f59a 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -1,7 +1,7 @@ #!/bin/bash set -euo pipefail -set -x +set +x # Configure the git author and committer information export GIT_AUTHOR_NAME='Buildkite CI' @@ -51,7 +51,7 @@ for repo in elastic-*;do ln -s $repo ${repo:8}.git done cd - -ls -lart opt/git-mirrors/ +ls -lart /opt/git-mirrors/ # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. From 9c36641d60ae5724b18b4c962768db2a023057bc Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 15:23:14 +0200 Subject: [PATCH 0594/1049] Debug build --- .buildkite/pipeline.yml | 19 +++++++++++++++++++ .buildkite/scripts/build-docs.sh | 8 ++++++++ 2 files changed, 27 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3ee50acd8b2b9..21abd5a06880a 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,4 +1,23 @@ steps: + - input: "Build parameters" + if: build.source == "ui" + fields: + - text: "Rebuild?" + key: "REBUILD" + options: + - label: "no" + value: false + - label: "yes" + value: true + hint: "Should all books be rebuilt, regardless of what has changed? Build once with this set to true after every release." + - text: "Allow Broken Links?" + key: "ALLOW_BROKEN_LINKS" + options: + - label: "no" + value: false + - label: "yes" + value: true + hint: "Should we ignore broken links? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." - label: ":white_check_mark: Build docs" command: .buildkite/scripts/build-docs.sh #branches: "master" diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index cc1fec4b6f59a..f61e013aa0aae 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -15,6 +15,14 @@ rebuild_opt="" skiplinkcheck_opt="" warnlinkcheck_opt="" +printenv +export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" +export ALLOW_BROKEN_LINKS="$(buildkite-agent meta-data get ALLOW_BROKEN_LINKS --default false)" +echo "------" +printenv + +exit + # From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 # Per https://github.com/elastic/docs/issues/1821, always rebuild all # books for PRs to the docs repo, for now. From f37747040bb37a45bb90b537ca4596b447ac2f47 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 15:28:38 +0200 Subject: [PATCH 0595/1049] Fix pipeline syntax --- .buildkite/pipeline.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 21abd5a06880a..2edbea403c85f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,16 +2,19 @@ steps: - input: "Build parameters" if: build.source == "ui" fields: - - text: "Rebuild?" + - select: "Rebuild?" key: "REBUILD" + default: false + required: false options: - label: "no" value: false - label: "yes" value: true hint: "Should all books be rebuilt, regardless of what has changed? Build once with this set to true after every release." - - text: "Allow Broken Links?" + - select: "Allow Broken Links?" key: "ALLOW_BROKEN_LINKS" + default: false options: - label: "no" value: false From e26865e43b2391a2fb510df996af909a97157e60 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 15:51:11 +0200 Subject: [PATCH 0596/1049] Validate script args --- .buildkite/pipeline.yml | 10 +++++----- .buildkite/scripts/build-docs.sh | 18 ++++-------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 2edbea403c85f..e43c9076d01e7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -15,6 +15,7 @@ steps: - select: "Allow Broken Links?" key: "ALLOW_BROKEN_LINKS" default: false + required: false options: - label: "no" value: false @@ -22,12 +23,11 @@ steps: value: true hint: "Should we ignore broken links? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." - label: ":white_check_mark: Build docs" - command: .buildkite/scripts/build-docs.sh + command: | + export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" + export ALLOW_BROKEN_LINKS="$(buildkite-agent meta-data get ALLOW_BROKEN_LINKS --default false)" + .buildkite/scripts/build-docs.sh #branches: "master" - env: - REBUILD: false - SKIP_LINK_CHECK: false - ALLOW_BROKEN_LINKS: false agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index f61e013aa0aae..0f96861ac2894 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -13,15 +13,6 @@ export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL build_args="" rebuild_opt="" skiplinkcheck_opt="" -warnlinkcheck_opt="" - -printenv -export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" -export ALLOW_BROKEN_LINKS="$(buildkite-agent meta-data get ALLOW_BROKEN_LINKS --default false)" -echo "------" -printenv - -exit # From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 # Per https://github.com/elastic/docs/issues/1821, always rebuild all @@ -38,10 +29,9 @@ if [[ "${SKIP_LINK_CHECK}" == 'true' ]]; then skiplinkcheck_opt="--skiplinkcheck" fi -if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then - warnlinkcheck_opt="--warnlinkcheck" -fi - +echo $rebuild_opt +echo $skiplinkcheck_opt +exit # When running on a branch or on main if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then # temporary pushing to staging instead of master until the migration is over @@ -68,6 +58,6 @@ ssh-agent bash -c " ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ $build_args \ - $rebuild_opt $skiplinkcheck_opt $warnlinkcheck_opt \ + $rebuild_opt $skiplinkcheck_opt \ --reference /opt/git-mirrors/ \ --push" From 4daa1539c6ac368b25cf174d4239fc2c7d6f4f52 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 15:56:50 +0200 Subject: [PATCH 0597/1049] Explicitely call bash to call build script --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e43c9076d01e7..6361c2081a3ad 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -26,7 +26,7 @@ steps: command: | export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" export ALLOW_BROKEN_LINKS="$(buildkite-agent meta-data get ALLOW_BROKEN_LINKS --default false)" - .buildkite/scripts/build-docs.sh + bash .buildkite/scripts/build-docs.sh #branches: "master" agents: provider: "gcp" From 80ccedd7f550b76b81aa7e6cecd61d4b41283f27 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 16:02:14 +0200 Subject: [PATCH 0598/1049] Add missing wait step --- .buildkite/pipeline.yml | 1 + .buildkite/scripts/build-docs.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6361c2081a3ad..2a842f58daa37 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -22,6 +22,7 @@ steps: - label: "yes" value: true hint: "Should we ignore broken links? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." + - wait - label: ":white_check_mark: Build docs" command: | export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 0f96861ac2894..6595cc32b6554 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -25,7 +25,7 @@ if [[ "${REBUILD}" == 'true' ]]; then rebuild_opt="--rebuild" fi -if [[ "${SKIP_LINK_CHECK}" == 'true' ]]; then +if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then skiplinkcheck_opt="--skiplinkcheck" fi From e63a2c4af52e0bd1c4daad74810a538bbb02bbed Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Mon, 2 Oct 2023 16:08:40 +0200 Subject: [PATCH 0599/1049] Remove early exit used for verification --- .buildkite/scripts/build-docs.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 6595cc32b6554..6a66e9859ed65 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -29,9 +29,6 @@ if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then skiplinkcheck_opt="--skiplinkcheck" fi -echo $rebuild_opt -echo $skiplinkcheck_opt -exit # When running on a branch or on main if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then # temporary pushing to staging instead of master until the migration is over From 16a3889d08e7e97fca1a349a5fa540913d3cdcfd Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Tue, 3 Oct 2023 11:06:49 +0300 Subject: [PATCH 0600/1049] demo --- .buildkite/scripts/build-docs.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 6a66e9859ed65..e38bf19b7de03 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -50,6 +50,12 @@ ls -lart /opt/git-mirrors/ # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. + +echo $build_args +echo $rebuild_opt +echo $skiplinkcheck_opt +exit 0 + ssh-agent bash -c " ssh-add && ./build_docs --all \ From 22198a62588b84ebe1c7e4623830797a97c6d229 Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Tue, 3 Oct 2023 15:51:29 +0300 Subject: [PATCH 0601/1049] check dir content --- .buildkite/scripts/build-docs.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index e38bf19b7de03..a61d4e710018b 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -51,9 +51,8 @@ ls -lart /opt/git-mirrors/ # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. -echo $build_args -echo $rebuild_opt -echo $skiplinkcheck_opt +echo "LS LA MIRRORS" +echo ls -la /opt/git-mirrors/ exit 0 ssh-agent bash -c " From 4f4e1124f40633dfce137d948552f2d6731f1704 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:46:43 -0400 Subject: [PATCH 0602/1049] Rename 'Elastic Serverless' to 'Elastic Cloud Serverless' (#2777) --- shared/attributes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 3dd0030e7d5ea..68c968f87f30a 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -179,7 +179,7 @@ Elastic Cloud :ess: Elasticsearch Service :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes -:serverless-full: Elastic Serverless +:serverless-full: Elastic Cloud Serverless :serverless-short: Serverless :serverless-feature-flag: no :serverless-docs: https://docs.elastic.co/serverless From dba5960b48e27ef9598d3e7201a6702a021a4c9e Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Tue, 3 Oct 2023 20:27:00 +0300 Subject: [PATCH 0603/1049] check git-mirrors contains symlinks --- .buildkite/scripts/build-docs.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index a61d4e710018b..276c086e2d1af 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -41,18 +41,17 @@ fi ## Temporary hack to test the symlink on reference repos cd /opt/git-mirrors/ -for repo in elastic-*;do - echo $repo - ln -s $repo ${repo:8}.git -done -cd - +#for repo in elastic-*;do +# echo $repo +# ln -s $repo ${repo:8}.git +#done +#cd - ls -lart /opt/git-mirrors/ # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. -echo "LS LA MIRRORS" -echo ls -la /opt/git-mirrors/ + exit 0 ssh-agent bash -c " From 7911c967415d47bddfc98ed4487f11e520a51dce Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Wed, 4 Oct 2023 14:53:27 +0300 Subject: [PATCH 0604/1049] removed symlink POC code --- .buildkite/pipeline.yml | 7 ++++++- .buildkite/scripts/build-docs.sh | 14 -------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 2a842f58daa37..8efb4410d1aeb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -31,4 +31,9 @@ steps: #branches: "master" agents: provider: "gcp" - image: family/docs-ubuntu-2204 + imageProject: elastic-images-qa + image: family/docs-ubuntu-2204-1696416269 +# provider: "gcp" +# image: family/docs-ubuntu-2204 + + diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 276c086e2d1af..af22d6033d5e1 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -38,22 +38,8 @@ else build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" fi - -## Temporary hack to test the symlink on reference repos -cd /opt/git-mirrors/ -#for repo in elastic-*;do -# echo $repo -# ln -s $repo ${repo:8}.git -#done -#cd - -ls -lart /opt/git-mirrors/ - # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. - - -exit 0 - ssh-agent bash -c " ssh-add && ./build_docs --all \ From 976dd1424eca08aefe0a0ca6eea09107062232c1 Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Wed, 4 Oct 2023 15:50:52 +0300 Subject: [PATCH 0605/1049] restored original agents definition --- .buildkite/pipeline.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8efb4410d1aeb..7cdae896d2914 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -31,9 +31,6 @@ steps: #branches: "master" agents: provider: "gcp" - imageProject: elastic-images-qa - image: family/docs-ubuntu-2204-1696416269 -# provider: "gcp" -# image: family/docs-ubuntu-2204 + image: family/docs-ubuntu-2204 From 0c980f7dfd659f8e701da7e9e3d468e2adcc085b Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Thu, 5 Oct 2023 11:05:01 +0200 Subject: [PATCH 0606/1049] Remove x-pack directory dependency from docbldesx build alias --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index a276abc7fb411..24950cc81f0e5 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -10,7 +10,7 @@ # # Elasticsearch -alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --resource=$GIT_HOME/elasticsearch/x-pack/docs/ --chunk 1' +alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' alias docbldes=docbldesx From a6fdcd358fb6c6dcd03acd92ab17a04f80ce3ffa Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:48:37 +0200 Subject: [PATCH 0607/1049] Add Warn Broken Links build option (#2779) --- .buildkite/pipeline.yml | 16 +++++++++------- .buildkite/scripts/build-docs.sh | 13 +++++++++---- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7cdae896d2914..69d2498d4fa84 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -12,21 +12,23 @@ steps: - label: "yes" value: true hint: "Should all books be rebuilt, regardless of what has changed? Build once with this set to true after every release." - - select: "Allow Broken Links?" - key: "ALLOW_BROKEN_LINKS" + - select: "How should broken links be handled?" + key: "BROKEN_LINKS" default: false required: false options: - - label: "no" + - label: "Continue without warning" + value: "skip" + - label: "Continue, but log a warning" + value: "warn" + - label: "Fail the build" value: false - - label: "yes" - value: true - hint: "Should we ignore broken links? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." + hint: "Should we ignore checking broken links? Should we allow to run the build without failing if there's a broken link? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." - wait - label: ":white_check_mark: Build docs" command: | export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" - export ALLOW_BROKEN_LINKS="$(buildkite-agent meta-data get ALLOW_BROKEN_LINKS --default false)" + export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default false)" bash .buildkite/scripts/build-docs.sh #branches: "master" agents: diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index af22d6033d5e1..776b7eb6970bf 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -12,7 +12,7 @@ export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL build_args="" rebuild_opt="" -skiplinkcheck_opt="" +broken_links_opt="" # From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 # Per https://github.com/elastic/docs/issues/1821, always rebuild all @@ -25,8 +25,12 @@ if [[ "${REBUILD}" == 'true' ]]; then rebuild_opt="--rebuild" fi -if [[ "${ALLOW_BROKEN_LINKS}" == 'true' ]]; then - skiplinkcheck_opt="--skiplinkcheck" +if [[ "${BROKEN_LINKS}" == 'skip' ]]; then + broken_links_opt="--skiplinkcheck" +fi + +if [[ "${BROKEN_LINKS}" == 'warn' ]]; then + broken_links_opt="--warnlinkcheck" fi # When running on a branch or on main @@ -40,11 +44,12 @@ fi # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. + ssh-agent bash -c " ssh-add && ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ $build_args \ - $rebuild_opt $skiplinkcheck_opt \ + $rebuild_opt $broken_links_opt \ --reference /opt/git-mirrors/ \ --push" From c7c68a7c28ed95745cfcff196190bf778a5e65fb Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Thu, 5 Oct 2023 14:36:41 +0300 Subject: [PATCH 0608/1049] added notifications to test --- .buildkite/pipeline.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 69d2498d4fa84..f410c255a8626 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -34,5 +34,7 @@ steps: agents: provider: "gcp" image: family/docs-ubuntu-2204 - +notify: + - email: "olga.naidjonoka@elastic.co" + - slack: "@olga.naidjonoka" From ac915667fdce6c8e427da82ecaa8d98b87051635 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 5 Oct 2023 06:38:24 -0700 Subject: [PATCH 0609/1049] Add 8.11 branch (#2780) * add 8.11 branch * nope, it was my fault * attempt three --- conf.yaml | 132 ++++++++++++++-------------- shared/versions/stack/8.11.asciidoc | 68 ++++++++++++++ 2 files changed, 134 insertions(+), 66 deletions(-) create mode 100644 shared/versions/stack/8.11.asciidoc diff --git a/conf.yaml b/conf.yaml index db0d69dcd1014..a1bc7f6a6c476 100644 --- a/conf.yaml +++ b/conf.yaml @@ -128,7 +128,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] live: [ 8.10 ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -147,7 +147,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -159,34 +159,34 @@ contents: - repo: apm-server path: docs/ - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -221,7 +221,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -247,7 +247,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -262,8 +262,8 @@ contents: - title: Elastic Common Schema (ECS) Reference prefix: en/ecs current: 8.10 - branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc chunk: 2 tags: Elastic Common Schema (ECS)/Reference @@ -276,7 +276,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.10, 8.9 ] + branches: [ {main: master}, 8.11, 8.10, 8.9 ] live: [ 8.10 ] chunk: 1 tags: Ingest/Reference @@ -293,7 +293,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -308,13 +308,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -330,7 +330,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -344,12 +344,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -390,7 +390,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -427,7 +427,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -453,7 +453,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -469,7 +469,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -493,7 +493,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -515,7 +515,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x ] + branches: [ {main: master}, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -528,7 +528,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -541,7 +541,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -554,7 +554,7 @@ contents: - title: .NET Clients prefix: net-api current: 8.9 - branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net @@ -570,7 +570,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -599,7 +599,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -625,8 +625,8 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] - live: [ main, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] index: docs/index.asciidoc chunk: 1 tags: Clients/Rust @@ -725,7 +725,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -945,7 +945,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -960,7 +960,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -972,11 +972,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -998,7 +998,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -1015,7 +1015,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -1032,7 +1032,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -1065,7 +1065,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -1082,7 +1082,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -1097,7 +1097,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ 8.10 ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -1112,7 +1112,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -1127,7 +1127,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -1142,7 +1142,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -1159,7 +1159,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -1176,7 +1176,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 2 @@ -1210,7 +1210,7 @@ contents: prefix: guide index: docs/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -1696,7 +1696,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1741,7 +1741,7 @@ contents: - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1757,7 +1757,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1772,11 +1772,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1800,7 +1800,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1898,7 +1898,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1923,7 +1923,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1976,7 +1976,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -2031,7 +2031,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Functionbeat/Reference @@ -2080,7 +2080,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -2127,7 +2127,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -2184,7 +2184,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -2227,7 +2227,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2270,7 +2270,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -2301,7 +2301,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc new file mode 100644 index 0000000000000..d1acd695ce17d --- /dev/null +++ b/shared/versions/stack/8.11.asciidoc @@ -0,0 +1,68 @@ +:version: 8.11.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.11.0 +:logstash_version: 8.11.0 +:elasticsearch_version: 8.11.0 +:kibana_version: 8.11.0 +:apm_server_version: 8.11.0 +:branch: 8.11 +:minor-version: 8.11 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.11 +:esf_version: master + +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: main +:apm-go-branch: 2.x +:apm-ios-branch: 0.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 From 26dbffe4d45bc2d24b264d73207870a342559c93 Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Thu, 5 Oct 2023 16:58:36 +0300 Subject: [PATCH 0610/1049] enabled master and added notifications --- .buildkite/pipeline.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f410c255a8626..2a22774aaaf0f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -30,11 +30,10 @@ steps: export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default false)" bash .buildkite/scripts/build-docs.sh - #branches: "master" + branches: "master" agents: provider: "gcp" image: family/docs-ubuntu-2204 notify: - - email: "olga.naidjonoka@elastic.co" - - slack: "@olga.naidjonoka" - + - email: "infra-root+build@elastic.co" + if: build.state == "failed" From 63c29f4b9f358774d97e2f231f37ae7d701a55a1 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 5 Oct 2023 18:16:18 +0200 Subject: [PATCH 0611/1049] Temporary hack to test things out before merging --- .buildkite/pipeline.yml | 2 +- .buildkite/scripts/build-docs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 2a22774aaaf0f..7cf0d9cf39d8d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -30,7 +30,7 @@ steps: export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default false)" bash .buildkite/scripts/build-docs.sh - branches: "master" + # branches: "master" agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 776b7eb6970bf..09b80cdfb2aa7 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -45,7 +45,7 @@ fi # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. -ssh-agent bash -c " +echo ssh-agent bash -c " ssh-add && ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ From 68a9ef90f44a6dc31ab077e119983e063b5a376d Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 5 Oct 2023 18:31:50 +0200 Subject: [PATCH 0612/1049] Revert "Temporary hack to test things out before merging" This reverts commit 63c29f4b9f358774d97e2f231f37ae7d701a55a1. --- .buildkite/pipeline.yml | 2 +- .buildkite/scripts/build-docs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7cf0d9cf39d8d..2a22774aaaf0f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -30,7 +30,7 @@ steps: export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default false)" bash .buildkite/scripts/build-docs.sh - # branches: "master" + branches: "master" agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 09b80cdfb2aa7..776b7eb6970bf 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -45,7 +45,7 @@ fi # The docs build can use the ssh agent's authentication socket # but can't use ssh keys directly so we start an ssh-agent. -echo ssh-agent bash -c " +ssh-agent bash -c " ssh-add && ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ From 853e536d4afc0d88161c2499a7e1bfd4312afc1d Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 5 Oct 2023 22:03:47 +0200 Subject: [PATCH 0613/1049] Update email address Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 2a22774aaaf0f..d56385b65ccee 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -35,5 +35,5 @@ steps: provider: "gcp" image: family/docs-ubuntu-2204 notify: - - email: "infra-root+build@elastic.co" + - email: "docs-status@elastic.co" if: build.state == "failed" From c80dd074a2914789a88b6a97c34375b7290e1857 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 5 Oct 2023 22:05:06 +0200 Subject: [PATCH 0614/1049] Clean up comments Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .buildkite/scripts/build-docs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build-docs.sh index 776b7eb6970bf..e84994b5d7135 100644 --- a/.buildkite/scripts/build-docs.sh +++ b/.buildkite/scripts/build-docs.sh @@ -19,7 +19,6 @@ broken_links_opt="" # books for PRs to the docs repo, for now. # When https://github.com/elastic/docs/issues/1823 is fixed, this # should be removed and the original behavior restored. -#rebuild_opt="--rebuild" if [[ "${REBUILD}" == 'true' ]]; then rebuild_opt="--rebuild" From 74e48afc09aa402a533f4ab38ee9b45f099be1ab Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 5 Oct 2023 16:58:06 -0700 Subject: [PATCH 0615/1049] Clarify data view shared attributes (#2778) --- shared/attributes.asciidoc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 68c968f87f30a..7f42fb880492d 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -241,17 +241,13 @@ Kibana app and UI names :ems-init: EMS :hosted-ems: Elastic Maps Server :ipm-app: Index Pattern Management -:Data-Sources: Data Views -:Data-source: Data view + :data-source: data view -:Data-sources: Data views :data-sources: data views :data-source-caps: Data View :data-sources-caps: Data Views :data-source-cap: Data view :data-sources-cap: Data views -:A-data-source: A data view -:a-data-source: a data view ////////// @@ -538,3 +534,12 @@ Legacy definitions :apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 :apm-overview-ref-m: https://www.elastic.co/guide/en/apm/get-started/master :infra-guide: https://www.elastic.co/guide/en/infrastructure/guide/{branch} +// Use data-sources-caps instead of Data-Sources +:Data-Sources: Data Views +// Use data-source-cap instead of Data-source +:Data-source: Data view +// Use data-sources-cap instead of Data-sources +:Data-sources: Data views +// Do not use A-data-source or a-data-source +:A-data-source: A data view +:a-data-source: a data view \ No newline at end of file From 661f0ed4315bf91ec38bef741bbe0dd313a9b5ae Mon Sep 17 00:00:00 2001 From: Aliaksandr Trushyn Date: Fri, 6 Oct 2023 15:40:35 +0200 Subject: [PATCH 0616/1049] Add preview cleaner pipeline --- .buildkite/preview_cleaner_pipeline.yml | 3 +++ catalog-info.yaml | 31 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 .buildkite/preview_cleaner_pipeline.yml diff --git a/.buildkite/preview_cleaner_pipeline.yml b/.buildkite/preview_cleaner_pipeline.yml new file mode 100644 index 0000000000000..978e9a22b2c07 --- /dev/null +++ b/.buildkite/preview_cleaner_pipeline.yml @@ -0,0 +1,3 @@ +steps: + - label: "Example Test" + command: echo "Hello World!" diff --git a/catalog-info.yaml b/catalog-info.yaml index d9e2e59a3b6cf..797ebf8f60d2b 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -26,3 +26,34 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + +# Declare daily preview cleaner +--- +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-preview-cleaner + description: Daily Preview Cleaner + links: + - title: Pipeline + url: https://buildkite.com/elastic/preview-cleaner + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: preview-cleaner + spec: + repository: elastic/docs + pipeline_file: ".buildkite/preview_cleaner_pipeline.yml" + provider_settings: + trigger_mode: none + teams: + ci-docs-migration-taskforce: + access_level: MANAGE_BUILD_AND_READ + everyone: + access_level: READ_ONLY From c96170b5147144ac851237753378e0a4bc7f4d61 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Mon, 9 Oct 2023 10:50:53 +0200 Subject: [PATCH 0617/1049] ESS - change current to ms-99 --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 4b687bf756df4..02324ef633b1c 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.10 stacklive: &stacklive [ 8.10, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-98 + cloudSaasCurrent: &cloudSaasCurrent ms-99 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: main From 910e132a7fb71b474477cb042e9421a1103e7204 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 10 Oct 2023 05:00:39 -0700 Subject: [PATCH 0618/1049] bump 8.10 and 7.17 (#2781) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ shared/versions/stack/8.10.asciidoc | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 350c096ba1851..8dc1fce52dc16 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.13 +:version: 7.17.14 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.13 -:logstash_version: 7.17.13 -:elasticsearch_version: 7.17.13 -:kibana_version: 7.17.13 -:apm_server_version: 7.17.13 +:bare_version: 7.17.14 +:logstash_version: 7.17.14 +:elasticsearch_version: 7.17.14 +:kibana_version: 7.17.14 +:apm_server_version: 7.17.14 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 65bc158dfd676..d8f22810a7937 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -1,12 +1,12 @@ -:version: 8.10.2 +:version: 8.10.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.10.2 -:logstash_version: 8.10.2 -:elasticsearch_version: 8.10.2 -:kibana_version: 8.10.2 -:apm_server_version: 8.10.2 +:bare_version: 8.10.3 +:logstash_version: 8.10.3 +:elasticsearch_version: 8.10.3 +:kibana_version: 8.10.3 +:apm_server_version: 8.10.3 :branch: 8.10 :minor-version: 8.10 :major-version: 8.x From 2c53ffeb384e9caf59be3e1f2db3e4dc709de8f7 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 10 Oct 2023 16:10:44 +0300 Subject: [PATCH 0619/1049] added slack notification on main failure for docs build (#2787) --- catalog-info.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index 797ebf8f60d2b..579d32d64baac 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -26,6 +26,11 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + env: + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' + SLACK_NOTIFICATIONS_CHANNEL: '#docs-builds' + SLACK_NOTIFICATIONS_ALL_BRANCHES: 'false' + SLACK_NOTIFICATIONS_ON_SUCCESS: 'false' # Declare daily preview cleaner --- From ebae6d7ca33b8f427504da54fe51b0645b37f278 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 10 Oct 2023 16:38:48 +0300 Subject: [PATCH 0620/1049] New pipeline for test execution (#2785) * added new pipeline for test execution * updated configuration for triggering test execution --- .buildkite/pr_main_mr_test.yml | 3 +++ catalog-info.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 .buildkite/pr_main_mr_test.yml diff --git a/.buildkite/pr_main_mr_test.yml b/.buildkite/pr_main_mr_test.yml new file mode 100644 index 0000000000000..04370ddf88cef --- /dev/null +++ b/.buildkite/pr_main_mr_test.yml @@ -0,0 +1,3 @@ +steps: + - label: "Test" + command: echo "Test" \ No newline at end of file diff --git a/catalog-info.yaml b/catalog-info.yaml index 579d32d64baac..43ebf78ff19e9 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -62,3 +62,33 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + +# Declare test execution on PR and merge to main +--- +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pr-main-mr-test + description: PR and Merge-to-Main Test + links: + - title: Pipeline + url: https://buildkite.com/elastic/pr-main-mr-test + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: pr-main-mr-test + spec: + branch_configuration: "main" + repository: elastic/docs + pipeline_file: ".buildkite/pr_main_mr_test.yml" + teams: + ci-docs-migration-taskforce: + access_level: MANAGE_BUILD_AND_READ + everyone: + access_level: READ_ONLY From ba131a400233e238f7f8c95f12ba45ac5402b0b0 Mon Sep 17 00:00:00 2001 From: Aliaksandr Trushyn Date: Tue, 10 Oct 2023 14:24:18 +0200 Subject: [PATCH 0621/1049] Add build air-gapped pipeline --- .buildkite/air_gapped_pipeline.yml | 3 +++ catalog-info.yaml | 39 +++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 .buildkite/air_gapped_pipeline.yml diff --git a/.buildkite/air_gapped_pipeline.yml b/.buildkite/air_gapped_pipeline.yml new file mode 100644 index 0000000000000..978e9a22b2c07 --- /dev/null +++ b/.buildkite/air_gapped_pipeline.yml @@ -0,0 +1,3 @@ +steps: + - label: "Example Test" + command: echo "Hello World!" diff --git a/catalog-info.yaml b/catalog-info.yaml index 43ebf78ff19e9..5e68ceabb485b 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -27,10 +27,10 @@ spec: everyone: access_level: READ_ONLY env: - ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' - SLACK_NOTIFICATIONS_CHANNEL: '#docs-builds' - SLACK_NOTIFICATIONS_ALL_BRANCHES: 'false' - SLACK_NOTIFICATIONS_ON_SUCCESS: 'false' + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" + SLACK_NOTIFICATIONS_CHANNEL: "#docs-builds" + SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" + SLACK_NOTIFICATIONS_ON_SUCCESS: "false" # Declare daily preview cleaner --- @@ -92,3 +92,34 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + +# Declare build air-gapped +--- +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pipeline-build-air-gapped + description: Build air-gapped + links: + - title: Pipeline + url: https://buildkite.com/elastic/docs-air-gapped + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: docs-air-gapped + spec: + repository: elastic/docs + pipeline_file: ".buildkite/air_gapped_pipeline.yml" + provider_settings: + trigger_mode: none + teams: + ci-docs-migration-taskforce: + access_level: MANAGE_BUILD_AND_READ + everyone: + access_level: READ_ONLY From 4cbf88b6fb340239f760697e76d595593cf30f90 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 11 Oct 2023 09:18:51 +0200 Subject: [PATCH 0622/1049] Update pipelines permissions --- catalog-info.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index 5e68ceabb485b..e2b61d962b05b 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -22,8 +22,12 @@ spec: repository: elastic/docs pipeline_file: ".buildkite/pipeline.yml" teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ ci-docs-migration-taskforce: access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ everyone: access_level: READ_ONLY env: @@ -58,8 +62,12 @@ spec: provider_settings: trigger_mode: none teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ ci-docs-migration-taskforce: access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ everyone: access_level: READ_ONLY @@ -88,8 +96,12 @@ spec: repository: elastic/docs pipeline_file: ".buildkite/pr_main_mr_test.yml" teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ ci-docs-migration-taskforce: access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ everyone: access_level: READ_ONLY @@ -119,7 +131,11 @@ spec: provider_settings: trigger_mode: none teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ ci-docs-migration-taskforce: access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ everyone: access_level: READ_ONLY From 4b1d56005917455eabbaeff7077c67e3f8f1b361 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 11 Oct 2023 09:25:14 +0200 Subject: [PATCH 0623/1049] Rename pipelines and pipeline resources --- catalog-info.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index e2b61d962b05b..786e413856e69 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -4,10 +4,10 @@ apiVersion: backstage.io/v1alpha1 kind: Resource metadata: name: buildkite-pipeline-docs - description: Buildkite Pipeline for docs + description: Build the docs links: - title: Pipeline - url: https://buildkite.com/elastic/docs + url: https://buildkite.com/elastic/docs-build spec: type: buildkite-pipeline @@ -17,7 +17,7 @@ spec: apiVersion: buildkite.elastic.dev/v1 kind: Pipeline metadata: - name: docs + name: docs / build spec: repository: elastic/docs pipeline_file: ".buildkite/pipeline.yml" @@ -41,11 +41,11 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Resource metadata: - name: buildkite-preview-cleaner + name: buildkite-pipeline-docs-preview-cleaner description: Daily Preview Cleaner links: - title: Pipeline - url: https://buildkite.com/elastic/preview-cleaner + url: https://buildkite.com/elastic/docs-preview-cleaner spec: type: buildkite-pipeline @@ -55,7 +55,7 @@ spec: apiVersion: buildkite.elastic.dev/v1 kind: Pipeline metadata: - name: preview-cleaner + name: docs / preview-cleaner spec: repository: elastic/docs pipeline_file: ".buildkite/preview_cleaner_pipeline.yml" @@ -76,11 +76,11 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Resource metadata: - name: buildkite-pr-main-mr-test + name: buildkite-pipeline-docs-test description: PR and Merge-to-Main Test links: - title: Pipeline - url: https://buildkite.com/elastic/pr-main-mr-test + url: https://buildkite.com/elastic/docs-test spec: type: buildkite-pipeline @@ -90,7 +90,7 @@ spec: apiVersion: buildkite.elastic.dev/v1 kind: Pipeline metadata: - name: pr-main-mr-test + name: docs-test spec: branch_configuration: "main" repository: elastic/docs @@ -110,11 +110,11 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Resource metadata: - name: buildkite-pipeline-build-air-gapped + name: buildkite-pipeline-docs-build-air-gapped description: Build air-gapped links: - title: Pipeline - url: https://buildkite.com/elastic/docs-air-gapped + url: https://buildkite.com/elastic/docs-build-air-gapped spec: type: buildkite-pipeline @@ -124,7 +124,7 @@ spec: apiVersion: buildkite.elastic.dev/v1 kind: Pipeline metadata: - name: docs-air-gapped + name: docs / build air-gapped spec: repository: elastic/docs pipeline_file: ".buildkite/air_gapped_pipeline.yml" From 81f1e1adc26b8a678fd15f3faf85fe0b662dcb26 Mon Sep 17 00:00:00 2001 From: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com> Date: Wed, 11 Oct 2023 09:11:55 -0500 Subject: [PATCH 0624/1049] Update ECS versions for 8.11 feature freeze (#2775) --- shared/versions/stack/master.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 3e2f6384992ca..bdc8555e98a60 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.10 +:ecs_version: 8.11 :esf_version: master ////////// From c2f883f1247bf561fdd18102b5af3e1124dfadc2 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 11 Oct 2023 18:00:52 +0300 Subject: [PATCH 0625/1049] Test job migration (#2790) * added test execution script * temporarly commented execution only on master * changed pr_main_mr_test.yml * fixed script path * changed script command definition * added agent to yml * enabled execution on main only * added slack notifications * commented cd from script * temporarly commented master only build * fixed PR based on comments --- .buildkite/pr_main_mr_test.yml | 11 +++++++++-- .buildkite/scripts/test.sh | 11 +++++++++++ catalog-info.yaml | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .buildkite/scripts/test.sh diff --git a/.buildkite/pr_main_mr_test.yml b/.buildkite/pr_main_mr_test.yml index 04370ddf88cef..5aab0e08c1349 100644 --- a/.buildkite/pr_main_mr_test.yml +++ b/.buildkite/pr_main_mr_test.yml @@ -1,3 +1,10 @@ steps: - - label: "Test" - command: echo "Test" \ No newline at end of file + - label: "Execute tests" + command: ".buildkite/scripts/test.sh" + branches: "master" + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 +notify: + - email: "docs-status@elastic.co" + if: build.state == "failed" diff --git a/.buildkite/scripts/test.sh b/.buildkite/scripts/test.sh new file mode 100644 index 0000000000000..3efcd03644434 --- /dev/null +++ b/.buildkite/scripts/test.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -euo pipefail + +echo "Building images for docs test" +for IMAGE in build py_test node_test ruby_test integ_test diff_tool; do + echo Building $IMAGE + ./build_docs --docker-build $IMAGE +done + +make diff --git a/catalog-info.yaml b/catalog-info.yaml index 5e68ceabb485b..fa39c0c008faf 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -92,6 +92,12 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + env: + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' + SLACK_NOTIFICATIONS_CHANNEL: '#docs-builds' + SLACK_NOTIFICATIONS_ALL_BRANCHES: 'false' + SLACK_NOTIFICATIONS_ON_SUCCESS: 'false' + # Declare build air-gapped --- From fa5df22e40ddeb89d6c9646f13785452b8bf2111 Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:25:37 +0200 Subject: [PATCH 0626/1049] Migrate build air-gapped job 132 (#2791) * Migrating clean preview script * Migrate build air-gapped job --------- Co-authored-by: nassimkammah --- .buildkite/air_gapped_pipeline.yml | 8 +++-- .buildkite/preview_cleaner_pipeline.yml | 7 +++-- .buildkite/scripts/clean_preview_branches.sh | 23 +++++++++++++++ .buildkite/scripts/publish_air_gapped_docs.sh | 15 ++++++++++ .buildkite/scripts/retry.sh | 29 +++++++++++++++++++ air_gapped/build_bk.sh | 23 +++++++++++++++ catalog-info.yaml | 24 +++++++++++---- preview/clean.js | 18 +++++++----- 8 files changed, 130 insertions(+), 17 deletions(-) create mode 100644 .buildkite/scripts/clean_preview_branches.sh create mode 100644 .buildkite/scripts/publish_air_gapped_docs.sh create mode 100644 .buildkite/scripts/retry.sh create mode 100644 air_gapped/build_bk.sh diff --git a/.buildkite/air_gapped_pipeline.yml b/.buildkite/air_gapped_pipeline.yml index 978e9a22b2c07..80c2b7b964397 100644 --- a/.buildkite/air_gapped_pipeline.yml +++ b/.buildkite/air_gapped_pipeline.yml @@ -1,3 +1,7 @@ steps: - - label: "Example Test" - command: echo "Hello World!" + - label: ":white_check_mark: Build air-gapped" + command: ".buildkite/scripts/publish_air_gapped_docs.sh" + env: AIR_GAPPED=docker.elastic.co/docs-private/bk_air_gapped:latest + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 diff --git a/.buildkite/preview_cleaner_pipeline.yml b/.buildkite/preview_cleaner_pipeline.yml index 978e9a22b2c07..746a90a6b2a65 100644 --- a/.buildkite/preview_cleaner_pipeline.yml +++ b/.buildkite/preview_cleaner_pipeline.yml @@ -1,3 +1,6 @@ steps: - - label: "Example Test" - command: echo "Hello World!" + - label: ":white_check_mark: Preview cleaning" + command: bash .buildkite/scripts/clean_preview_branches.sh + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 diff --git a/.buildkite/scripts/clean_preview_branches.sh b/.buildkite/scripts/clean_preview_branches.sh new file mode 100644 index 0000000000000..899fce296b805 --- /dev/null +++ b/.buildkite/scripts/clean_preview_branches.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -eo pipefail + +set +x +export GITHUB_TOKEN=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) +set -x + +export REPO=git@github.com:elastic/built-docs.git +export IMAGE=docker.elastic.co/docs/build:latest + +./build_docs --docker-build build +ssh-agent bash -c ' + ssh-add && + docker run --rm \ + -v $(pwd):/docs_build:cached,ro \ + -v ~/.ssh/known_hosts:/root/.ssh/known_hosts:cached,ro \ + -v $SSH_AUTH_SOCK:$SSH_AUTH_SOCK:cached,ro \ + -e SSH_AUTH_SOCK=$SSH_AUTH_SOCK \ + -e GITHUB_TOKEN=$GITHUB_TOKEN \ + -v /opt/git-mirrors:/opt/git-mirrors:cached,ro \ + -e CACHE_DIR=/opt/git-mirrors \ + $IMAGE node /docs_build/preview/clean.js $REPO' diff --git a/.buildkite/scripts/publish_air_gapped_docs.sh b/.buildkite/scripts/publish_air_gapped_docs.sh new file mode 100644 index 0000000000000..6012bdaaa6f36 --- /dev/null +++ b/.buildkite/scripts/publish_air_gapped_docs.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -eo pipefail + +# Log in to docker.elastic.co. +set +x +DOCKER_USERNAME=$(vault kv get -field=username secret/ci/elastic-docs/docker.elastic.co) +DOCKER_PASSWORD=$(vault kv get -field=password secret/ci/elastic-docs/docker.elastic.co) +source .buildkite/scripts/retry.sh +retry 5 docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker.elastic.co +unset DOCKER_USERNAME +unset DOCKER_PASSWORD +set -x + +source ./air_gapped/build_bk.sh +docker push "$AIR_GAPPED" diff --git a/.buildkite/scripts/retry.sh b/.buildkite/scripts/retry.sh new file mode 100644 index 0000000000000..9d31d3b308dcc --- /dev/null +++ b/.buildkite/scripts/retry.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# retry function +# ------------------------------------- +# Retry a command for a specified number of times until the command exits successfully. +# Retry wait period backs off exponentially after each retry. +# +# The first argument should be the number of retries. +# Remainder is treated as the command to execute. +# ------------------------------------- +retry() { + local retries=$1 + shift + + local count=0 + until "$@"; do + exit=$? + wait=$((2 ** $count)) + count=$(($count + 1)) + if [ $count -lt $retries ]; then + printf "Retry %s/%s exited %s, retrying in %s seconds...\n" "$count" "$retries" "$exit" "$wait" >&2 + sleep $wait + else + printf "Retry %s/%s exited %s, no more retries left.\n" "$count" "$retries" "$exit" >&2 + return $exit + fi + done + return 0 +} diff --git a/air_gapped/build_bk.sh b/air_gapped/build_bk.sh new file mode 100644 index 0000000000000..6f42ddc498412 --- /dev/null +++ b/air_gapped/build_bk.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Build the docker image for the air gapped docs. + +set -eo pipefail + +cd $(git rev-parse --show-toplevel) + +if [[ ! -d /opt/git-mirrors/built-docs.git ]]; then + echo "/opt/git-mirrors/built-docs.git must exist and contain a reference clone of the built-docs repo" + exit 1 +fi + +# Get an up to date copy of the repo +mkdir air_gapped/work +git clone --reference /opt/git-mirrors/built-docs.git --dissociate \ + --depth 2 --branch master --bare \ + git@github.com:elastic/built-docs.git air_gapped/work/target_repo.git +GIT_DIR=air_gapped/work/target_repo.git git fetch + +# Build the images +source preview/build.sh +DOCKER_BUILDKIT=1 docker build -t $AIR_GAPPED -f air_gapped/Dockerfile . diff --git a/catalog-info.yaml b/catalog-info.yaml index 1dd57e256c9c5..3872bd6fedd09 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -59,8 +59,18 @@ spec: spec: repository: elastic/docs pipeline_file: ".buildkite/preview_cleaner_pipeline.yml" + env: + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" + SLACK_NOTIFICATIONS_CHANNEL: "#docs-builds" + SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" + SLACK_NOTIFICATIONS_ON_SUCCESS: "false" provider_settings: trigger_mode: none + schedules: + Daily Run: + branch: "master" + cronline: "0 6 * * *" + message: "Runs daily preview cleaning." teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ @@ -105,11 +115,10 @@ spec: everyone: access_level: READ_ONLY env: - ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' - SLACK_NOTIFICATIONS_CHANNEL: '#docs-builds' - SLACK_NOTIFICATIONS_ALL_BRANCHES: 'false' - SLACK_NOTIFICATIONS_ON_SUCCESS: 'false' - + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" + SLACK_NOTIFICATIONS_CHANNEL: "#docs-builds" + SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" + SLACK_NOTIFICATIONS_ON_SUCCESS: "false" # Declare build air-gapped --- @@ -136,6 +145,11 @@ spec: pipeline_file: ".buildkite/air_gapped_pipeline.yml" provider_settings: trigger_mode: none + schedules: + Daily Run: + branch: "master" + cronline: "0 5 * * *" + message: "Daily push image to registry." teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ diff --git a/preview/clean.js b/preview/clean.js index 47c6ff11859d3..b3e8003ee6972 100644 --- a/preview/clean.js +++ b/preview/clean.js @@ -26,7 +26,7 @@ function Cleaner(token, repo, cache_dir, tmp_dir) { } const show_heads = () => { - return exec_git(['show-ref', '--heads'], {cwd: local_path}); + return exec_git(['show-ref', '--heads'], { cwd: local_path }); } const heads_to_prs = (heads) => { @@ -37,7 +37,9 @@ function Cleaner(token, repo, cache_dir, tmp_dir) { if (found) { acc.push({ branch: found[1], - repo: found[2], + // Temporary hack during the Buildkite migration that breaks the _ convention, + // and introduces the _BK_ convention - see https://github.com/elastic/docs-projects/issues/134 + repo: found[2].includes('_bk') ? found[2].replace('_bk', '') : found[2], number: Number(found[3]), }); } @@ -72,28 +74,28 @@ function Cleaner(token, repo, cache_dir, tmp_dir) { } } - const prAge = async function(pr) { + const prAge = async function (pr) { return parseInt(await exec_git( [ "show", "--pretty=%ad", "--no-notes", "--no-patch", "--date=unix", pr.branch ], - {cwd: local_path} + { cwd: local_path } )); } - const deleteBranch = async function(pr) { + const deleteBranch = async function (pr) { if (pr.branch === 'master' || pr.branch === 'staging') { // Just for super double ultra paranoia. throw "Can't delete master!"; } await exec_git( ['push', 'origin', '--delete', pr.branch], - {cwd: local_path} + { cwd: local_path } ); } - const is_pr_closed = function(pr) { + const is_pr_closed = function (pr) { return new Promise((resolve, reject) => { const body = { query: ` @@ -188,7 +190,7 @@ function exec_git(opts, env = {}) { return new Promise((resolve, reject) => { child_process.execFile('git', opts, env, (err, stdout, stderr) => { if (err) { - reject(dedent ` + reject(dedent` err [${err}] running [git ${opts.join(' ')}] in ${JSON.stringify(env)}: ${stderr} `); From 19ae6b8c3eb82ac1b54c9ea640cb984b36110f7f Mon Sep 17 00:00:00 2001 From: lcawl Date: Fri, 13 Oct 2023 09:29:33 -0700 Subject: [PATCH 0627/1049] Bumps docs version to 8.10.4 --- shared/versions/stack/8.10.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index d8f22810a7937..2de8621fca11c 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -1,12 +1,12 @@ -:version: 8.10.3 +:version: 8.10.4 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.10.3 -:logstash_version: 8.10.3 -:elasticsearch_version: 8.10.3 -:kibana_version: 8.10.3 -:apm_server_version: 8.10.3 +:bare_version: 8.10.4 +:logstash_version: 8.10.4 +:elasticsearch_version: 8.10.4 +:kibana_version: 8.10.4 +:apm_server_version: 8.10.4 :branch: 8.10 :minor-version: 8.10 :major-version: 8.x From 90916cf6627fe52d7025085931dc9b87ce90dcdf Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 13 Oct 2023 16:45:22 -0700 Subject: [PATCH 0628/1049] Add shared attribute for AWS Bedrock connector (#2793) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 7f42fb880492d..88bb13a9c1023 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -323,6 +323,7 @@ Do not use `endpoint-cloud-sec` in versions 8.5.0 and newer :webhook: Webhook :webhook-cm: {webhook} - Case Management :opsgenie: Opsgenie +:bedrock: AWS Bedrock :monitoring: X-Pack monitoring :monitor-features: monitoring features :stack-monitor-features: {stack} {monitor-features} From b4fcf7b49d2cbaff5dda1fb977e81f6b5fccd5da Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 17 Oct 2023 12:13:29 -0700 Subject: [PATCH 0629/1049] Update bedrock connector name (#2794) --- shared/attributes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 88bb13a9c1023..239832d026b74 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -323,7 +323,7 @@ Do not use `endpoint-cloud-sec` in versions 8.5.0 and newer :webhook: Webhook :webhook-cm: {webhook} - Case Management :opsgenie: Opsgenie -:bedrock: AWS Bedrock +:bedrock: Amazon Bedrock :monitoring: X-Pack monitoring :monitor-features: monitoring features :stack-monitor-features: {stack} {monitor-features} From 2e2dbc6f09ec85f6acc744c0d82a79467a3c9aa3 Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:07:20 +0200 Subject: [PATCH 0630/1049] fix air-gapped env #132 (#2796) --- .buildkite/air_gapped_pipeline.yml | 3 ++- air_gapped/build_bk.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.buildkite/air_gapped_pipeline.yml b/.buildkite/air_gapped_pipeline.yml index 80c2b7b964397..f0f5f5fbc6bab 100644 --- a/.buildkite/air_gapped_pipeline.yml +++ b/.buildkite/air_gapped_pipeline.yml @@ -1,7 +1,8 @@ steps: - label: ":white_check_mark: Build air-gapped" command: ".buildkite/scripts/publish_air_gapped_docs.sh" - env: AIR_GAPPED=docker.elastic.co/docs-private/bk_air_gapped:latest + env: + AIR_GAPPED: "docker.elastic.co/docs-private/bk_air_gapped:latest" agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/air_gapped/build_bk.sh b/air_gapped/build_bk.sh index 6f42ddc498412..bb68796e97874 100644 --- a/air_gapped/build_bk.sh +++ b/air_gapped/build_bk.sh @@ -20,4 +20,4 @@ GIT_DIR=air_gapped/work/target_repo.git git fetch # Build the images source preview/build.sh -DOCKER_BUILDKIT=1 docker build -t $AIR_GAPPED -f air_gapped/Dockerfile . +DOCKER_BUILDKIT=1 docker build -t "$AIR_GAPPED" -f air_gapped/Dockerfile . From 9fe5c551d1cde424b229da3b7fbb1c3b07af605a Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:16:03 +0200 Subject: [PATCH 0631/1049] add json file for pr bot #136 (#2798) --- .buildkite/pull-requests.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .buildkite/pull-requests.json diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json new file mode 100644 index 0000000000000..490e8912f1d93 --- /dev/null +++ b/.buildkite/pull-requests.json @@ -0,0 +1,24 @@ +{ + "jobs": [ + { + "enabled": true, + "pipeline_slug": "docs-build", + "always_trigger_branch": "buildkite-webhook-rebuild-136", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "skip_ci_labels": [ + "skip-ci" + ], + "skip_ci_on_only_changed": [ + "\\.md$" + ] + } + ] +} From 0c739a6bd614b2d24502c007de80f29047d7d13e Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:16:40 +0200 Subject: [PATCH 0632/1049] add pr and merge condition to run a job #130 (#2797) --- .buildkite/pr_main_mr_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pr_main_mr_test.yml b/.buildkite/pr_main_mr_test.yml index 5aab0e08c1349..4285e2f54ea1c 100644 --- a/.buildkite/pr_main_mr_test.yml +++ b/.buildkite/pr_main_mr_test.yml @@ -1,7 +1,7 @@ steps: - label: "Execute tests" command: ".buildkite/scripts/test.sh" - branches: "master" + if: build.branch == "master" || build.env("BUILDKITE_PULL_REQUEST") != "false" agents: provider: "gcp" image: family/docs-ubuntu-2204 From a22ebea892fa6c1785463954d62d27e584246bbb Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 19 Oct 2023 13:01:42 +0200 Subject: [PATCH 0633/1049] Use org wide pr bot config (#2799) c --- .buildkite/pull-requests.json | 24 --------------------- .buildkite/pull-requests.org-wide.json | 29 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 .buildkite/pull-requests.json create mode 100644 .buildkite/pull-requests.org-wide.json diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json deleted file mode 100644 index 490e8912f1d93..0000000000000 --- a/.buildkite/pull-requests.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "jobs": [ - { - "enabled": true, - "pipeline_slug": "docs-build", - "always_trigger_branch": "buildkite-webhook-rebuild-136", - "allow_org_users": true, - "allowed_repo_permissions": [ - "admin", - "write" - ], - "build_on_commit": true, - "build_on_comment": true, - "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", - "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", - "skip_ci_labels": [ - "skip-ci" - ], - "skip_ci_on_only_changed": [ - "\\.md$" - ] - } - ] -} diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json new file mode 100644 index 0000000000000..0288b89c91d2e --- /dev/null +++ b/.buildkite/pull-requests.org-wide.json @@ -0,0 +1,29 @@ +{ + "jobs": [ + { + "enabled": true, + "pipeline_slug": "docs-build", + "always_trigger_branch": "buildkite-webhook-rebuild-136", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "skip_ci_labels": [ + "skip-ci" + ], + "skip_ci_on_only_changed": [ + "\\.md$" + ], + "repositories": [ + "elastic/docs", + "elastic/tech-content", + "elastic/x-pack" + ] + } + ] +} From 026917ff13d40784642c688b53ab90c8dcff8a95 Mon Sep 17 00:00:00 2001 From: Dominik Giger Date: Mon, 23 Oct 2023 15:18:05 +0200 Subject: [PATCH 0634/1049] Update conf.yaml for `ecctl` 1.11.0 release --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4b687bf756df4..a9f555091c42f 100644 --- a/conf.yaml +++ b/conf.yaml @@ -918,8 +918,8 @@ contents: prefix: en/ecctl tags: CloudControl/Reference subject: ECCTL - current: 1.10 - branches: [ master, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + current: 1.11 + branches: [ master, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] index: docs/index.asciidoc chunk: 1 sources: From 4d3eb986d39e237b0299e229bef4a8976a5bade3 Mon Sep 17 00:00:00 2001 From: TrushynAliaksandr <146721938+TrushynAliaksandr@users.noreply.github.com> Date: Tue, 24 Oct 2023 21:46:07 +0200 Subject: [PATCH 0635/1049] add parameters to pr bot org wide config (#2801) --- .buildkite/pull-requests.org-wide.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 0288b89c91d2e..2982274923b6a 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -11,13 +11,16 @@ ], "build_on_commit": true, "build_on_comment": true, - "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", - "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "skip_ci_labels": [ "skip-ci" ], "skip_ci_on_only_changed": [ - "\\.md$" + ".*" + ], + "always_require_ci_on_changed": [ + "docs\\.*" ], "repositories": [ "elastic/docs", From a8ecba1e6cab7aeae4d91c3c37270aad1808ae81 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 25 Oct 2023 20:27:11 +0200 Subject: [PATCH 0636/1049] Add ENRICH --- resources/web/lib/prettify/lang-esql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/lib/prettify/lang-esql.js b/resources/web/lib/prettify/lang-esql.js index 4638978337135..33f515d7c14bb 100644 --- a/resources/web/lib/prettify/lang-esql.js +++ b/resources/web/lib/prettify/lang-esql.js @@ -28,7 +28,7 @@ PR['registerLangHandler']( ], [ [PR['PR_COMMENT'], /^(?:\/\/[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR['PR_KEYWORD'], /^(?:AND|OR|BY|DISSECT|DROP|EVAL|FROM|GROK|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|RENAME|RLIKE|ROW|SHOW|SORT|STATS|WHERE)(?=[^\w-]|$)/i, null], + [PR['PR_KEYWORD'], /^(?:AND|OR|BY|DISSECT|DROP|ENRICH|EVAL|FROM|GROK|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|RENAME|RLIKE|ROW|SHOW|SORT|STATS|WHERE)(?=[^\w-]|$)/i, null], [PR['PR_LITERAL'], /^[+-]?(?:\.\d+|\d+(?:\.\d*)?)/i], [PR['PR_PLAIN'], /^[a-z_][\w-]*/i], ]), From 3896d3e71ed6c26d3cb16fb300d8de23bb24f878 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 25 Oct 2023 20:32:11 +0200 Subject: [PATCH 0637/1049] Operators --- resources/web/lib/prettify/lang-esql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/lib/prettify/lang-esql.js b/resources/web/lib/prettify/lang-esql.js index 33f515d7c14bb..9d155635f25ed 100644 --- a/resources/web/lib/prettify/lang-esql.js +++ b/resources/web/lib/prettify/lang-esql.js @@ -28,7 +28,7 @@ PR['registerLangHandler']( ], [ [PR['PR_COMMENT'], /^(?:\/\/[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR['PR_KEYWORD'], /^(?:AND|OR|BY|DISSECT|DROP|ENRICH|EVAL|FROM|GROK|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|RENAME|RLIKE|ROW|SHOW|SORT|STATS|WHERE)(?=[^\w-]|$)/i, null], + [PR['PR_KEYWORD'], /^(?:AND|BY|DISSECT|DROP|ENDS_WITH|ENRICH|EVAL|FROM|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS|NAN|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|OR|RENAME|RLIKE|ROW|SHOW|SORT|STARTS_WITH|STATS|WHERE)(?=[^\w-]|$)/i, null], [PR['PR_LITERAL'], /^[+-]?(?:\.\d+|\d+(?:\.\d*)?)/i], [PR['PR_PLAIN'], /^[a-z_][\w-]*/i], ]), From 0eb6e945d534bf3a91603898a42fe21f926dcfa5 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 25 Oct 2023 20:37:43 +0200 Subject: [PATCH 0638/1049] More operators --- resources/web/lib/prettify/lang-esql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/lib/prettify/lang-esql.js b/resources/web/lib/prettify/lang-esql.js index 9d155635f25ed..48887f108dc7d 100644 --- a/resources/web/lib/prettify/lang-esql.js +++ b/resources/web/lib/prettify/lang-esql.js @@ -28,7 +28,7 @@ PR['registerLangHandler']( ], [ [PR['PR_COMMENT'], /^(?:\/\/[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR['PR_KEYWORD'], /^(?:AND|BY|DISSECT|DROP|ENDS_WITH|ENRICH|EVAL|FROM|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS|NAN|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|OR|RENAME|RLIKE|ROW|SHOW|SORT|STARTS_WITH|STATS|WHERE)(?=[^\w-]|$)/i, null], + [PR['PR_KEYWORD'], /^(?:AND|BY|CIDR_MATCH|DISSECT|DROP|ENDS_WITH|ENRICH|EVAL|FROM|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS_NAN|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|NULL|OR|RENAME|RLIKE|ROW|SHOW|SORT|STARTS_WITH|STATS|WHERE)(?=[^\w-]|$)/i, null], [PR['PR_LITERAL'], /^[+-]?(?:\.\d+|\d+(?:\.\d*)?)/i], [PR['PR_PLAIN'], /^[a-z_][\w-]*/i], ]), From 09cf4d2d5f0b2619808a58defa1cad707dd33245 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Wed, 25 Oct 2023 20:55:51 +0200 Subject: [PATCH 0639/1049] Add functions --- resources/web/lib/prettify/lang-esql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/lib/prettify/lang-esql.js b/resources/web/lib/prettify/lang-esql.js index 48887f108dc7d..1511ebf139b79 100644 --- a/resources/web/lib/prettify/lang-esql.js +++ b/resources/web/lib/prettify/lang-esql.js @@ -28,7 +28,7 @@ PR['registerLangHandler']( ], [ [PR['PR_COMMENT'], /^(?:\/\/[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR['PR_KEYWORD'], /^(?:AND|BY|CIDR_MATCH|DISSECT|DROP|ENDS_WITH|ENRICH|EVAL|FROM|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS_NAN|KEEP|LIKE|LIMIT|MV_EXPAND|NOT|NULL|OR|RENAME|RLIKE|ROW|SHOW|SORT|STARTS_WITH|STATS|WHERE)(?=[^\w-]|$)/i, null], + [PR['PR_KEYWORD'], /^(?:AND|ABS|ACOS|ASIN|ATAN|ATAN2|AUTO_BUCKET|AVG|BY|CASE|CEIL|CIDR_MATCH|COALESCE|CONCAT|COS|COSH|COUNT|COUNT_DISTINCT|DATE_EXTRACT|DATE_FORMAT|DATE_PARSE|DATE_TRUNC|DISSECT|DROP|E|ENDS_WITH|ENRICH|EVAL|FLOOR|FROM|GREATEST|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS_NAN|LEFT|LENGTH|LOG10|LTRIM|MAX|MEDIAN|MEDIAN_ABSOLUTE_DEVIATION|MIN|KEEP|LEAST|LIKE|LIMIT|MV_AVG|MV_CONCAT|MV_COUNT|MV_DEDUPE|MV_EXPAND|MV_MAX|MV_MEDIAN|MV_MIN|MV_SUM|NOT|NOW|NULL|OR|PERCENTILE|PI|POW|RENAME|REPLACE|RIGHT|RLIKE|ROUND|ROW|RTRIM|SHOW|SPLIT|SIN|SINH|SORT|SQRT|STARTS_WITH|STATS|SUBSTRING|TAN|TANH|TAU|TO_BOOLEAN|TO_DATETIME|TO_DEGREES|TO_DOUBLE|TO_INTEGER|TO_IP|TO_LONG|TO_RADIANS|TO_STRING|TO_UNSIGNED_LONG|TO_VERSION|TRIM|SUM|WHERE)(?=[^\w-]|$)/i, null], [PR['PR_LITERAL'], /^[+-]?(?:\.\d+|\d+(?:\.\d*)?)/i], [PR['PR_PLAIN'], /^[a-z_][\w-]*/i], ]), From 8c94d091cb0b0d31882404b96931546bf807b3a0 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Mon, 30 Oct 2023 11:54:21 -0400 Subject: [PATCH 0640/1049] Update tech preview copy (#2807) --- integtest/spec/single_book_spec.rb | 2 +- resources/asciidoctor/lib/care_admonition/extension.rb | 2 +- resources/asciidoctor/spec/care_admonition_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integtest/spec/single_book_spec.rb b/integtest/spec/single_book_spec.rb index 98627a0aa980d..f5f5cf49a47a4 100644 --- a/integtest/spec/single_book_spec.rb +++ b/integtest/spec/single_book_spec.rb @@ -288,7 +288,7 @@ it 'includes the experimental text' do expect(body).to include( 'This functionality is in technical preview and may be changed or '\ - 'removed in a future release. Elastic will apply best effort to fix '\ + 'removed in a future release. Elastic will work to fix '\ 'any issues, but features in technical preview are not subject to '\ 'the support SLA of official GA features.' ) diff --git a/resources/asciidoctor/lib/care_admonition/extension.rb b/resources/asciidoctor/lib/care_admonition/extension.rb index 87b7fdc9a145f..4be6e279d24ba 100644 --- a/resources/asciidoctor/lib/care_admonition/extension.rb +++ b/resources/asciidoctor/lib/care_admonition/extension.rb @@ -25,7 +25,7 @@ class CareAdmonition < Asciidoctor::Extensions::Group This functionality is in development and may be changed or removed completely in a future release. These features are unsupported and not subject to the support SLA of official GA features. TEXT PREVIEW_DEFAULT_TEXT = <<~TEXT.strip - This functionality is in technical preview and may be changed or removed in a future release. Elastic will apply best effort to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. + This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. TEXT def activate(registry) diff --git a/resources/asciidoctor/spec/care_admonition_spec.rb b/resources/asciidoctor/spec/care_admonition_spec.rb index 1cfa2bce7f63c..97c240af1fe5e 100644 --- a/resources/asciidoctor/spec/care_admonition_spec.rb +++ b/resources/asciidoctor/spec/care_admonition_spec.rb @@ -247,7 +247,7 @@ def expect_inline_admonition(text) let(:admon_class) { 'warning' } let(:default_text) do <<~TEXT.strip - This functionality is in technical preview and may be changed or removed in a future release. Elastic will apply best effort to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. + This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. TEXT end include_examples 'care admonition' @@ -257,7 +257,7 @@ def expect_inline_admonition(text) let(:admon_class) { 'warning' } let(:default_text) do <<~TEXT.strip - This functionality is in technical preview and may be changed or removed in a future release. Elastic will apply best effort to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. + This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. TEXT end include_examples 'care admonition' From 00ea83b90d4101de17c080eb13f888691a0d3c88 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 30 Oct 2023 12:52:51 -0700 Subject: [PATCH 0641/1049] Add docs about `page_header.html` (#2808) * Update README.asciidoc * Update README.asciidoc --- README.asciidoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.asciidoc b/README.asciidoc index 617870e1e1224..1149ecc6c2bec 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1999,3 +1999,8 @@ This is where the content for tab #1 goes. This is the content for tab #2 goes. // end::reg-config[] ---- + +[[global-banners]] +== Global banners + +Add a banner to every page within a book by creating a `page_header.html` file. This file must live in the root of the documentation directory (i.e. the book's `path` in `conf.yaml`) and is picked up by the doc build automatically. This file can include any valid HTML. An example can be seen https://github.com/elastic/apm-server/pull/6833/files[here]. From 7470e3516e5298e2c540bd22f3281314c7e863e2 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 30 Oct 2023 16:21:37 -0400 Subject: [PATCH 0642/1049] Update yarn I'm getting 500 errors when yarn runs. So is CI. An upgrade seems to fix it.... --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c973b7d577fab..6214104c22e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ FROM base AS node_deps COPY .docker/apt/keys/yarn.gpg / RUN apt-key add /yarn.gpg COPY .docker/apt/sources.list.d/yarn.list /etc/apt/sources.list.d/ -RUN install_packages yarn=1.21.1-1 +RUN install_packages yarn=1.22.19-1 COPY package.json / COPY yarn.lock / ENV YARN_CACHE_FOLDER=/tmp/.yarn-cache From 336e286551d8f7b4735d0f2c58820506719a035e Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:01:15 -0400 Subject: [PATCH 0643/1049] Update Serverless attribute to 'serverless' (#2812) --- shared/attributes.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 239832d026b74..95460be1a286d 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -179,8 +179,8 @@ Elastic Cloud :ess: Elasticsearch Service :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes -:serverless-full: Elastic Cloud Serverless -:serverless-short: Serverless +:serverless-full: Elastic Cloud serverless +:serverless-short: serverless :serverless-feature-flag: no :serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current From 1eedd06fa8d2e98d9ef266a448f1128e4e306de5 Mon Sep 17 00:00:00 2001 From: Chris Cressman Date: Mon, 6 Nov 2023 09:53:16 -0500 Subject: [PATCH 0644/1049] Change destination for Search solution to Elasticsearch (#2813) For the "Search" solution, direct readers to the Elasticsearch docs rather than the Enterprise Search docs. For the link text, use the same text we use in the Elastic Cloud console to describe Elasticsearch projects. --- extra/docs_landing.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index a67ae4e920df3..92f2fa0311384 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -223,13 +223,13 @@

      Get started

      Get hands-on with a solution and quickly see data in action, or start from a blank page.

      - +

      Search

      -

      Build an application on top of Elasticsearch with Elastic Enterprise Search.

      +

      Build custom applications with your data using Elasticsearch.
      From c4424b53a5ae438f459d784a33e94dd524b98c1c Mon Sep 17 00:00:00 2001 From: Michael Montgomery Date: Tue, 7 Nov 2023 00:40:11 -0600 Subject: [PATCH 0645/1049] Add ECK 2.10 (#2810) Signed-off-by: Michael Montgomery --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 291c78cd6a7e4..46e0b9a3de028 100644 --- a/conf.yaml +++ b/conf.yaml @@ -900,7 +900,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.9 - branches: [ {main: master}, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ {main: master}, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From d277185b4cd15dc4b311b8b0a49a91cc14dff360 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Tue, 7 Nov 2023 14:24:18 +0100 Subject: [PATCH 0646/1049] More ES|QL keywords for prettify --- resources/web/lib/prettify/lang-esql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/lib/prettify/lang-esql.js b/resources/web/lib/prettify/lang-esql.js index 1511ebf139b79..0880f07ea9bbb 100644 --- a/resources/web/lib/prettify/lang-esql.js +++ b/resources/web/lib/prettify/lang-esql.js @@ -28,7 +28,7 @@ PR['registerLangHandler']( ], [ [PR['PR_COMMENT'], /^(?:\/\/[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR['PR_KEYWORD'], /^(?:AND|ABS|ACOS|ASIN|ATAN|ATAN2|AUTO_BUCKET|AVG|BY|CASE|CEIL|CIDR_MATCH|COALESCE|CONCAT|COS|COSH|COUNT|COUNT_DISTINCT|DATE_EXTRACT|DATE_FORMAT|DATE_PARSE|DATE_TRUNC|DISSECT|DROP|E|ENDS_WITH|ENRICH|EVAL|FLOOR|FROM|GREATEST|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS_NAN|LEFT|LENGTH|LOG10|LTRIM|MAX|MEDIAN|MEDIAN_ABSOLUTE_DEVIATION|MIN|KEEP|LEAST|LIKE|LIMIT|MV_AVG|MV_CONCAT|MV_COUNT|MV_DEDUPE|MV_EXPAND|MV_MAX|MV_MEDIAN|MV_MIN|MV_SUM|NOT|NOW|NULL|OR|PERCENTILE|PI|POW|RENAME|REPLACE|RIGHT|RLIKE|ROUND|ROW|RTRIM|SHOW|SPLIT|SIN|SINH|SORT|SQRT|STARTS_WITH|STATS|SUBSTRING|TAN|TANH|TAU|TO_BOOLEAN|TO_DATETIME|TO_DEGREES|TO_DOUBLE|TO_INTEGER|TO_IP|TO_LONG|TO_RADIANS|TO_STRING|TO_UNSIGNED_LONG|TO_VERSION|TRIM|SUM|WHERE)(?=[^\w-]|$)/i, null], + [PR['PR_KEYWORD'], /^(?:ABS|ACOS|AND|APPEND_SEPARATOR|AS|ASC|ASIN|ATAN|ATAN2|AUTO_BUCKET|AVG|BY|CASE|CEIL|CIDR_MATCH|COALESCE|CONCAT|COS|COSH|COUNT|COUNT_DISTINCT|DATE_EXTRACT|DATE_FORMAT|DATE_PARSE|DATE_TRUNC|DESC|DISSECT|DROP|E|ENDS_WITH|ENRICH|EVAL|FIRST|FLOOR|FROM|GREATEST|GROK|IN|IS|IS_FINITE|IS_INFINITE|IS_NAN|LEFT|LENGTH|LOG10|LTRIM|MAX|MEDIAN|MEDIAN_ABSOLUTE_DEVIATION|MIN|KEEP|LAST|LEAST|LIKE|LIMIT|METADATA|MV_AVG|MV_CONCAT|MV_COUNT|MV_DEDUPE|MV_EXPAND|MV_MAX|MV_MEDIAN|MV_MIN|MV_SUM|NOT|NOW|NULL|NULLS|ON|OR|PERCENTILE|PI|POW|RENAME|REPLACE|RIGHT|RLIKE|ROUND|ROW|RTRIM|SHOW|SPLIT|SIN|SINH|SORT|SQRT|STARTS_WITH|STATS|SUBSTRING|TAN|TANH|TAU|TO_BOOL|TO_BOOLEAN|TO_DATETIME|TO_DBL|TO_DEGREES|TO_DOUBLE|TO_DT|TO_INT|TO_INTEGER|TO_IP|TO_LONG|TO_RADIANS|TO_STR|TO_STRING|TO_UL|TO_ULONG|TO_UNSIGNED_LONG|TO_VER|TO_VERSION|TRIM|SUM|WHERE|WITH)(?=[^\w-]|$)/i, null], [PR['PR_LITERAL'], /^[+-]?(?:\.\d+|\d+(?:\.\d*)?)/i], [PR['PR_PLAIN'], /^[a-z_][\w-]*/i], ]), From c3b0071188a1b9d46a6f53c6221a2341d90ebc4e Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 7 Nov 2023 06:55:51 -0800 Subject: [PATCH 0647/1049] Release 8.11.0 (#2809) --- conf.yaml | 8 ++++---- shared/versions/stack/8.10.asciidoc | 2 +- shared/versions/stack/8.11.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf.yaml b/conf.yaml index 46e0b9a3de028..5af5b972e2226 100644 --- a/conf.yaml +++ b/conf.yaml @@ -76,8 +76,8 @@ contents_title: Starting with the Elasticsearch Platform and its Solutions # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.10 - stacklive: &stacklive [ 8.10, 7.17 ] + stackcurrent: &stackcurrent 8.11 + stacklive: &stacklive [ 8.11, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-99 @@ -261,7 +261,7 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - current: 8.10 + current: 8.11 branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] index: docs/index.asciidoc @@ -277,7 +277,7 @@ contents: current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc branches: [ {main: master}, 8.11, 8.10, 8.9 ] - live: [ 8.10 ] + live: [ 8.11 ] chunk: 1 tags: Ingest/Reference subject: Ingest diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 2de8621fca11c..5f41bfee3b1d4 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc index d1acd695ce17d..c6603a928f87a 100644 --- a/shared/versions/stack/8.11.asciidoc +++ b/shared/versions/stack/8.11.asciidoc @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index 86947ff5513ca..705921d1d2ddb 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.10.asciidoc[] +include::8.11.asciidoc[] From b11320fef6400802a230cc1201b63d6cbb5656d2 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Tue, 7 Nov 2023 16:08:31 +0100 Subject: [PATCH 0648/1049] Update PR bot config to trigger for non docs repos --- .buildkite/pull-requests.org-wide.json | 27 +++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 2982274923b6a..b91b03394f769 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -14,7 +14,30 @@ "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "skip_ci_labels": [ - "skip-ci" + "skip docs-build" + ], + "skip_ci_on_only_changed": [], + "always_require_ci_on_changed": [], + "repositories": [ + "elastic/docs", + "elastic/tech-content" + ] + }, + { + "enabled": true, + "pipeline_slug": "docs-build", + "always_trigger_branch": "buildkite-webhook-rebuild-136", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "skip_ci_labels": [ + "skip docs-build" ], "skip_ci_on_only_changed": [ ".*" @@ -23,8 +46,6 @@ "docs\\.*" ], "repositories": [ - "elastic/docs", - "elastic/tech-content", "elastic/x-pack" ] } From 975dd1963e8fbec8e540dbc1afb8187b4a92a3c8 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 7 Nov 2023 11:52:51 -0500 Subject: [PATCH 0649/1049] Bump `master` attributes to 8.12 (#2818) --- shared/versions/stack/master.asciidoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index bdc8555e98a60..12b1e8252c74d 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -1,14 +1,14 @@ -:version: 8.10.0 +:version: 8.12.0 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.10.0 -:logstash_version: 8.10.0 -:elasticsearch_version: 8.10.0 -:kibana_version: 8.10.0 -:apm_server_version: 8.10.0 +:bare_version: 8.12.0 +:logstash_version: 8.12.0 +:elasticsearch_version: 8.12.0 +:kibana_version: 8.12.0 +:apm_server_version: 8.12.0 :branch: master -:minor-version: 8.10 +:minor-version: 8.12 :major-version: 8.x :prev-major-version: 7.x :prev-major-last: 7.17 From dea18286e3fd00371392ddd180e77d6be8593489 Mon Sep 17 00:00:00 2001 From: Michael Montgomery Date: Wed, 8 Nov 2023 02:34:21 -0600 Subject: [PATCH 0650/1049] Promote ECK 2.10 (#2811) Signed-off-by: Michael Montgomery Co-authored-by: Istvan Nagy --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 5af5b972e2226..386b91ab88323 100644 --- a/conf.yaml +++ b/conf.yaml @@ -899,7 +899,7 @@ contents: prefix: en/cloud-on-k8s tags: Kubernetes/Reference subject: ECK - current: 2.9 + current: 2.10 branches: [ {main: master}, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 From 130ecfba666cb45abc2fa7f53800ad60d69ef0aa Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 8 Nov 2023 09:46:58 +0100 Subject: [PATCH 0651/1049] Rename script and update branch filtering condition --- .buildkite/{pr_main_mr_test.yml => build_and_test.yml} | 0 catalog-info.yaml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename .buildkite/{pr_main_mr_test.yml => build_and_test.yml} (100%) diff --git a/.buildkite/pr_main_mr_test.yml b/.buildkite/build_and_test.yml similarity index 100% rename from .buildkite/pr_main_mr_test.yml rename to .buildkite/build_and_test.yml diff --git a/catalog-info.yaml b/catalog-info.yaml index 3872bd6fedd09..e3279106011a6 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -81,7 +81,7 @@ spec: everyone: access_level: READ_ONLY -# Declare test execution on PR and merge to main +# Declare test execution on PR and merge to master --- apiVersion: backstage.io/v1alpha1 kind: Resource @@ -102,9 +102,9 @@ spec: metadata: name: docs-test spec: - branch_configuration: "main" + branch_configuration: master repository: elastic/docs - pipeline_file: ".buildkite/pr_main_mr_test.yml" + pipeline_file: ".buildkite/build_and_test.yml" teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ From f17cc4909d71936e4b321b296cce988ed5087699 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 8 Nov 2023 09:50:15 +0100 Subject: [PATCH 0652/1049] Update pipeline name to match other naming conventions --- catalog-info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index e3279106011a6..e240faa32ba0f 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -100,7 +100,7 @@ spec: apiVersion: buildkite.elastic.dev/v1 kind: Pipeline metadata: - name: docs-test + name: docs / test spec: branch_configuration: master repository: elastic/docs From e7cb56be85c28302b32839781f1328a9cc480f31 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Mon, 30 Oct 2023 09:48:29 +0100 Subject: [PATCH 0653/1049] ESS - Change current to ms-100 --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 386b91ab88323..d9795c48ad84a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.11 stacklive: &stacklive [ 8.11, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-99 + cloudSaasCurrent: &cloudSaasCurrent ms-100 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: main From 3f57f82f692804cc993f43193a281fc9063e4b5b Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 8 Nov 2023 08:32:47 -0500 Subject: [PATCH 0654/1049] Change current to ms-101 --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index d9795c48ad84a..17075c9827c6c 100644 --- a/conf.yaml +++ b/conf.yaml @@ -79,7 +79,7 @@ variables: stackcurrent: &stackcurrent 8.11 stacklive: &stacklive [ 8.11, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-100 + cloudSaasCurrent: &cloudSaasCurrent ms-101 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-92: main From d4e735075234848a9c4d3c5ca07af961499a4921 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 8 Nov 2023 17:19:31 +0100 Subject: [PATCH 0655/1049] Rename pipeline --- .buildkite/{build_and_test.yml => test_pipeline.yml} | 0 catalog-info.yaml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename .buildkite/{build_and_test.yml => test_pipeline.yml} (100%) diff --git a/.buildkite/build_and_test.yml b/.buildkite/test_pipeline.yml similarity index 100% rename from .buildkite/build_and_test.yml rename to .buildkite/test_pipeline.yml diff --git a/catalog-info.yaml b/catalog-info.yaml index e240faa32ba0f..23ec2a73fa1e5 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -87,7 +87,7 @@ apiVersion: backstage.io/v1alpha1 kind: Resource metadata: name: buildkite-pipeline-docs-test - description: PR and Merge-to-Main Test + description: Run tests on PR and merges links: - title: Pipeline url: https://buildkite.com/elastic/docs-test @@ -104,7 +104,7 @@ spec: spec: branch_configuration: master repository: elastic/docs - pipeline_file: ".buildkite/build_and_test.yml" + pipeline_file: ".buildkite/test_pipeline.yml" teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ From d34ca2b4b855d1b5f21de553d14e7e51b50e40fa Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 8 Nov 2023 17:35:53 +0100 Subject: [PATCH 0656/1049] Create a dedicated build pipeline for PR This commit introduces a new build pipeline just for PR, without for now renaming the underlying scripts (next commit). We were using a single pipeline for commits to branches/master and for PR. The issue is that all PR builds are handled by the Buildkite PR bot, and this was introducing a lot of un-necessary complexity into the build script to support both mode. Additionally, some builds were kicked-off on commits to a branch of a PR interefering with the PR bot builds. --- .../{pipeline.yml => build_pipeline.yml} | 0 .buildkite/build_pr_pipeline.yml | 10 +++++ catalog-info.yaml | 45 ++++++++++++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) rename .buildkite/{pipeline.yml => build_pipeline.yml} (100%) create mode 100644 .buildkite/build_pr_pipeline.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/build_pipeline.yml similarity index 100% rename from .buildkite/pipeline.yml rename to .buildkite/build_pipeline.yml diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml new file mode 100644 index 0000000000000..c223eaf3311b8 --- /dev/null +++ b/.buildkite/build_pr_pipeline.yml @@ -0,0 +1,10 @@ +steps: + - label: ":white_check_mark: Build docs PR" + command: | + bash .buildkite/scripts/build-docs.sh + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 +notify: + - email: "docs-status@elastic.co" + if: build.state == "failed" diff --git a/catalog-info.yaml b/catalog-info.yaml index 23ec2a73fa1e5..9a0b1bfc72c67 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -20,7 +20,10 @@ spec: name: docs / build spec: repository: elastic/docs - pipeline_file: ".buildkite/pipeline.yml" + pipeline_file: ".buildkite/build_pipeline.yml" + branch_configuration: master + provider_settings: + build_pull_requests: false teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ @@ -36,6 +39,46 @@ spec: SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" SLACK_NOTIFICATIONS_ON_SUCCESS: "false" +--- +# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pipeline-docs-pr + description: Build the docs pull requests + links: + - title: Pipeline + url: https://buildkite.com/elastic/docs-build-pr + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: docs / build-pr + spec: + repository: elastic/docs + pipeline_file: ".buildkite/build_pr_pipeline.yml" + provider_settings: + trigger_mode: none # triggered via webhook and the buildkite-pr-bot + skip_intermediate_builds: false + teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ + ci-docs-migration-taskforce: + access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ + everyone: + access_level: READ_ONLY + env: + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" + SLACK_NOTIFICATIONS_CHANNEL: "#docs-builds" + SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" + SLACK_NOTIFICATIONS_ON_SUCCESS: "false" # Declare daily preview cleaner --- apiVersion: backstage.io/v1alpha1 From e1ceddd12b090fce692603e4c301aea198e645b4 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 8 Nov 2023 17:51:58 +0100 Subject: [PATCH 0657/1049] Clean up the main branch --- .buildkite/build_pipeline.yml | 13 ++++++------- .buildkite/build_pr_pipeline.yml | 2 +- .buildkite/scripts/{build-docs.sh => build.sh} | 0 .buildkite/scripts/build_pr.sh | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) rename .buildkite/scripts/{build-docs.sh => build.sh} (100%) create mode 100644 .buildkite/scripts/build_pr.sh diff --git a/.buildkite/build_pipeline.yml b/.buildkite/build_pipeline.yml index d56385b65ccee..c8d298e53eed0 100644 --- a/.buildkite/build_pipeline.yml +++ b/.buildkite/build_pipeline.yml @@ -18,19 +18,18 @@ steps: required: false options: - label: "Continue without warning" - value: "skip" + value: "skiplinkcheck" - label: "Continue, but log a warning" - value: "warn" + value: "warnlinkcheck" - label: "Fail the build" - value: false + value: "" hint: "Should we ignore checking broken links? Should we allow to run the build without failing if there's a broken link? Ignoring broken links is dangerous not just because bad links will leak into the public site but because subsequent builds and pull requests that do not fix the links fail." - wait - label: ":white_check_mark: Build docs" command: | - export REBUILD="$(buildkite-agent meta-data get REBUILD --default false)" - export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default false)" - bash .buildkite/scripts/build-docs.sh - branches: "master" + export REBUILD="$(buildkite-agent meta-data get REBUILD --default '' --log-level fatal)" + export BROKEN_LINKS="$(buildkite-agent meta-data get BROKEN_LINKS --default '' --log-level fatal)" + bash .buildkite/scripts/build.sh agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index c223eaf3311b8..ed19cbc8e23cf 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":white_check_mark: Build docs PR" command: | - bash .buildkite/scripts/build-docs.sh + bash .buildkite/scripts/build_docs_pr.sh agents: provider: "gcp" image: family/docs-ubuntu-2204 diff --git a/.buildkite/scripts/build-docs.sh b/.buildkite/scripts/build.sh similarity index 100% rename from .buildkite/scripts/build-docs.sh rename to .buildkite/scripts/build.sh diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh new file mode 100644 index 0000000000000..00e6a0a7d7aef --- /dev/null +++ b/.buildkite/scripts/build_pr.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo "nothing to see yet" From 5685287c9a1ce87a225e50c9d95ff3479b1d430c Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Wed, 8 Nov 2023 12:30:52 -0500 Subject: [PATCH 0658/1049] Remove 'serverless-feature-flag' (#2825) --- shared/attributes.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 95460be1a286d..c9a0e947aa0c1 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -181,7 +181,6 @@ Elastic Cloud :eck: Elastic Cloud on Kubernetes :serverless-full: Elastic Cloud serverless :serverless-short: serverless -:serverless-feature-flag: no :serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body From 56a311d9e56d87da693ea6628cdd21a1b250f9ab Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 9 Nov 2023 16:21:01 +0100 Subject: [PATCH 0659/1049] update build script --- .buildkite/scripts/build.sh | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh index e84994b5d7135..bbf0f4987cf58 100644 --- a/.buildkite/scripts/build.sh +++ b/.buildkite/scripts/build.sh @@ -14,31 +14,21 @@ build_args="" rebuild_opt="" broken_links_opt="" -# From https://github.com/elastic/infra/blob/master/ci/jjb/elasticsearch-ci/defs/elastic-docs/pull-requests.yml#L110 -# Per https://github.com/elastic/docs/issues/1821, always rebuild all -# books for PRs to the docs repo, for now. -# When https://github.com/elastic/docs/issues/1823 is fixed, this -# should be removed and the original behavior restored. - -if [[ "${REBUILD}" == 'true' ]]; then +if [[ "${REBUILD}" == 'rebuild' ]]; then rebuild_opt="--rebuild" fi -if [[ "${BROKEN_LINKS}" == 'skip' ]]; then +if [[ "${BROKEN_LINKS}" == 'skiplinkcheck' ]]; then broken_links_opt="--skiplinkcheck" +else + if [[ "${BROKEN_LINKS}" == 'warnlinkcheck' ]]; then + broken_links_opt="--warnlinkcheck" + fi fi -if [[ "${BROKEN_LINKS}" == 'warn' ]]; then - broken_links_opt="--warnlinkcheck" -fi - -# When running on a branch or on main -if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then +if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then # temporary pushing to staging instead of master until the migration is over - build_args+=" --target_branch staging" -else - build_args+=" --target_branch docs_bk_${BUILDKITE_PULL_REQUEST}" - build_args+=" --announce_preview https://docs_bk_${BUILDKITE_PULL_REQUEST}.docs-preview.app.elstc.co/diff" + build_args+=" --target_branch staging --push" fi # The docs build can use the ssh agent's authentication socket @@ -48,7 +38,6 @@ ssh-agent bash -c " ssh-add && ./build_docs --all \ --target_repo git@github.com:elastic/built-docs \ - $build_args \ - $rebuild_opt $broken_links_opt \ --reference /opt/git-mirrors/ \ - --push" + $build_args \ + $rebuild_opt $broken_links_opt" From e4d756f156f95fac8cf254e72109eb52fb42b7ba Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 9 Nov 2023 14:21:30 -0600 Subject: [PATCH 0660/1049] Add versioning for Android APM agent docs (#2823) * update config and version files to include android apm agent versions * update previous versions * use 8.4 as minimum supported version --- conf.yaml | 6 +++--- shared/versions/stack/8.10.asciidoc | 2 +- shared/versions/stack/8.11.asciidoc | 2 +- shared/versions/stack/8.4.asciidoc | 1 + shared/versions/stack/8.5.asciidoc | 2 +- shared/versions/stack/8.6.asciidoc | 1 + shared/versions/stack/8.7.asciidoc | 1 + shared/versions/stack/8.8.asciidoc | 1 + shared/versions/stack/8.9.asciidoc | 2 +- shared/versions/stack/master.asciidoc | 2 +- 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/conf.yaml b/conf.yaml index 386b91ab88323..1eeb86e161005 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1240,9 +1240,9 @@ contents: sections: - title: APM Android Agent prefix: android - current: main - branches: [ {main: master} ] - live: [ main ] + current: 0.x + branches: [ {main: master}, 0.x ] + live: [ 0.x ] index: docs/index.asciidoc tags: APM Android Agent/Reference subject: APM diff --git a/shared/versions/stack/8.10.asciidoc b/shared/versions/stack/8.10.asciidoc index 5f41bfee3b1d4..fd35b410566e2 100644 --- a/shared/versions/stack/8.10.asciidoc +++ b/shared/versions/stack/8.10.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: main +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc index c6603a928f87a..fbb7ca6f97c83 100644 --- a/shared/versions/stack/8.11.asciidoc +++ b/shared/versions/stack/8.11.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: main +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.4.asciidoc b/shared/versions/stack/8.4.asciidoc index b5ebb59e808bf..b9bc996903308 100644 --- a/shared/versions/stack/8.4.asciidoc +++ b/shared/versions/stack/8.4.asciidoc @@ -33,6 +33,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.5.asciidoc b/shared/versions/stack/8.5.asciidoc index e5824312b723e..bea7ef1fbf573 100644 --- a/shared/versions/stack/8.5.asciidoc +++ b/shared/versions/stack/8.5.asciidoc @@ -33,7 +33,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: main +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.6.asciidoc b/shared/versions/stack/8.6.asciidoc index 0ed934ad6eb08..753c4f008c1af 100644 --- a/shared/versions/stack/8.6.asciidoc +++ b/shared/versions/stack/8.6.asciidoc @@ -33,6 +33,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.7.asciidoc b/shared/versions/stack/8.7.asciidoc index 3c7f9d147c6d5..e67f9d3e4df1b 100644 --- a/shared/versions/stack/8.7.asciidoc +++ b/shared/versions/stack/8.7.asciidoc @@ -33,6 +33,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.8.asciidoc b/shared/versions/stack/8.8.asciidoc index 6e8b9d6f2a3b2..c1d437b0130b7 100644 --- a/shared/versions/stack/8.8.asciidoc +++ b/shared/versions/stack/8.8.asciidoc @@ -39,6 +39,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.9.asciidoc b/shared/versions/stack/8.9.asciidoc index f563564878a8b..552195c699534 100644 --- a/shared/versions/stack/8.9.asciidoc +++ b/shared/versions/stack/8.9.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: main +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 12b1e8252c74d..fcb218c824b2e 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: main +:apm-android-branch: 0.x :apm-go-branch: 2.x :apm-ios-branch: 0.x :apm-java-branch: 1.x From 35da09d07cc355074d155b28639fbbb6aa054ecb Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:00:05 +0100 Subject: [PATCH 0661/1049] Update script name to match actual file --- .buildkite/build_pr_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index ed19cbc8e23cf..00b5fe0dda35c 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":white_check_mark: Build docs PR" command: | - bash .buildkite/scripts/build_docs_pr.sh + bash .buildkite/scripts/build_pr.sh agents: provider: "gcp" image: family/docs-ubuntu-2204 From d06ce108e602408e04bfd78e90a73b7b288b5c85 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:02:44 +0100 Subject: [PATCH 0662/1049] Disable PR email notifications --- .buildkite/build_pr_pipeline.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index 00b5fe0dda35c..33bcaa774247b 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -5,6 +5,3 @@ steps: agents: provider: "gcp" image: family/docs-ubuntu-2204 -notify: - - email: "docs-status@elastic.co" - if: build.state == "failed" From a03192804cdcb9c0dfe080c7880855f3e261ea8c Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 10 Nov 2023 12:05:00 +0100 Subject: [PATCH 0663/1049] Update pipeline description Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- catalog-info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 9a0b1bfc72c67..23ac5f75b4313 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -45,7 +45,7 @@ apiVersion: backstage.io/v1alpha1 kind: Resource metadata: name: buildkite-pipeline-docs-pr - description: Build the docs pull requests + description: Build the docs on pull requests to the `elastic/docs` repo. links: - title: Pipeline url: https://buildkite.com/elastic/docs-build-pr From c715be692e3d5c6651ec565c2ddf51bbcf6463e9 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:06:54 +0100 Subject: [PATCH 0664/1049] Update builds descriptions --- catalog-info.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 23ac5f75b4313..4989af95490c9 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -4,7 +4,7 @@ apiVersion: backstage.io/v1alpha1 kind: Resource metadata: name: buildkite-pipeline-docs - description: Build the docs + description: Build and Publish the docs links: - title: Pipeline url: https://buildkite.com/elastic/docs-build @@ -45,7 +45,7 @@ apiVersion: backstage.io/v1alpha1 kind: Resource metadata: name: buildkite-pipeline-docs-pr - description: Build the docs on pull requests to the `elastic/docs` repo. + description: Build the docs on pull requests to the `elastic/docs` and products docs repositories. links: - title: Pipeline url: https://buildkite.com/elastic/docs-build-pr From 83cac46e246080625a2eeacc67a982a12ed8ff8d Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:08:01 +0100 Subject: [PATCH 0665/1049] Remove slack notifications --- catalog-info.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 4989af95490c9..6757ba3d79db3 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -62,9 +62,9 @@ spec: spec: repository: elastic/docs pipeline_file: ".buildkite/build_pr_pipeline.yml" + skip_intermediate_builds: false provider_settings: trigger_mode: none # triggered via webhook and the buildkite-pr-bot - skip_intermediate_builds: false teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ @@ -74,11 +74,6 @@ spec: access_level: BUILD_AND_READ everyone: access_level: READ_ONLY - env: - ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" - SLACK_NOTIFICATIONS_CHANNEL: "#docs-builds" - SLACK_NOTIFICATIONS_ALL_BRANCHES: "false" - SLACK_NOTIFICATIONS_ON_SUCCESS: "false" # Declare daily preview cleaner --- apiVersion: backstage.io/v1alpha1 From 037ebed2e14dbc57c3710100025167f6d242f0c1 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:12:11 +0100 Subject: [PATCH 0666/1049] Make all the scripts executable --- .buildkite/scripts/build.sh | 0 .buildkite/scripts/build_pr.sh | 0 .buildkite/scripts/clean_preview_branches.sh | 0 .buildkite/scripts/publish_air_gapped_docs.sh | 0 .buildkite/scripts/retry.sh | 0 .buildkite/scripts/test.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .buildkite/scripts/build.sh mode change 100644 => 100755 .buildkite/scripts/build_pr.sh mode change 100644 => 100755 .buildkite/scripts/clean_preview_branches.sh mode change 100644 => 100755 .buildkite/scripts/publish_air_gapped_docs.sh mode change 100644 => 100755 .buildkite/scripts/retry.sh mode change 100644 => 100755 .buildkite/scripts/test.sh diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh old mode 100644 new mode 100755 diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh old mode 100644 new mode 100755 diff --git a/.buildkite/scripts/clean_preview_branches.sh b/.buildkite/scripts/clean_preview_branches.sh old mode 100644 new mode 100755 diff --git a/.buildkite/scripts/publish_air_gapped_docs.sh b/.buildkite/scripts/publish_air_gapped_docs.sh old mode 100644 new mode 100755 diff --git a/.buildkite/scripts/retry.sh b/.buildkite/scripts/retry.sh old mode 100644 new mode 100755 diff --git a/.buildkite/scripts/test.sh b/.buildkite/scripts/test.sh old mode 100644 new mode 100755 From fe07664e00dea1dd516cc94e4bcf753b03559511 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 10 Nov 2023 12:14:19 +0100 Subject: [PATCH 0667/1049] Rely on the shebang of the script --- .buildkite/preview_cleaner_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/preview_cleaner_pipeline.yml b/.buildkite/preview_cleaner_pipeline.yml index 746a90a6b2a65..72a61b033bde1 100644 --- a/.buildkite/preview_cleaner_pipeline.yml +++ b/.buildkite/preview_cleaner_pipeline.yml @@ -1,6 +1,6 @@ steps: - label: ":white_check_mark: Preview cleaning" - command: bash .buildkite/scripts/clean_preview_branches.sh + command: ".buildkite/scripts/clean_preview_branches.sh" agents: provider: "gcp" image: family/docs-ubuntu-2204 From d9b555cd1d9d54e769cbc75923f905e2c84f901b Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 10 Nov 2023 22:02:09 +0100 Subject: [PATCH 0668/1049] Add o11y docs to Buildkite for validation (#2821) * Add o11y docs to Buildkite for validation * observability-docs repo - Run on any file change, not just those in docs folder --- .buildkite/pull-requests.org-wide.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index b91b03394f769..eee66dc3e7509 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -21,6 +21,7 @@ "repositories": [ "elastic/docs", "elastic/tech-content" + "elastic/observability-docs" ] }, { From b3565bf325d0313d39cc06895bd3e61f70b11827 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Fri, 10 Nov 2023 17:06:10 -0600 Subject: [PATCH 0669/1049] Bumps docs version to 8.11.1 --- shared/versions/stack/8.11.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc index fbb7ca6f97c83..be7d0714e7008 100644 --- a/shared/versions/stack/8.11.asciidoc +++ b/shared/versions/stack/8.11.asciidoc @@ -1,12 +1,12 @@ -:version: 8.11.0 +:version: 8.11.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.11.0 -:logstash_version: 8.11.0 -:elasticsearch_version: 8.11.0 -:kibana_version: 8.11.0 -:apm_server_version: 8.11.0 +:bare_version: 8.11.1 +:logstash_version: 8.11.1 +:elasticsearch_version: 8.11.1 +:kibana_version: 8.11.1 +:apm_server_version: 8.11.1 :branch: 8.11 :minor-version: 8.11 :major-version: 8.x From 5a6c199daf3cd449cfdd8df02d4e065b9800d3c4 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Fri, 10 Nov 2023 17:12:23 -0600 Subject: [PATCH 0670/1049] Bumps docs version to 7.17.15 --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 8dc1fce52dc16..3c0e1009b90e7 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.14 +:version: 7.17.15 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.14 -:logstash_version: 7.17.14 -:elasticsearch_version: 7.17.14 -:kibana_version: 7.17.14 -:apm_server_version: 7.17.14 +:bare_version: 7.17.15 +:logstash_version: 7.17.15 +:elasticsearch_version: 7.17.15 +:kibana_version: 7.17.15 +:apm_server_version: 7.17.15 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 2eafddb9b2c32b72cb97145f1357616daa56d9a8 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 13 Nov 2023 10:24:26 -0800 Subject: [PATCH 0671/1049] Add CODEOWNER file (#2827) --- .github/CODEOWNER | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNER diff --git a/.github/CODEOWNER b/.github/CODEOWNER new file mode 100644 index 0000000000000..598b4b20b27e2 --- /dev/null +++ b/.github/CODEOWNER @@ -0,0 +1 @@ +* @elastic/docs-release-team @elastic/docs-engineering @colleenmcginnis @kilfoyle @leemthompo From 4947570031188f1f3ad630cb3dc17b7f3e048427 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 13 Nov 2023 14:13:40 -0800 Subject: [PATCH 0672/1049] Rename CODEOWNER to CODEOWNERS (#2830) --- .github/{CODEOWNER => CODEOWNERS} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{CODEOWNER => CODEOWNERS} (100%) diff --git a/.github/CODEOWNER b/.github/CODEOWNERS similarity index 100% rename from .github/CODEOWNER rename to .github/CODEOWNERS From e884d95c1419854aa8b3c4a832b24cade2d64ead Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Tue, 14 Nov 2023 05:40:45 +0100 Subject: [PATCH 0673/1049] Fix JSON config for Buildkite PR bot --- .buildkite/pull-requests.org-wide.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index eee66dc3e7509..68f4f2f53eac8 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -20,7 +20,7 @@ "always_require_ci_on_changed": [], "repositories": [ "elastic/docs", - "elastic/tech-content" + "elastic/tech-content", "elastic/observability-docs" ] }, From 3579725dd1e0a03c6f18a01b3eb53d310d25a559 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 15 Nov 2023 06:41:07 +0100 Subject: [PATCH 0674/1049] update Buildkite pr bot config --- .buildkite/pull-requests.org-wide.json | 27 +++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 68f4f2f53eac8..65be7902c6869 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -2,7 +2,29 @@ "jobs": [ { "enabled": true, - "pipeline_slug": "docs-build", + "pipeline_slug": "docs-build-pr", + "always_trigger_branch": "buildkite-webhook-rebuild-136", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "skip_ci_labels": [ + "skip docs-build" + ], + "skip_ci_on_only_changed": [], + "always_require_ci_on_changed": [], + "repositories": [ + "elastic/docs" + ] + }, + { + "enabled": true, + "pipeline_slug": "docs-build-pr", "always_trigger_branch": "buildkite-webhook-rebuild-136", "allow_org_users": true, "allowed_repo_permissions": [ @@ -19,14 +41,13 @@ "skip_ci_on_only_changed": [], "always_require_ci_on_changed": [], "repositories": [ - "elastic/docs", "elastic/tech-content", "elastic/observability-docs" ] }, { "enabled": true, - "pipeline_slug": "docs-build", + "pipeline_slug": "docs-build-pr", "always_trigger_branch": "buildkite-webhook-rebuild-136", "allow_org_users": true, "allowed_repo_permissions": [ From ca75f4f1e7043ff553c5c196566821de5bbd67b2 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 15 Nov 2023 07:05:43 +0100 Subject: [PATCH 0675/1049] Fix up the trigger mode for Buildkite PR pipeline --- catalog-info.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 6757ba3d79db3..0789d798fa8cc 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -64,7 +64,10 @@ spec: pipeline_file: ".buildkite/build_pr_pipeline.yml" skip_intermediate_builds: false provider_settings: - trigger_mode: none # triggered via webhook and the buildkite-pr-bot + # Trigger mode should be set to `none` since this job should only be triggered by API from the buildkite-pr-bot + # But doing so, we hit this bug: https://forum.buildkite.community/t/request-build-error-branches-have-been-disabled-for-this-pipeline/1463 + # So we set the `deployment` trigger which we never use and seem to allow API triggers + trigger_mode: "deployment" teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ From aee5310d382b2e4c3b617992aaa8140a0cfd04d5 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 15 Nov 2023 09:28:27 +0100 Subject: [PATCH 0676/1049] Buildkite PR config update for docs repo --- .buildkite/pull-requests.org-wide.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 65be7902c6869..d3dc8e6ace90c 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -19,7 +19,8 @@ "skip_ci_on_only_changed": [], "always_require_ci_on_changed": [], "repositories": [ - "elastic/docs" + "elastic/tech-content", + "elastic/observability-docs" ] }, { @@ -38,17 +39,19 @@ "skip_ci_labels": [ "skip docs-build" ], - "skip_ci_on_only_changed": [], - "always_require_ci_on_changed": [], + "skip_ci_on_only_changed": [ + ".*" + ], + "always_require_ci_on_changed": [ + "docs\\.*" + ], "repositories": [ - "elastic/tech-content", - "elastic/observability-docs" + "elastic/x-pack" ] }, { "enabled": true, "pipeline_slug": "docs-build-pr", - "always_trigger_branch": "buildkite-webhook-rebuild-136", "allow_org_users": true, "allowed_repo_permissions": [ "admin", @@ -61,14 +64,10 @@ "skip_ci_labels": [ "skip docs-build" ], - "skip_ci_on_only_changed": [ - ".*" - ], - "always_require_ci_on_changed": [ - "docs\\.*" - ], + "skip_ci_on_only_changed": [], + "always_require_ci_on_changed": [], "repositories": [ - "elastic/x-pack" + "elastic/docs" ] } ] From 08efda8621e200f0e483d5437ce078a102d2d2ca Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Wed, 15 Nov 2023 07:00:10 -0600 Subject: [PATCH 0677/1049] Adds serverless to landing page (#2831) * Adds serverless to landing page * Adds serverless to featured topics --- extra/docs_landing.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 92f2fa0311384..3caf12fcbfccf 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -300,6 +300,9 @@

        +
      • + Serverless projects +
      • Add your data
        • @@ -312,9 +315,6 @@

      • Keep your deployment healthy
        • -
      • - Manage data retention -
      • Visualize data with dashboards
        • From 94b92bb5f5e9320485791e5d9c590352261d139e Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 15 Nov 2023 16:58:47 +0100 Subject: [PATCH 0678/1049] Enable Buildkite PR comments --- catalog-info.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index 0789d798fa8cc..ccedca1d2c934 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -77,6 +77,9 @@ spec: access_level: BUILD_AND_READ everyone: access_level: READ_ONLY + env: + ELASTIC_PR_COMMENTS_ENABLED: 'true' + # Declare daily preview cleaner --- apiVersion: backstage.io/v1alpha1 From e0ff806fd8d507f2d279a7f8971ec43bfd921efd Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Wed, 15 Nov 2023 15:40:58 -0600 Subject: [PATCH 0679/1049] Promotes serverless link higher on page (#2834) * Promotes serverless link higher on page * Minor format changes * Fixes space before period --- extra/docs_landing.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 3caf12fcbfccf..967d447b92431 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -68,7 +68,7 @@

        Learn about Elastic

    -

    Learn about the Elastic Stack

    +

    The Elastic Stack

    What exactly is the "Elastic Stack"? It’s a fast and highly scalable set of components — Elasticsearch, Kibana, Beats, Logstash, and others — that together enable you to securely take data from any source, in any format, and then search, analyze, and visualize it.

    @@ -218,6 +218,9 @@

    Consume

    +

    Serverless projects

    +

    Create serverless projects for an autoscaled and fully-managed Elastic solution based on Elasticsearch, Observability, or Security. To learn more, check out the Serverless docs.

    +

    Get started

    New to Elastic? Learn how you can make the most of your data with the Elastic Stack. Get hands-on with a solution and quickly see data in action, or start from a blank page.

    @@ -300,9 +303,6 @@

      -
    • - Serverless projects -
    • Add your data
      • @@ -315,6 +315,9 @@

    • Keep your deployment healthy
      • +
    • + Manage data retention +
    • Visualize data with dashboards
      • From 46028e431d09671b7b4ed0966ac87aa091797f0c Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 09:25:04 +0100 Subject: [PATCH 0680/1049] Add build script for PRs --- .buildkite/scripts/build_pr.sh | 91 +++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 00e6a0a7d7aef..94481dc9e615a 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -1,2 +1,91 @@ #!/bin/bash -echo "nothing to see yet" +set -euo pipefail +set +x + +# This script should only be invoked by the Buildkite PR bot +if [ -z ${GITHUB_PR_BRANCH+set} ] || [ -z ${GITHUB_PR_TARGET_BRANCH+set} ] || [ -z ${GITHUB_PR_NUMBER+set} ] || [ -z ${GITHUB_PR_BASE_REPO+set} ];then + echo "One of the following env. variable GITHUB_PR_BRANCH, GITHUB_PR_TARGET_BRANCH, GITHUB_PR_NUMBER, GITHUB_PR_BASE_REPO is missing - exiting." + exit 1 +fi + +# Set some metadata for build filtering capabilities +# https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=tech-content_123 +buildkite-agent meta-data set "repo_pr" "${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}" + +rebuild_opt="" +build_args="" +TARGET_BRANCH="" + +# Define build docs arguments +if [[ ${GITHUB_PR_COMMENT_VAR_REBUILD_OPT:="unset"} == "rebuild" ]];then + rebuild_opt=" --rebuild" +elif [[ ${GITHUB_PR_COMMENT_VAR_SKIP_OPT:="unset"} == "skiplinkcheck" ]];then + build_args+=" --skiplinkcheck" + if [[ ${GITHUB_PR_COMMENT_VAR_WARN_OPT:="unset"} == "warnlinkcheck" ]];then + build_args+=" --warnlinkcheck" + fi +fi + +buildkite-agent \ + annotate \ + --style "info" \ + --context 'docs-info' \ + "Triggered by a doc change in elastic/$GITHUB_PR_BASE_REPO PR: [#$GITHUB_PR_NUMBER](https://github.com/elastic/$GITHUB_PR_BASE_REPO/pull/$GITHUB_PR_NUMBER)" + + +if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then + # Buildkite PR bot for repositories other than the `elastic/docs` repo are configured to + # always checkout the master branch of the `elastic/docs` repo (where the build logic resides). + # We first need to checkout the product repo / branch in a sub directory, that we'll reference + # in the build process. + echo "Cloning the ${GITHUB_PR_BASE_REPO} PR locally" + + git clone --reference /opt/git-mirrors/elastic-$GITHUB_PR_BASE_REPO \ + git@github.com:elastic/$GITHUB_PR_BASE_REPO.git ./product-repo + + cd ./product-repo && + git fetch origin pull/$GITHUB_PR_NUMBER/head:$GITHUB_PR_BRANCH && + git switch $GITHUB_PR_BRANCH && + cd .. + + build_args+=" --sub_dir $GITHUB_PR_BASE_REPO:$GITHUB_PR_TARGET_BRANCH:./product-repo" +else + # Buildkite PR bot for the `elastic/docs` repo is configured to checkout the PR directly into the workspace + # We don't have to do anything else in this case. + + # Per https://github.com/elastic/docs/issues/1821, always rebuild all + # books for PRs to the docs repo, for now. + # When https://github.com/elastic/docs/issues/1823 is fixed, this + # should be removed and the original behavior restored. + rebuild_opt=" --rebuild" +fi + + +# Set the target branch and preview options +TARGET_BRANCH="${GITHUB_PR_BASE_REPO}_bk_${GITHUB_PR_NUMBER}" +PREVIEW_URL="https://${TARGET_BRANCH}.docs-preview.app.elstc.co" + +build_cmd="./build_docs --all --keep_hash \ + --target_repo git@github.com:elastic/built-docs \ + --reference /opt/git-mirrors/ \ + --target_branch ${TARGET_BRANCH} \ + --push \ + --announce_preview ${PREVIEW_URL}/diff \ + ${rebuild_opt} \ + ${build_args}" + +echo "The following build command will be used" +echo $build_cmd + +# Kick off the build +ssh-agent bash -c "ssh-add && $build_cmd" + +buildkite-agent annotate \ + --style "success" \ + --context 'docs-info' \ + --append \ + "
      Preview url: ${PREVIEW_URL}" + +buildkite-agent meta-data set pr_comment:doc-preview:head " * Documentation preview + - 📚 [HTML diff](${PREVIEW_URL}/diff) + - 📙 [Preview](${PREVIEW_URL})" From 113b256807e80a16a46fbdaeccfa6257a8d2cb6a Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 09:25:18 +0100 Subject: [PATCH 0681/1049] Add pre and post commit hooks --- .buildkite/hooks/post-command | 27 +++++++++++++++++++++++++++ .buildkite/hooks/pre-command | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 .buildkite/hooks/post-command create mode 100755 .buildkite/hooks/pre-command diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command new file mode 100755 index 0000000000000..acfabeb59001e --- /dev/null +++ b/.buildkite/hooks/post-command @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +set -euo pipefail + +# This hook should only be invoked for builds triggered by the Buildkite PR bot +if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then + exit 0 +fi + +gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) + +if [ -n "$BUILDKITE_COMMAND_EXIT_STATUS" ] && [ "$BUILDKITE_COMMAND_EXIT_STATUS" -eq "0" ];then + status_state="success" +else + status_state="failure" +fi + +githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" +data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build finished.","context":"buildkite/docs"}' +echo "Setting buildkite/docs commit status to ${status_state}" +curl -s -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${gitHubToken}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "${githubPublishStatus}" \ + -d "${data}" diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command new file mode 100755 index 0000000000000..b8a446faf94db --- /dev/null +++ b/.buildkite/hooks/pre-command @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +set -euo pipefail + +# Configure the git author and committer information +export GIT_AUTHOR_NAME='Buildkite CI' +export GIT_AUTHOR_EMAIL='buildkite@elastic.co' +export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME +export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL + +# The reminder of this hook should only be invoked for builds triggered by the Buildkite PR bot +if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then + exit 0 +fi + +gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) + +githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" +data='{"state":"pending","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build started.","context":"buildkite/docs"}' +echo "Setting buildkite/docs commit status to pending" +curl -s -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${gitHubToken}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "${githubPublishStatus}" \ + -d "${data}" From 126758bb4cf2d27c616badec0c3c9d689fd8a044 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 09:25:32 +0100 Subject: [PATCH 0682/1049] Remove GIT var setup from Buildkite build job They're now set in the pre-command hook --- .buildkite/scripts/build.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh index bbf0f4987cf58..ff8661c9b0646 100755 --- a/.buildkite/scripts/build.sh +++ b/.buildkite/scripts/build.sh @@ -3,13 +3,6 @@ set -euo pipefail set +x -# Configure the git author and committer information -export GIT_AUTHOR_NAME='Buildkite CI' -export GIT_AUTHOR_EMAIL='buildkite@elasticsearch-ci.elastic.co' -export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME -export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL - - build_args="" rebuild_opt="" broken_links_opt="" From da0d7229e6ee6434765e9263a2b79aa6e3e47113 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 10:53:06 +0100 Subject: [PATCH 0683/1049] Switch buildkite hooks to pipeline steps This is a more explicit approach that can be applied to the PR pipeline only and allows to run only once before/after the build, as opposed to the pre/post command hooks that run for every command. --- .buildkite/build_pr_pipeline.yml | 17 ++++++++++++++--- .../pre-command => scripts/build_pr_setup.sh} | 2 +- .../build_pr_teardown.sh} | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) rename .buildkite/{hooks/pre-command => scripts/build_pr_setup.sh} (92%) rename .buildkite/{hooks/post-command => scripts/build_pr_teardown.sh} (83%) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index 33bcaa774247b..8c617442fa284 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,7 +1,18 @@ steps: - - label: ":white_check_mark: Build docs PR" - command: | - bash .buildkite/scripts/build_pr.sh + - key: "build-pr-setup" + label: "setup" + command: .buildkite/scripts/build_pr_setup.sh + - key: "build-pr" + label: ":hammer: Build docs PR" + command: .buildkite/scripts/build_pr.sh + depends_on: + - step: build-pr-setup + allow_failure: true agents: provider: "gcp" image: family/docs-ubuntu-2204 + - command: .buildkite/scripts/build_pr_teardown.sh + label: "teardown" + depends_on: + - step: "build-pr" + allow_failure: true diff --git a/.buildkite/hooks/pre-command b/.buildkite/scripts/build_pr_setup.sh similarity index 92% rename from .buildkite/hooks/pre-command rename to .buildkite/scripts/build_pr_setup.sh index b8a446faf94db..cba08f66e0c6f 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/scripts/build_pr_setup.sh @@ -16,7 +16,7 @@ fi gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" -data='{"state":"pending","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build started.","context":"buildkite/docs"}' +data='{"state":"pending","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build started.","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' echo "Setting buildkite/docs commit status to pending" curl -s -L \ -X POST \ diff --git a/.buildkite/hooks/post-command b/.buildkite/scripts/build_pr_teardown.sh similarity index 83% rename from .buildkite/hooks/post-command rename to .buildkite/scripts/build_pr_teardown.sh index acfabeb59001e..2666ae83b2c02 100755 --- a/.buildkite/hooks/post-command +++ b/.buildkite/scripts/build_pr_teardown.sh @@ -9,14 +9,14 @@ fi gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) -if [ -n "$BUILDKITE_COMMAND_EXIT_STATUS" ] && [ "$BUILDKITE_COMMAND_EXIT_STATUS" -eq "0" ];then +if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then status_state="success" else status_state="failure" fi githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" -data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build finished.","context":"buildkite/docs"}' +data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build finished.","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' echo "Setting buildkite/docs commit status to ${status_state}" curl -s -L \ -X POST \ From 2c8b9d6e65aa17c57ef8a2abd52f59e7642ea98a Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 11:03:49 +0100 Subject: [PATCH 0684/1049] Do not fail the build on teardown failures --- .buildkite/build_pr_pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index 8c617442fa284..60b035f5a98bb 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,17 +1,17 @@ steps: - key: "build-pr-setup" label: "setup" - command: .buildkite/scripts/build_pr_setup.sh + command: ".buildkite/scripts/build_pr_setup.sh" - key: "build-pr" label: ":hammer: Build docs PR" - command: .buildkite/scripts/build_pr.sh + command: ".buildkite/scripts/build_pr.sh" depends_on: - step: build-pr-setup allow_failure: true agents: provider: "gcp" image: family/docs-ubuntu-2204 - - command: .buildkite/scripts/build_pr_teardown.sh + - command: ".buildkite/scripts/build_pr_teardown.sh || true" label: "teardown" depends_on: - step: "build-pr" From 7c915e1a4a4ca46e026a1b1ccac8f9fab08ffcc1 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 11:06:12 +0100 Subject: [PATCH 0685/1049] Revert "Remove GIT var setup from Buildkite build job" This reverts commit 126758bb4cf2d27c616badec0c3c9d689fd8a044. We no longer invoke the pre-commit hook from the pre-command --- .buildkite/scripts/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh index ff8661c9b0646..bbf0f4987cf58 100755 --- a/.buildkite/scripts/build.sh +++ b/.buildkite/scripts/build.sh @@ -3,6 +3,13 @@ set -euo pipefail set +x +# Configure the git author and committer information +export GIT_AUTHOR_NAME='Buildkite CI' +export GIT_AUTHOR_EMAIL='buildkite@elasticsearch-ci.elastic.co' +export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME +export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL + + build_args="" rebuild_opt="" broken_links_opt="" From 13fe044e107632f603dadd6fc930372b56585771 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 11:10:27 +0100 Subject: [PATCH 0686/1049] Update git committer email --- .buildkite/scripts/build.sh | 2 +- .buildkite/scripts/build_pr_setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh index bbf0f4987cf58..af3e8fb3955ea 100755 --- a/.buildkite/scripts/build.sh +++ b/.buildkite/scripts/build.sh @@ -5,7 +5,7 @@ set +x # Configure the git author and committer information export GIT_AUTHOR_NAME='Buildkite CI' -export GIT_AUTHOR_EMAIL='buildkite@elasticsearch-ci.elastic.co' +export GIT_AUTHOR_EMAIL='docs-status+buildkite@elastic.co' export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL diff --git a/.buildkite/scripts/build_pr_setup.sh b/.buildkite/scripts/build_pr_setup.sh index cba08f66e0c6f..bbbdfcb29526b 100755 --- a/.buildkite/scripts/build_pr_setup.sh +++ b/.buildkite/scripts/build_pr_setup.sh @@ -4,7 +4,7 @@ set -euo pipefail # Configure the git author and committer information export GIT_AUTHOR_NAME='Buildkite CI' -export GIT_AUTHOR_EMAIL='buildkite@elastic.co' +export GIT_AUTHOR_EMAIL='docs-status+buildkite@elastic.co' export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL From 460125a4c394c15fd82bbd533959128a2360b968 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 16 Nov 2023 11:18:23 +0100 Subject: [PATCH 0687/1049] Setup git author in build script that actually commits --- .buildkite/scripts/build_pr.sh | 6 ++++++ .buildkite/scripts/build_pr_setup.sh | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 94481dc9e615a..97736b1110b2a 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -8,6 +8,12 @@ if [ -z ${GITHUB_PR_BRANCH+set} ] || [ -z ${GITHUB_PR_TARGET_BRANCH+set} ] || [ exit 1 fi +# Configure the git author and committer information +export GIT_AUTHOR_NAME='Buildkite CI' +export GIT_AUTHOR_EMAIL='docs-status+buildkite@elastic.co' +export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME +export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL + # Set some metadata for build filtering capabilities # https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=tech-content_123 buildkite-agent meta-data set "repo_pr" "${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}" diff --git a/.buildkite/scripts/build_pr_setup.sh b/.buildkite/scripts/build_pr_setup.sh index bbbdfcb29526b..2f88f5567f953 100755 --- a/.buildkite/scripts/build_pr_setup.sh +++ b/.buildkite/scripts/build_pr_setup.sh @@ -2,12 +2,6 @@ set -euo pipefail -# Configure the git author and committer information -export GIT_AUTHOR_NAME='Buildkite CI' -export GIT_AUTHOR_EMAIL='docs-status+buildkite@elastic.co' -export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME -export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL - # The reminder of this hook should only be invoked for builds triggered by the Buildkite PR bot if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then exit 0 From a4b2ff3a5ffd5f062c76a4af9f41d9a893f80de6 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 17 Nov 2023 05:38:04 +0100 Subject: [PATCH 0688/1049] Update .buildkite/scripts/build_pr_setup.sh Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .buildkite/scripts/build_pr_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr_setup.sh b/.buildkite/scripts/build_pr_setup.sh index 2f88f5567f953..0d43cbab192e8 100755 --- a/.buildkite/scripts/build_pr_setup.sh +++ b/.buildkite/scripts/build_pr_setup.sh @@ -2,7 +2,7 @@ set -euo pipefail -# The reminder of this hook should only be invoked for builds triggered by the Buildkite PR bot +# The remainder of this hook should only be invoked for builds triggered by the Buildkite PR bot if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then exit 0 fi From bbde3c8a33ba9113d9fde2595bf057529668ebec Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 17 Nov 2023 07:15:13 +0100 Subject: [PATCH 0689/1049] Combine setup/teardown into one script --- .buildkite/build_pr_pipeline.yml | 11 +++++++--- ..._teardown.sh => build_pr_commit_status.sh} | 22 +++++++++++++------ .buildkite/scripts/build_pr_setup.sh | 21 ------------------ 3 files changed, 23 insertions(+), 31 deletions(-) rename .buildkite/scripts/{build_pr_teardown.sh => build_pr_commit_status.sh} (70%) delete mode 100755 .buildkite/scripts/build_pr_setup.sh diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index 60b035f5a98bb..b3fcbe1ece865 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,7 +1,7 @@ steps: - key: "build-pr-setup" label: "setup" - command: ".buildkite/scripts/build_pr_setup.sh" + command: ".buildkite/scripts/build_pr_commit_status.sh pending" - key: "build-pr" label: ":hammer: Build docs PR" command: ".buildkite/scripts/build_pr.sh" @@ -11,8 +11,13 @@ steps: agents: provider: "gcp" image: family/docs-ubuntu-2204 - - command: ".buildkite/scripts/build_pr_teardown.sh || true" + - key: "teardown" label: "teardown" + command: | + if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then + .buildkite/scripts/build_pr_commit_status.sh success + else + .buildkite/scripts/build_pr_commit_status.sh failure + fi depends_on: - step: "build-pr" - allow_failure: true diff --git a/.buildkite/scripts/build_pr_teardown.sh b/.buildkite/scripts/build_pr_commit_status.sh similarity index 70% rename from .buildkite/scripts/build_pr_teardown.sh rename to .buildkite/scripts/build_pr_commit_status.sh index 2666ae83b2c02..921d267ea0642 100755 --- a/.buildkite/scripts/build_pr_teardown.sh +++ b/.buildkite/scripts/build_pr_commit_status.sh @@ -7,16 +7,24 @@ if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHU exit 0 fi -gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) +status_state=$1 +description='' -if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then - status_state="success" -else - status_state="failure" -fi +case $status_state in + pending) + description='Build started';; + success|failure|error) + description='Build finished';; + *) + echo "Invalid state $status_state" + exit 1;; +esac + +gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" -data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build finished.","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' +data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"'$description'","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' + echo "Setting buildkite/docs commit status to ${status_state}" curl -s -L \ -X POST \ diff --git a/.buildkite/scripts/build_pr_setup.sh b/.buildkite/scripts/build_pr_setup.sh deleted file mode 100755 index 0d43cbab192e8..0000000000000 --- a/.buildkite/scripts/build_pr_setup.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# The remainder of this hook should only be invoked for builds triggered by the Buildkite PR bot -if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then - exit 0 -fi - -gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) - -githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" -data='{"state":"pending","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build started.","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' -echo "Setting buildkite/docs commit status to pending" -curl -s -L \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${gitHubToken}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "${githubPublishStatus}" \ - -d "${data}" From 3515da7530bea81cfe0b195b4fce0c31c63b7c8a Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 17 Nov 2023 07:17:23 +0100 Subject: [PATCH 0690/1049] Better secrets handling Secrets should be defined in pre-command hooks to benefit from redaction See https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables --- .buildkite/hooks/pre-command | 29 ++++++++++++++++++++ .buildkite/scripts/build_pr_commit_status.sh | 4 +-- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100755 .buildkite/hooks/pre-command diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command new file mode 100755 index 0000000000000..640aeb9ab5937 --- /dev/null +++ b/.buildkite/hooks/pre-command @@ -0,0 +1,29 @@ +#!/bin/bash + +set -euo pipefail + +function retry { + local retries=$1 + shift + + local count=0 + until "$@"; do + exit=$? + wait=$((2 ** count)) + count=$((count + 1)) + if [ $count -lt "$retries" ]; then + >&2 echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." + sleep $wait + else + >&2 echo "Retry $count/$retries exited $exit, no more retries left." + return $exit + fi + done + return 0 +} + +# Secrets must be redacted +# https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables +if [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-pr" ]];then + export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner) +fi diff --git a/.buildkite/scripts/build_pr_commit_status.sh b/.buildkite/scripts/build_pr_commit_status.sh index 921d267ea0642..31575d4f345a8 100755 --- a/.buildkite/scripts/build_pr_commit_status.sh +++ b/.buildkite/scripts/build_pr_commit_status.sh @@ -20,8 +20,6 @@ case $status_state in exit 1;; esac -gitHubToken=$(vault read -field=value secret/ci/elastic-docs/docs_preview_cleaner) - githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"'$description'","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' @@ -29,7 +27,7 @@ echo "Setting buildkite/docs commit status to ${status_state}" curl -s -L \ -X POST \ -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${gitHubToken}" \ + -H "Authorization: Bearer ${GITHUB_TOKEN}" \ -H "X-GitHub-Api-Version: 2022-11-28" \ "${githubPublishStatus}" \ -d "${data}" From 03a384e7bd0e67d874b2e402e1ab86edcb4ee940 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 17 Nov 2023 07:28:42 +0100 Subject: [PATCH 0691/1049] Add metadata for the repo as well --- .buildkite/scripts/build_pr.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 97736b1110b2a..45fd88fd4614b 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -15,7 +15,9 @@ export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL # Set some metadata for build filtering capabilities +# https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo]=tech-content # https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=tech-content_123 +buildkite-agent meta-data set "repo" "${GITHUB_PR_BASE_REPO}" buildkite-agent meta-data set "repo_pr" "${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}" rebuild_opt="" From 576fcc691b5f3c4e8c0de7c3426d3678f30bd851 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Fri, 17 Nov 2023 07:29:39 +0100 Subject: [PATCH 0692/1049] Fix spacing --- .buildkite/scripts/build_pr.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 45fd88fd4614b..e0dc5131e47f3 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -62,10 +62,10 @@ else # We don't have to do anything else in this case. # Per https://github.com/elastic/docs/issues/1821, always rebuild all - # books for PRs to the docs repo, for now. - # When https://github.com/elastic/docs/issues/1823 is fixed, this - # should be removed and the original behavior restored. - rebuild_opt=" --rebuild" + # books for PRs to the docs repo, for now. + # When https://github.com/elastic/docs/issues/1823 is fixed, this + # should be removed and the original behavior restored. + rebuild_opt=" --rebuild" fi @@ -74,13 +74,13 @@ TARGET_BRANCH="${GITHUB_PR_BASE_REPO}_bk_${GITHUB_PR_NUMBER}" PREVIEW_URL="https://${TARGET_BRANCH}.docs-preview.app.elstc.co" build_cmd="./build_docs --all --keep_hash \ - --target_repo git@github.com:elastic/built-docs \ - --reference /opt/git-mirrors/ \ - --target_branch ${TARGET_BRANCH} \ - --push \ - --announce_preview ${PREVIEW_URL}/diff \ - ${rebuild_opt} \ - ${build_args}" + --target_repo git@github.com:elastic/built-docs \ + --reference /opt/git-mirrors/ \ + --target_branch ${TARGET_BRANCH} \ + --push \ + --announce_preview ${PREVIEW_URL}/diff \ + ${rebuild_opt} \ + ${build_args}" echo "The following build command will be used" echo $build_cmd @@ -89,10 +89,10 @@ echo $build_cmd ssh-agent bash -c "ssh-add && $build_cmd" buildkite-agent annotate \ - --style "success" \ - --context 'docs-info' \ - --append \ - "
      Preview url: ${PREVIEW_URL}" + --style "success" \ + --context 'docs-info' \ + --append \ + "
      Preview url: ${PREVIEW_URL}" buildkite-agent meta-data set pr_comment:doc-preview:head " * Documentation preview - 📚 [HTML diff](${PREVIEW_URL}/diff) From 68954f7244652c7202fc2d3aa74a8d082e5ca735 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Tue, 21 Nov 2023 06:45:27 +0100 Subject: [PATCH 0693/1049] Update .buildkite/scripts/build_pr_commit_status.sh Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .buildkite/scripts/build_pr_commit_status.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr_commit_status.sh b/.buildkite/scripts/build_pr_commit_status.sh index 31575d4f345a8..d39ce172603d3 100755 --- a/.buildkite/scripts/build_pr_commit_status.sh +++ b/.buildkite/scripts/build_pr_commit_status.sh @@ -23,7 +23,7 @@ esac githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"'$description'","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' -echo "Setting buildkite/docs commit status to ${status_state}" +echo "Setting buildkite/${BUILDKITE_PIPELINE_SLUG} commit status to ${status_state}" curl -s -L \ -X POST \ -H "Accept: application/vnd.github+json" \ From e238642b5c613c5ffeaebc9dc0d0b87c46ae273a Mon Sep 17 00:00:00 2001 From: scottybollinger Date: Tue, 21 Nov 2023 10:18:55 -0600 Subject: [PATCH 0694/1049] Add feedback widget to right sidebar --- .../docs_js/components/feedback_widget.jsx | 94 ++++++++++++++ resources/web/docs_js/index.js | 6 + resources/web/style/feedback.pcss | 121 ++++++++++++++++++ resources/web/styles.pcss | 1 + resources/web/template.html | 3 + 5 files changed, 225 insertions(+) create mode 100644 resources/web/docs_js/components/feedback_widget.jsx create mode 100644 resources/web/style/feedback.pcss diff --git a/resources/web/docs_js/components/feedback_widget.jsx b/resources/web/docs_js/components/feedback_widget.jsx new file mode 100644 index 0000000000000..a8a3a0bc67de0 --- /dev/null +++ b/resources/web/docs_js/components/feedback_widget.jsx @@ -0,0 +1,94 @@ +import { h, Component } from '../../../../../../node_modules/preact'; + +export default class FeedbackWidget extends Component { + render() { + return ( +
      +
      + Was this helpful? + +
      + Feedback +
      + + +
      +
      +
      +
      + Thank you for your feedback. +
      +
      + ); + } +} diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index.js index 61bccada25e17..d6f13fbcf7003 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index.js @@ -1,5 +1,6 @@ import AlternativeSwitcher from "./components/alternative_switcher"; import ConsoleWidget from "./components/console_widget"; +import FeedbackWidget from './components/feedback_widget'; import Modal from "./components/modal"; import mount from "./components/mount"; import {switchTabs} from "./components/tabbed_widget"; @@ -89,6 +90,10 @@ export function init_console_widgets() { }); } +export function init_feedback_widget() { + mount($('#feedbackWidgetContainer'), FeedbackWidget); +} + export function init_sense_widgets() { $('div.sense_widget').each(function() { const div = $(this), @@ -365,6 +370,7 @@ $(function() { init_sense_widgets(); init_console_widgets(); init_kibana_widgets(); + init_feedback_widget(); $("div.ess_widget").each(function() { const div = $(this), snippet = div.attr('data-snippet'), diff --git a/resources/web/style/feedback.pcss b/resources/web/style/feedback.pcss new file mode 100644 index 0000000000000..cd314ea30fd2a --- /dev/null +++ b/resources/web/style/feedback.pcss @@ -0,0 +1,121 @@ +#feedbackWidget { + font-size: 14px; + display: flex; + line-height: 16px; + margin: 0 12px; + padding-top: 20px; + align-items: center; + justify-content: space-between; + max-width: 200px; + border-top: 1px solid rgb(211, 218, 230); + + .docHorizontalSpacer { + display: inline-block; + width: 12px; + } + + .screenReaderOnly { + position: absolute; + inset-block-start: auto; + inset-inline-start: -10000px; + inline-size: 1px; + block-size: 1px; + clip: rect(0px, 0px, 0px, 0px); + clip-path: inset(50%); + overflow: hidden; + margin: -1px; + } + + .buttonGroup { + max-inline-size: 100%; + display: flex; + border-radius: 4px; + } + + .feedbackButton { + -webkit-font-smoothing: antialiased; + box-sizing: border-box; + background: none; + border: none; + padding: 0; + margin: 0; + font-family: 'Inter',BlinkMacSystemFont,Helvetica,Arial,sans-serif; + display: inline-block; + appearance: none; + cursor: pointer; + white-space: nowrap; + max-inline-size: 100%; + vertical-align: middle; + font-weight: 500; + padding-block: 0px; + block-size: 32px; + font-size: 14px; + line-height: 20px; + min-inline-size: 0px; + flex-shrink: 1; + -webkit-box-flex: 0; + flex-grow: 0; + padding-inline: 8px; + border-radius: 0px; + color: rgb(52, 55, 65); + background-color: rgb(233, 237, 243); + transition: background-color 250ms ease-in-out 0s, color 250ms ease-in-out 0s; + border-start-start-radius: 4px; + border-start-end-radius: 0px; + border-end-end-radius: 0px; + border-end-start-radius: 4px; + + &:last-child { + border-start-start-radius: 0px; + border-start-end-radius: 4px; + border-end-end-radius: 4px; + border-end-start-radius: 0px; + box-shadow: rgba(0, 0, 0, 0.1) -1px 0px 0px 0px; + } + + .feedbackButtonContent { + block-size: 100%; + inline-size: 100%; + display: flex; + -webkit-box-pack: center; + justify-content: center; + -webkit-box-align: center; + align-items: center; + vertical-align: middle; + gap: 8px; + } + + .feedbackIcon { + -webkit-flex-shrink: 0; + -ms-flex-negative: 0; + flex-shrink: 0; + display: inline-block; + vertical-align: middle; + fill: currentColor; + -webkit-transform: translate(0, 0); + -moz-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); + inline-size: 16px; + block-size: 16px; + color: inherit; + + &.pressed { + display: none; + } + } + + &.isPressed { + color: rgb(255, 255, 255); + background-color: rgb(105, 112, 125); + outline-color: rgb(0, 0, 0); + .feedbackIcon.unpressed { + display: none; + } + .feedbackIcon.pressed { + display: inline-block; + } + } + } + +} diff --git a/resources/web/styles.pcss b/resources/web/styles.pcss index 0a8cb2281ce24..0a1c72bd0f7cc 100644 --- a/resources/web/styles.pcss +++ b/resources/web/styles.pcss @@ -14,6 +14,7 @@ @import './style/console_widget.pcss'; @import './style/docbook.pcss'; @import './style/example.pcss'; +@import './style/feedback.pcss'; @import './style/heading.pcss'; @import './style/img.pcss'; @import './style/layout.pcss'; diff --git a/resources/web/template.html b/resources/web/template.html index 6538cd4fe8f78..315e98c4e78f5 100644 --- a/resources/web/template.html +++ b/resources/web/template.html @@ -118,6 +118,9 @@

    + + +
    From 4097c83d353f5863677d5bf9086eb5b79b9d3361 Mon Sep 17 00:00:00 2001 From: scottybollinger Date: Tue, 21 Nov 2023 10:22:36 -0600 Subject: [PATCH 0695/1049] Add feedback modal to end of body --- .../web/docs_js/components/feedback_modal.jsx | 233 +++++++++++ resources/web/docs_js/index.js | 10 +- resources/web/style/feedback.pcss | 381 ++++++++++++++++++ resources/web/template.html | 15 +- 4 files changed, 631 insertions(+), 8 deletions(-) create mode 100644 resources/web/docs_js/components/feedback_modal.jsx diff --git a/resources/web/docs_js/components/feedback_modal.jsx b/resources/web/docs_js/components/feedback_modal.jsx new file mode 100644 index 0000000000000..e64448e7adb98 --- /dev/null +++ b/resources/web/docs_js/components/feedback_modal.jsx @@ -0,0 +1,233 @@ +import { h, Component } from '../../../../../../node_modules/preact'; + +const FEEDBACK_URL = 'https://docs.elastic.co/api/feedback' +const MAX_COMMENT_LENGTH = 1000; + +export default class FeedbackModal extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + modalClosed: false, + isLoading: false, + hasError: false, + }; + this.onEscape = this.onEscape.bind(this); + this.resetState = this.resetState.bind(this); + this.submitFeedback = this.submitFeedback.bind(this); + } + + onEscape(event) { + if (event.key === 'Escape') { + this.resetState(); + } + } + + resetState() { + this.setState({ modalClosed: true }); + document.querySelectorAll('.isPressed').forEach((el) => { + el.classList.remove('isPressed'); + }); + } + + submitFeedback() { + this.setState({ isLoading: true }); + fetch(FEEDBACK_URL, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + comment: this.state.comment, + feedback: this.props.isLiked ? 'liked' : 'disliked', + }), + }) + .then((response) => response.json()) + .then(() => { + this.setState({ modalClosed: true }) + document.getElementById('feedbackSuccess').classList.remove('hidden') + document.querySelectorAll('.feedbackButton').forEach((el) => { + el.disabled = true + }) + }) + .catch((error) => { + this.setState({ isLoading: false, hasError: true }); + console.error('Error:', error); + }); + + } + + componentDidMount() { + document.addEventListener('keydown', this.onEscape, false); + } + + componentWillUnmount() { + document.removeEventListener('keydown', this.onEscape, false); + } + + render(props, state) { + const { isLiked } = props; + const { modalClosed, isLoading, hasError, comment } = state; + const maxCommentLengthReached = comment.length > MAX_COMMENT_LENGTH; + const sendDisabled = isLoading || maxCommentLengthReached; + + if (modalClosed) { + return null; + } + + return ( +
    +
    +
    +
    + +
    +

    Send us your feedback

    +
    +
    +
    +
    + Thank you for helping us improve Elastic documentation. +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + {maxCommentLengthReached && ( +
    + Max comment length of {MAX_COMMENT_LENGTH}{' '} + characters reached. +
    +
    + Character count: {comment.length} +
    + )} + {hasError && ( +
    + There was a problem submitting your feedback. +
    +
    + Please try again. +
    + )} +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + ); + } +} diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index.js index d6f13fbcf7003..08ceb615dd970 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index.js @@ -1,5 +1,6 @@ import AlternativeSwitcher from "./components/alternative_switcher"; import ConsoleWidget from "./components/console_widget"; +import FeedbackModal from './components/feedback_modal'; import FeedbackWidget from './components/feedback_widget'; import Modal from "./components/modal"; import mount from "./components/mount"; @@ -92,6 +93,11 @@ export function init_console_widgets() { export function init_feedback_widget() { mount($('#feedbackWidgetContainer'), FeedbackWidget); + $('.feedbackButton').click(function () { + const isLiked = $(this).hasClass('feedbackLiked'); + $(this).addClass('isPressed'); + mount($('#feedbackModalContainer'), FeedbackModal, { isLiked: isLiked }); + }); } export function init_sense_widgets() { @@ -337,8 +343,8 @@ $(function() { } }) // Bold the item in the popover that represents - // the current book - const currentBookTitle = dropDownAnchor.text() + // the current book + const currentBookTitle = dropDownAnchor.text() const items = dropDownContent.find("li") items.each(function(i) { if (items[i].innerText === currentBookTitle) { diff --git a/resources/web/style/feedback.pcss b/resources/web/style/feedback.pcss index cd314ea30fd2a..1e4dadaf263a3 100644 --- a/resources/web/style/feedback.pcss +++ b/resources/web/style/feedback.pcss @@ -119,3 +119,384 @@ } } + +@keyframes animation-modal { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} +@keyframes animation-loading { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(359deg); + } +} + +#feedbackModal { + position: fixed; + inset-block: 0px; + inset-inline: 0px; + display: flex; + -webkit-box-align: center; + align-items: center; + -webkit-box-pack: center; + justify-content: center; + padding-block-end: 10vh; + animation: 150ms ease-in 0s 1 normal none running animation-modal; + background: rgba(0, 0, 0, 0.5); + z-index: 6000; + + .feedbackModalContent { + font-family: Inter, Arial, sans-serif; + font-size: 14px; + line-height: 22.75px; + -webkit-font-smoothing: antialiased; + --removed-body-scroll-bar-size: 16px; + box-sizing: border-box; + margin: 0; + padding: 0; + border: none; + vertical-align: baseline; + box-shadow: rgba(0, 0, 0, 0.13) 0px 2.7px 9px, rgba(0, 0, 0, 0.09) 0px 9.4px 24px, rgba(0, 0, 0, 0.08) 0px 21.8px 43px; + display: flex; + flex-direction: column; + max-block-size: 75vh; + position: relative; + background-color: rgb(255, 255, 255); + border-radius: 6px; + z-index: 8000; + min-inline-size: 475px; + max-inline-size: 768px; + animation: 350ms cubic-bezier(0.34, 1.61, 0.7, 1) 0s 1 normal none running animation-5jmqj1; + + .closeIcon { + transition: transform 250ms ease-in-out 0s, background-color 250ms ease-in-out 0s; + appearance: none; + cursor: pointer; + white-space: nowrap; + max-inline-size: 100%; + vertical-align: middle; + display: inline-flex; + -webkit-box-align: center; + align-items: center; + justify-content: space-around; + inline-size: 24px; + block-size: 24px; + border-radius: 4px; + color: rgb(52, 55, 65); + position: absolute; + inset-inline-end: 4px; + inset-block-start: 4px; + z-index: 3; + border-width: 0px; + background-color: transparent; + right: 2px; + + > svg { + -webkit-flex-shrink: 0; + -ms-flex-negative: 0; + flex-shrink: 0; + display: inline-block; + vertical-align: middle; + fill: currentColor; + -webkit-transform: translate(0, 0); + -moz-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); + inline-size: 16px; + block-size: 16px; + color: inherit; + } + } + + .feedbackModalHeader { + display: flex; + -webkit-box-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + align-items: center; + -webkit-box-flex: 0; + flex-grow: 0; + flex-shrink: 0; + padding: 24px; + padding-inline: 24px 40px; + + h2 { + font-size: 24px; + line-height: 28px; + margin: 0px; + padding: 0px; + color: rgb(52, 55, 65); + } + } + + .feedbackModalBody { + -webkit-box-flex: 1; + flex-grow: 1; + overflow: hidden; + display: flex; + flex-direction: column; + font-size: 16px; + line-height: 24px; + color: rgb(52, 55, 65); + + .feedbackModalBodyOverflow { + block-size: 100%; + overflow: hidden auto; + padding-inline: 24px; + padding-block: 8px; + } + + .spacer { + -webkit-flex-shrink: 0; + -ms-flex-negative: 0; + flex-shrink: 0; + block-size: 24px; + } + } + + .feedbackModalFooter { + display: flex; + -webkit-box-pack: end; + justify-content: flex-end; + padding: 24px; + padding-inline: 24px; + -webkit-box-flex: 0; + flex-grow: 0; + flex-shrink: 0; + gap: 16px; + + &.loading { + .feedbackButton { + color: rgb(162, 171, 186); + &.sendButton { + background-color: rgba(0, 119, 204, 0.1); + } + + .feedbackButtonContent { + display: none; + } + } + + .loadingContent { + display: inline-block; + } + } + + .feedbackButton { + display: inline-block; + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + appearance: none; + cursor: pointer; + white-space: nowrap; + max-inline-size: 100%; + vertical-align: middle; + font-weight: 500; + block-size: 40px; + font-size: 14px; + line-height: 1.4286rem; + border-radius: 6px; + border-width: 0; + color: rgb(0, 97, 166); + background-color: rgb(204, 228, 245); + + &:hover { + text-decoration: underline; + } + + .feedbackButtonContent { + block-size: 100%; + inline-size: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + vertical-align: middle; + gap: 8px; + } + } + + .cancelButton { + transition-timing-function: ease-in; + transition-duration: 150ms; + display: inline-block; + padding-inline: 8px; + block-size: 40px; + line-height: 40px; + border-radius: 6px; + background-color: transparent; + color: #0061a6; + } + + .sendButton { + padding: 0px; + padding-inline: 12px; + line-height: 20px; + min-inline-size: 112px; + transition: transform 250ms ease-in-out 0s, background-color 250ms ease-in-out 0s; + + &:hover { + transform: translateY(-1px); + } + + .sendIcon { + -webkit-flex-shrink: 0; + -ms-flex-negative: 0; + flex-shrink: 0; + display: inline-block; + vertical-align: middle; + fill: currentColor; + -webkit-transform: translate(0, 0); + -moz-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); + inline-size: 16px; + block-size: 16px; + color: inherit; + + &.dislike { + display: none; + } + } + + &.dislike { + .sendIcon.like { + display: none; + } + .sendIcon.dislike { + display: inline-block; + } + } + + &.like { + .sendIcon.like { + display: inline-block; + } + } + + } + + .loadingContent { + display: none; + } + + .loadingSpinner { + animation: 0.6s linear 0s infinite normal none running animation-loading; + flex-shrink: 0; + display: inline-block; + border-radius: 50%; + border: 1.5px solid rgb(211, 218, 230); + border-block-color: rgb(1, 81, 137) rgb(211, 218, 230); + border-inline-color: rgb(211, 218, 230); + inline-size: 16px; + block-size: 16px; + position: relative; + left: -5px; + top: 2px; + } + } + + + } + + .feedbackFormRow { + display: -webkit-flex; + display: flex; + -webkit-flex-direction: column; + flex-direction: column; + max-width: 400px; + + .feedbackFormRow__labelWrapper { + display: -webkit-flex; + display: flex; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-justify-content: space-between; + justify-content: space-between; + margin-bottom: 4px; + + .feedbackFormLabel { + cursor: pointer; + overflow-wrap: break-word!important; + word-break: break-word; + color: #1a1c21; + font-weight: 600; + display: inline-block; + transition: all .15s cubic-bezier(.694,.0482,.335,1); + font-size: 12px; + line-height: 16px; + margin-bottom: 0; + } + } + + .feedbackFormControlLayout { + height: auto; + max-width: 400px; + width: 100%; + + .feedbackFormControlLayout__childrenWrapper { + position: relative; + } + + .feedbackTextArea { + resize: vertical; + height: auto; + max-width: 400px; + width: 100%; + /* height: 40px; */ + background-color: #fbfcfd; + background-repeat: no-repeat; + background-size: 0 100%; + box-shadow: 0 0 transparent, inset 0 0 0 1px rgba(17,42,134,.1); + transition: box-shadow .15s ease-in,background-image .15s ease-in,background-size .15s ease-in,background-color .15s ease-in; + font-family: Inter UI,-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; + font-weight: 400; + letter-spacing: normal; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + -webkit-font-kerning: normal; + font-kerning: normal; + font-size: 14px; + color: #343741; + border: none; + border-radius: 6px; + padding: 12px; + line-height: 1.5; + } + } + + .feedbackFormError { + padding: 16px; + background-color: #f8e9e9; + font-size: 14px; + } + } +} + +#feedbackSuccess { + margin: 12px; + font-size: 14px; + padding: 16px; + background-color: #e6f1fa; + + &.hidden { + display: none; + } +} diff --git a/resources/web/template.html b/resources/web/template.html index 315e98c4e78f5..b8139af5440f1 100644 --- a/resources/web/template.html +++ b/resources/web/template.html @@ -132,15 +132,18 @@ - - - + + + - - - + +
    + + + + From eadf49ce65b2edd50d52650182136bc968f6a05e Mon Sep 17 00:00:00 2001 From: scottybollinger Date: Tue, 21 Nov 2023 12:37:49 -0600 Subject: [PATCH 0696/1049] Add URL to feedback payload --- resources/web/docs_js/components/feedback_modal.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/web/docs_js/components/feedback_modal.jsx b/resources/web/docs_js/components/feedback_modal.jsx index e64448e7adb98..c47e88699a469 100644 --- a/resources/web/docs_js/components/feedback_modal.jsx +++ b/resources/web/docs_js/components/feedback_modal.jsx @@ -40,6 +40,7 @@ export default class FeedbackModal extends Component { body: JSON.stringify({ comment: this.state.comment, feedback: this.props.isLiked ? 'liked' : 'disliked', + url: window.location.href, }), }) .then((response) => response.json()) From 4c807268edc854fb6d023cadecdf783a837743b4 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Mon, 27 Nov 2023 17:28:30 +0100 Subject: [PATCH 0697/1049] Use bigger CI machine for docs repo (#2840) * Use bigger CI machine for docs repo We always do a full rebuild on `elastic/docs` which takes up to 2 hours with the standard n1-standard-4 CI machine. This PR introduces an optimization only for builds on elastic/docs to use n2-standard-32 to drop the build time to about 1 hour. For any other builds, we'll use n2-standard-4 and tolerate the <20 min build time for docs given the price difference (10x cheaper). * Set default machine type --- .buildkite/build_pr_pipeline.yml | 1 + .buildkite/hooks/pre-command | 7 +++++++ .buildkite/scripts/build_pr.sh | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index b3fcbe1ece865..99aa0461e7c1f 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -11,6 +11,7 @@ steps: agents: provider: "gcp" image: family/docs-ubuntu-2204 + machineType: ${BUILD_PR_MACHINE_TYPE} - key: "teardown" label: "teardown" command: | diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 640aeb9ab5937..e25c0315d093a 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -22,8 +22,15 @@ function retry { return 0 } +export BUILD_PR_MACHINE_TYPE="n2-standard-4" + # Secrets must be redacted # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables if [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-pr" ]];then export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner) + + if [[ ${GITHUB_PR_BASE_REPO:="unset"} == "docs" ]]; then + # Docs PR require a full rebuild - so let's boost the builds so they don't take 2 hours + export BUILD_PR_MACHINE_TYPE="n2-highcpu-32" + fi fi diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index e0dc5131e47f3..526332ee1a120 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -65,7 +65,7 @@ else # books for PRs to the docs repo, for now. # When https://github.com/elastic/docs/issues/1823 is fixed, this # should be removed and the original behavior restored. - rebuild_opt=" --rebuild" + rebuild_opt=" --rebuild --procs 16" fi From 39c83fd09b59712760dd4b8933c13467740cfae0 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Tue, 28 Nov 2023 21:06:03 +0100 Subject: [PATCH 0698/1049] Set Buildkite PR job to use master and add batch1 of repos (#2837) * Set Buildkite PR job to use master and add batch1 of repos * Disable PR bot commenting --- .buildkite/pull-requests.org-wide.json | 11 +++++++++-- catalog-info.yaml | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index d3dc8e6ace90c..5511105ec255a 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -3,7 +3,7 @@ { "enabled": true, "pipeline_slug": "docs-build-pr", - "always_trigger_branch": "buildkite-webhook-rebuild-136", + "always_trigger_branch": "master", "allow_org_users": true, "allowed_repo_permissions": [ "admin", @@ -19,14 +19,17 @@ "skip_ci_on_only_changed": [], "always_require_ci_on_changed": [], "repositories": [ + "elastic/elasticsearch", + "elastic/kibana", "elastic/tech-content", + "elastic/beats", "elastic/observability-docs" ] }, { "enabled": true, "pipeline_slug": "docs-build-pr", - "always_trigger_branch": "buildkite-webhook-rebuild-136", + "always_trigger_branch": "master", "allow_org_users": true, "allowed_repo_permissions": [ "admin", @@ -46,6 +49,10 @@ "docs\\.*" ], "repositories": [ + "elastic/security-docs", + "elastic/elasticsearch-py", + "elastic/cloud-on-k8s", + "elastic/ingest-docs", "elastic/x-pack" ] }, diff --git a/catalog-info.yaml b/catalog-info.yaml index ccedca1d2c934..5d3af7f6c200e 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -77,8 +77,6 @@ spec: access_level: BUILD_AND_READ everyone: access_level: READ_ONLY - env: - ELASTIC_PR_COMMENTS_ENABLED: 'true' # Declare daily preview cleaner --- From be5f39046bf244a7b93b3108e66cdd6c1d79ba54 Mon Sep 17 00:00:00 2001 From: lcawl Date: Tue, 28 Nov 2023 16:24:38 -0800 Subject: [PATCH 0699/1049] Bump the docs to version 8.11.2 --- shared/versions/stack/8.11.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc index be7d0714e7008..c45b32cc319f3 100644 --- a/shared/versions/stack/8.11.asciidoc +++ b/shared/versions/stack/8.11.asciidoc @@ -1,12 +1,12 @@ -:version: 8.11.1 +:version: 8.11.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.11.1 -:logstash_version: 8.11.1 -:elasticsearch_version: 8.11.1 -:kibana_version: 8.11.1 -:apm_server_version: 8.11.1 +:bare_version: 8.11.2 +:logstash_version: 8.11.2 +:elasticsearch_version: 8.11.2 +:kibana_version: 8.11.2 +:apm_server_version: 8.11.2 :branch: 8.11 :minor-version: 8.11 :major-version: 8.x From 62a7232e0ea45a8efc6f772875fcf4e921e23086 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Wed, 29 Nov 2023 20:17:05 +0100 Subject: [PATCH 0700/1049] Use proper env variables for posting the commit status on product repos (#2842) --- .buildkite/scripts/build_pr_commit_status.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/build_pr_commit_status.sh b/.buildkite/scripts/build_pr_commit_status.sh index d39ce172603d3..40ab0c4d2bacc 100755 --- a/.buildkite/scripts/build_pr_commit_status.sh +++ b/.buildkite/scripts/build_pr_commit_status.sh @@ -3,7 +3,7 @@ set -euo pipefail # This hook should only be invoked for builds triggered by the Buildkite PR bot -if [ -z ${GITHUB_PR_OWNER+set} ] || [ -z ${GITHUB_PR_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then +if [ -z ${GITHUB_PR_BASE_OWNER+set} ] || [ -z ${GITHUB_PR_BASE_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then exit 0 fi @@ -20,10 +20,10 @@ case $status_state in exit 1;; esac -githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" +githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_BASE_OWNER}/${GITHUB_PR_BASE_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"'$description'","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' -echo "Setting buildkite/${BUILDKITE_PIPELINE_SLUG} commit status to ${status_state}" +echo "Setting commit status: buildkite/${BUILDKITE_PIPELINE_SLUG} - ${status_state}" curl -s -L \ -X POST \ -H "Accept: application/vnd.github+json" \ From cadc9520a809e88fb6496889ef1757f44e9a7ec5 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 30 Nov 2023 09:13:57 +0100 Subject: [PATCH 0701/1049] Add a shared GH action for docs preview (#2843) * Add a shared GH action for docs preview * Rename Guide into Preview * Update .github/actions/docs-preview/action.yml Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> * Rename guide-crumb into preview-path * Rename doc preview * Remove preview-path for doc changes --------- Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- .github/actions/docs-preview/README.md | 49 +++++++++++++++++++++++++ .github/actions/docs-preview/action.yml | 42 +++++++++++++++++++++ .github/workflows/doc-preview.yml | 32 ++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 .github/actions/docs-preview/README.md create mode 100644 .github/actions/docs-preview/action.yml create mode 100644 .github/workflows/doc-preview.yml diff --git a/.github/actions/docs-preview/README.md b/.github/actions/docs-preview/README.md new file mode 100644 index 0000000000000..e6d6373f0601b --- /dev/null +++ b/.github/actions/docs-preview/README.md @@ -0,0 +1,49 @@ +## About + +GitHub Action to create a GitHub comment with the docs-preview + +* [Usage](#usage) + * [Configuration](#configuration) +* [Customizing](#customizing) + * [inputs](#inputs) + +## Usage + +### Configuration + +Given the CI GitHub action: + +```yaml +--- +on: + pull_request_target: + types: [opened] + +permissions: + pull-requests: write + +jobs: + doc-preview: + runs-on: ubuntu-latest + steps: + - uses: elastic/docs/.github/actions/docs-preview@current + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repo: ${{ github.event.repository.name }} + preview-path: 'guide/en/observability/master/index.html' + pr: ${{ github.event.pull_request.number }} + +``` + +## Customizing + +### inputs + +Following inputs can be used as `step.with` keys + +| Name | Type | Description | +|-------------------|---------|------------------------------------------------| +| `preview-path` | String | Path to append to base doc url in preview link | +| `repo` | String | The GitHub repository name without org | +| `github-token` | String | The GitHub token | +| `pr` | String | The GitHub PR number | diff --git a/.github/actions/docs-preview/action.yml b/.github/actions/docs-preview/action.yml new file mode 100644 index 0000000000000..c12625c5980de --- /dev/null +++ b/.github/actions/docs-preview/action.yml @@ -0,0 +1,42 @@ +name: 'docs-preview' +description: 'Add docs-preview comment in the given repository.' +inputs: + repo: + description: 'the name of the repository' + required: true + pr: + description: 'the pull-request' + required: true + github-token: + description: 'The GitHub access token.' + required: true + preview-path: + description: 'Path to append to base doc url in preview link' + required: false + default: '' +runs: + using: "composite" + steps: + - uses: actions/github-script@v7 + env: + REPO: ${{ inputs.repo }} + PR: ${{ inputs.pr }} + PREVIEW_PATH: ${{ inputs.preview-path }} + with: + github-token: ${{ inputs.github-token }} + script: | + const { REPO, PR, PREVIEW_PATH } = process.env + + const comment = `A documentation preview will be available soon. + Help us out by validating the Buildkite preview and reporting issues [here](https://github.com/elastic/docs/issues/new?labels=buildkite-migration,bug). + + - 📚 HTML diff: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/diff) + - 📙 Preview: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) + - 🧪 [Buildkite vs Jenkins diff](https://github.com/elastic/built-docs/compare/${REPO}_bk_${PR}..${REPO}_${PR})`; + + github.rest.issues.createComment({ + issue_number: PR, + owner: 'elastic', + repo: REPO, + body: comment, + }); diff --git a/.github/workflows/doc-preview.yml b/.github/workflows/doc-preview.yml new file mode 100644 index 0000000000000..6f5d3ba9ab1e5 --- /dev/null +++ b/.github/workflows/doc-preview.yml @@ -0,0 +1,32 @@ +--- +name: test-docs-preview + +on: + workflow_dispatch: + pull_request_target: + types: [opened] + +permissions: + pull-requests: write + +jobs: + doc-preview-pr: + if: github.event_name == 'pull_request_target' + runs-on: ubuntu-latest + steps: + - uses: elastic/docs/.github/actions/docs-preview@main + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repo: ${{ github.event.repository.name }} + pr: ${{ github.event.pull_request.number }} + + doc-preview-manual: + if: github.event_name == 'workflow_dispatch' + runs-on: ubuntu-latest + steps: + - uses: elastic/docs/.github/actions/docs-preview@main + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repo: ${{ github.event.repository.name }} + preview-path: 'guide/en/observability/master/index.html' + pr: 2842 From 8df36607a59034a68c235f826b04881cf4d609a3 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 30 Nov 2023 09:21:52 +0100 Subject: [PATCH 0702/1049] Add link to doc builds in GH action --- .github/actions/docs-preview/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/docs-preview/action.yml b/.github/actions/docs-preview/action.yml index c12625c5980de..30bb18fefe4b0 100644 --- a/.github/actions/docs-preview/action.yml +++ b/.github/actions/docs-preview/action.yml @@ -30,6 +30,7 @@ runs: const comment = `A documentation preview will be available soon. Help us out by validating the Buildkite preview and reporting issues [here](https://github.com/elastic/docs/issues/new?labels=buildkite-migration,bug). + - 🔨 Docs [builds](https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=${REPO}_${PR}) - 📚 HTML diff: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/diff) - 📙 Preview: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - 🧪 [Buildkite vs Jenkins diff](https://github.com/elastic/built-docs/compare/${REPO}_bk_${PR}..${REPO}_${PR})`; From 4b3db4adf9e464bec556a728182ecdef15fa2c1d Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Thu, 30 Nov 2023 09:31:07 +0100 Subject: [PATCH 0703/1049] Rename link to doc builds in GH action --- .github/actions/docs-preview/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/docs-preview/action.yml b/.github/actions/docs-preview/action.yml index 30bb18fefe4b0..d8e1badf53b0b 100644 --- a/.github/actions/docs-preview/action.yml +++ b/.github/actions/docs-preview/action.yml @@ -30,7 +30,7 @@ runs: const comment = `A documentation preview will be available soon. Help us out by validating the Buildkite preview and reporting issues [here](https://github.com/elastic/docs/issues/new?labels=buildkite-migration,bug). - - 🔨 Docs [builds](https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=${REPO}_${PR}) + - 🔨 Buildkite [builds](https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=${REPO}_${PR}) - 📚 HTML diff: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/diff) - 📙 Preview: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - 🧪 [Buildkite vs Jenkins diff](https://github.com/elastic/built-docs/compare/${REPO}_bk_${PR}..${REPO}_${PR})`; From cbe693038076cd95167b74e51802e2fd04decc90 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 30 Nov 2023 16:56:50 +0100 Subject: [PATCH 0704/1049] Fix GH action branch name --- .github/workflows/doc-preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/doc-preview.yml b/.github/workflows/doc-preview.yml index 6f5d3ba9ab1e5..d759c503aad52 100644 --- a/.github/workflows/doc-preview.yml +++ b/.github/workflows/doc-preview.yml @@ -14,7 +14,7 @@ jobs: if: github.event_name == 'pull_request_target' runs-on: ubuntu-latest steps: - - uses: elastic/docs/.github/actions/docs-preview@main + - uses: elastic/docs/.github/actions/docs-preview@master with: github-token: ${{ secrets.GITHUB_TOKEN }} repo: ${{ github.event.repository.name }} @@ -24,7 +24,7 @@ jobs: if: github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - uses: elastic/docs/.github/actions/docs-preview@main + - uses: elastic/docs/.github/actions/docs-preview@master with: github-token: ${{ secrets.GITHUB_TOKEN }} repo: ${{ github.event.repository.name }} From d90acf5480c0161aab508731b1cd169dbc6b59c3 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 1 Dec 2023 06:13:07 +0100 Subject: [PATCH 0705/1049] Add migration taskforce to code owners until BK migration is over (#2846) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 598b4b20b27e2..fe85773662120 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @elastic/docs-release-team @elastic/docs-engineering @colleenmcginnis @kilfoyle @leemthompo +* @elastic/docs-release-team @elastic/docs-engineering @colleenmcginnis @kilfoyle @leemthompo @elastic/ci-docs-migration-taskforce From cefde70968d17d3310f430e500b2cafbc4ef636f Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 1 Dec 2023 06:15:11 +0100 Subject: [PATCH 0706/1049] Allow skip link checks or warn link checks but not both (#2844) --- .buildkite/scripts/build.sh | 6 ++---- .buildkite/scripts/build_pr.sh | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh index af3e8fb3955ea..0eb9756ccf0e8 100755 --- a/.buildkite/scripts/build.sh +++ b/.buildkite/scripts/build.sh @@ -20,10 +20,8 @@ fi if [[ "${BROKEN_LINKS}" == 'skiplinkcheck' ]]; then broken_links_opt="--skiplinkcheck" -else - if [[ "${BROKEN_LINKS}" == 'warnlinkcheck' ]]; then - broken_links_opt="--warnlinkcheck" - fi +elif [[ "${BROKEN_LINKS}" == 'warnlinkcheck' ]]; then + broken_links_opt="--warnlinkcheck" fi if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 526332ee1a120..96a5c9baee9b1 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -29,9 +29,8 @@ if [[ ${GITHUB_PR_COMMENT_VAR_REBUILD_OPT:="unset"} == "rebuild" ]];then rebuild_opt=" --rebuild" elif [[ ${GITHUB_PR_COMMENT_VAR_SKIP_OPT:="unset"} == "skiplinkcheck" ]];then build_args+=" --skiplinkcheck" - if [[ ${GITHUB_PR_COMMENT_VAR_WARN_OPT:="unset"} == "warnlinkcheck" ]];then - build_args+=" --warnlinkcheck" - fi +elif [[ ${GITHUB_PR_COMMENT_VAR_WARN_OPT:="unset"} == "warnlinkcheck" ]];then + build_args+=" --warnlinkcheck" fi buildkite-agent \ From 388934f55b59c0f0f21f26fa78da993bf5877ccf Mon Sep 17 00:00:00 2001 From: lcawl Date: Fri, 1 Dec 2023 15:54:28 -0800 Subject: [PATCH 0707/1049] Bump docs version to 7.17.16 --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 3c0e1009b90e7..ae8e339145c72 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.15 +:version: 7.17.16 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.15 -:logstash_version: 7.17.15 -:elasticsearch_version: 7.17.15 -:kibana_version: 7.17.15 -:apm_server_version: 7.17.15 +:bare_version: 7.17.16 +:logstash_version: 7.17.16 +:elasticsearch_version: 7.17.16 +:kibana_version: 7.17.16 +:apm_server_version: 7.17.16 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 06deb108e08551816632294d123113ae6653d1fd Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Mon, 4 Dec 2023 06:15:35 +0100 Subject: [PATCH 0708/1049] Cancel existing builds on running PRs (#2845) * Cancel existing builds on running PRs * Use the actual job branch instead of always master --- .buildkite/build_pr_pipeline.yml | 2 ++ .buildkite/hooks/pre-command | 2 +- .buildkite/scripts/cancel_running_pr.sh | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 .buildkite/scripts/cancel_running_pr.sh diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index 99aa0461e7c1f..b9ba2131cca7d 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,4 +1,6 @@ steps: + - key: "cancel-existing-builds" + command: ".buildkite/scripts/cancel_running_pr.sh || true" - key: "build-pr-setup" label: "setup" command: ".buildkite/scripts/build_pr_commit_status.sh pending" diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index e25c0315d093a..025be0d83fdd6 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -28,7 +28,7 @@ export BUILD_PR_MACHINE_TYPE="n2-standard-4" # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables if [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-pr" ]];then export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner) - + export BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/buildkite_token) if [[ ${GITHUB_PR_BASE_REPO:="unset"} == "docs" ]]; then # Docs PR require a full rebuild - so let's boost the builds so they don't take 2 hours export BUILD_PR_MACHINE_TYPE="n2-highcpu-32" diff --git a/.buildkite/scripts/cancel_running_pr.sh b/.buildkite/scripts/cancel_running_pr.sh new file mode 100755 index 0000000000000..7a44e523bd8e3 --- /dev/null +++ b/.buildkite/scripts/cancel_running_pr.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -euo pipefail +set +x + +# This script should only be invoked by the Buildkite PR bot +if [ -z ${GITHUB_PR_NUMBER+set} ] || [ -z ${GITHUB_PR_BASE_REPO+set} ];then + echo "One of the following env. variable GITHUB_PR_NUMBER, GITHUB_PR_BASE_REPO is missing - exiting." + exit 1 +fi + +running_builds_url="https://api.buildkite.com/v2/organizations/elastic/pipelines/${BUILDKITE_PIPELINE_SLUG}/builds" +running_builds_url+="?branch=${BUILDKITE_BRANCH}&state[]=scheduled&state[]=running" +jq_filter="map(select(any(.meta_data; .repo_pr == \"${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}\"))) | .[] .number" + +for bn in $(curl -sH "Authorization: Bearer ${BUILDKITE_API_TOKEN}" $running_builds_url | jq -c "${jq_filter}"); do + if [ "$bn" != "${BUILDKITE_BUILD_NUMBER}" ];then + echo "Cancelling build ${bn} targetting the same PR" + cancel_url="https://api.buildkite.com/v2/organizations/elastic/pipelines/${BUILDKITE_PIPELINE_SLUG}/builds/${bn}/cancel" + curl --silent -X PUT -H "Authorization: Bearer ${BUILDKITE_API_TOKEN}" "${cancel_url}" > /dev/null + fi +done + + From be161bfd2ba5d41298c3c9ada41b6845c61268a8 Mon Sep 17 00:00:00 2001 From: Karen Metts <35154725+karenzone@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:41:05 -0500 Subject: [PATCH 0709/1049] Add attribute for Elasticsearch serverless (#2849) --- shared/attributes.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index c9a0e947aa0c1..9a01c5cb3baa6 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -180,6 +180,7 @@ Elastic Cloud :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes :serverless-full: Elastic Cloud serverless +:es-serverless: Elasticsearch on serverless :serverless-short: serverless :serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current @@ -542,4 +543,4 @@ Legacy definitions :Data-sources: Data views // Do not use A-data-source or a-data-source :A-data-source: A data view -:a-data-source: a data view \ No newline at end of file +:a-data-source: a data view From 3a43834c6e514db070140310c293566f456a1309 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Tue, 5 Dec 2023 18:21:49 +0100 Subject: [PATCH 0710/1049] Build doc every 30 minutes (#2851) --- catalog-info.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index 5d3af7f6c200e..0c407e065f069 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -24,6 +24,11 @@ spec: branch_configuration: master provider_settings: build_pull_requests: false + schedules: + periodic_docs_build: + branch: "master" + message: "Build the docs every 30 minutes" + cronline: "*/30 * * * *" teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ From f1c1b67badee5aa7ef3931226168fa632c3d69d9 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 7 Dec 2023 20:04:29 +0100 Subject: [PATCH 0711/1049] Buildkite PR job - batch2 (#2848) * Add more repositories to the rollout * Add alternative docs trigger phrase --- .buildkite/pull-requests.org-wide.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 5511105ec255a..381893cca7254 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -12,17 +12,19 @@ "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", - "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "buildkite test this ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "skip_ci_labels": [ "skip docs-build" ], "skip_ci_on_only_changed": [], "always_require_ci_on_changed": [], "repositories": [ + "elastic/beats", "elastic/elasticsearch", "elastic/kibana", + "elastic/logstash-docs", + "elastic/stack-docs", "elastic/tech-content", - "elastic/beats", "elastic/observability-docs" ] }, @@ -38,7 +40,7 @@ "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", - "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "buildkite test this ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "skip_ci_labels": [ "skip docs-build" ], @@ -49,10 +51,14 @@ "docs\\.*" ], "repositories": [ - "elastic/security-docs", + "elastic/curator", "elastic/elasticsearch-py", "elastic/cloud-on-k8s", + "elastic/ecctl", + "elastic/eland", "elastic/ingest-docs", + "elastic/logstash", + "elastic/security-docs", "elastic/x-pack" ] }, @@ -67,7 +73,7 @@ "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", - "always_trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", + "always_trigger_comment_regex": "buildkite test this ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", "skip_ci_labels": [ "skip docs-build" ], From 9030c4f5b8827ef6d4d47d65b14e5e95e5698303 Mon Sep 17 00:00:00 2001 From: Abdon Pijpelink Date: Fri, 8 Dec 2023 10:19:36 +0100 Subject: [PATCH 0712/1049] Bump the docs to version 8.11.3 --- shared/versions/stack/8.11.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.11.asciidoc b/shared/versions/stack/8.11.asciidoc index c45b32cc319f3..5922cbf3ba4e8 100644 --- a/shared/versions/stack/8.11.asciidoc +++ b/shared/versions/stack/8.11.asciidoc @@ -1,12 +1,12 @@ -:version: 8.11.2 +:version: 8.11.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.11.2 -:logstash_version: 8.11.2 -:elasticsearch_version: 8.11.2 -:kibana_version: 8.11.2 -:apm_server_version: 8.11.2 +:bare_version: 8.11.3 +:logstash_version: 8.11.3 +:elasticsearch_version: 8.11.3 +:kibana_version: 8.11.3 +:apm_server_version: 8.11.3 :branch: 8.11 :minor-version: 8.11 :major-version: 8.x From 30ed54bb8215bc1817ab200a64b3b6c5c428a2fd Mon Sep 17 00:00:00 2001 From: Scotty Bollinger Date: Fri, 8 Dec 2023 15:16:29 -0600 Subject: [PATCH 0713/1049] Docs landing page redesign (#2847) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Import PR #2805 changes * Update Docs landing page design * Minor style fixes * Fix tests * Add links to other cards, fix icons, and tighten up mobile styles * Add fonts and clean up a few styles to better match marketing site * Fix test * Remove marketing fonts This was an attempt to get the fonts used in the landing page that are added by the injected marketing header to work on the PR previews. The font are restricted by CORS and my attempt at adding them here didn’t work either, so reverting those changes. * Move elements per feedback The “Browse all docs” section was moved above the marketing callout and need help section * Add feedback widget * Fix fonts --- conf.yaml | 3006 +++++++++-------- extra/docs_landing.html | 953 ++++-- .../lib/docbook_compat/convert_document.rb | 3 - .../asciidoctor/spec/docbook_compat_spec.rb | 15 - resources/web/docs_js/index.js | 33 + 5 files changed, 2209 insertions(+), 1801 deletions(-) diff --git a/conf.yaml b/conf.yaml index 1eeb86e161005..9e772056ab07f 100644 --- a/conf.yaml +++ b/conf.yaml @@ -70,7 +70,7 @@ repos: x-pack-kibana: https://github.com/elastic/x-pack-kibana.git x-pack-logstash: https://github.com/elastic/x-pack-logstash.git -contents_title: Starting with the Elasticsearch Platform and its Solutions +contents_title: Elastic documentation # Each item should take the form: # : & @@ -122,173 +122,7 @@ variables: toc_extra: extra/docs_landing.html contents: - - title: Elastic Documentation - sections: - - title: "Starting with the Elasticsearch Platform and its Solutions" - prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions - current: *stackcurrent - index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] - live: [ 8.10 ] - chunk: 1 - tags: Elastic/Starting with the Elasticsearch Platform and its Solutions - subject: Starting with the Elasticsearch Platform and its Solutions - sources: - - - repo: tech-content - path: welcome-to-elastic - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - title: Elastic Stack - sections: - - title: Installation and Upgrade Guide - prefix: en/elastic-stack - current: *stackcurrent - index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: Elastic Stack/Installation and Upgrade - subject: Elastic Stack - sources: - - - repo: stack-docs - path: docs/en - - - repo: apm-server - path: docs/ - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: beats - path: libbeat/docs - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: elasticsearch - path: docs/ - - - repo: elasticsearch-hadoop - path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: security-docs - path: docs/ - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: kibana - path: docs/ - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: logstash - path: docs/ - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: observability-docs - path: docs/en/observability - exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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/attributes.asciidoc - exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] - - - repo: docs - path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] - - title: Glossary - prefix: en/elastic-stack-glossary - current: main - index: docs/en/glossary/index.asciidoc - branches: [ {main: master} ] - tags: Elastic Stack/Glossary - subject: Elastic Stack - sources: - - - repo: stack-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Machine Learning - prefix: en/machine-learning - current: *stackcurrent - index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: Elastic Stack/Machine Learning - subject: Machine Learning - sources: - - - repo: stack-docs - path: docs/en/stack - - - repo: elasticsearch - path: docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - - repo: docs - path: shared/settings.asciidoc - - title: Elasticsearch Relevance Engine (ESRE) - prefix: en/esre - index: esre-docs/index.asciidoc - private: 1 - current: *stackcurrent - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8 ] - live: [ 8.10 ] - chunk: 1 - tags: ESRE/Guide - subject: ESRE - sources: - - - repo: enterprise-search-pubs - path: esre-docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Elastic Common Schema (ECS) Reference - prefix: en/ecs - current: 8.11 - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] - index: docs/index.asciidoc - chunk: 2 - tags: Elastic Common Schema (ECS)/Reference - subject: Elastic Common Schema (ECS) - sources: - - - repo: ecs - path: docs/ - - title: Elastic Ingest Reference Architectures - prefix: en/ingest - current: *stackcurrent - index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.11, 8.10, 8.9 ] - live: [ 8.11 ] - chunk: 1 - tags: Ingest/Reference - subject: Ingest - sources: - - - repo: ingest-docs - path: docs/en - - - repo: docs - path: shared/attributes.asciidoc - - title: "Elasticsearch: Store, Search, and Analyze" + - title: Search sections: - title: Elasticsearch Guide prefix: en/elasticsearch/reference @@ -399,807 +233,201 @@ contents: - repo: elasticsearch path: server/src/main/resources/org/elasticsearch/common - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - title: Elasticsearch Resiliency Status - prefix: en/elasticsearch/resiliency - toc: 1 - branches: [{main: master}] - current: main - index: docs/resiliency/index.asciidoc - single: 1 - tags: Elasticsearch/Resiliency Status - subject: Elasticsearch + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - title: Enterprise Search Guide + prefix: en/enterprise-search + index: enterprise-search-docs/index.asciidoc + private: 1 + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Enterprise Search/Guide + subject: Enterprise Search sources: - - repo: elasticsearch - path: docs/resiliency - - - repo: elasticsearch - path: docs/Versions.asciidoc + repo: enterprise-search-pubs + path: enterprise-search-docs - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - title: Painless Scripting Language - prefix: en/elasticsearch/painless + - title: Workplace Search Guide + prefix: en/workplace-search + index: workplace-search-docs/index.asciidoc + private: 1 current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 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 ] live: *stacklive - index: docs/painless/index.asciidoc chunk: 1 - tags: Elasticsearch/Painless - subject: Elasticsearch + tags: Workplace Search/Guide + subject: Workplace Search sources: - - repo: elasticsearch - path: docs/painless - - - repo: elasticsearch - path: docs/Versions.asciidoc + repo: enterprise-search-pubs + path: workplace-search-docs - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - title: Plugins and Integrations - prefix: en/elasticsearch/plugins - repo: elasticsearch + - title: App Search Guide + prefix: en/app-search + index: app-search-docs/index.asciidoc + private: 1 current: *stackcurrent - index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 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 ] live: *stacklive - chunk: 2 - tags: Elasticsearch/Plugins - subject: Elasticsearch + chunk: 1 + tags: App Search/Guide + subject: App Search sources: - - repo: elasticsearch - path: docs/plugins - - - repo: elasticsearch - path: docs/Versions.asciidoc - exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: build-tools-internal/src/main/resources/ - exclude_branches: [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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: build-tools/src/main/resources/ - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + repo: enterprise-search-pubs + path: app-search-docs - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - title: Elasticsearch Clients - base_dir: en/elasticsearch/client - toc_extra: extra/client_docs_landing.html + - title: Enterprise Search Clients + base_dir: en/enterprise-search-clients sections: - - title: Java Client - prefix: java-api-client + - title: App Search JavaScript client + prefix: app-search-javascript + private: 1 + single: 1 current: *stackcurrent branches: [ {main: master}, 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 ] live: *stacklive - index: docs/index.asciidoc - chunk: 1 - tags: Clients/Java - subject: Clients + index: client-docs/app-search-javascript/index.asciidoc + tags: App Search Clients/JavaScript + subject: App Search Clients sources: - - repo: elasticsearch-java - path: docs/ - - - repo: elasticsearch-java - path: java-client/src/test/java/co/elastic/clients/documentation - - - repo: elasticsearch - path: docs/java-rest/ + repo: enterprise-search-pubs + path: client-docs/app-search-javascript - - repo: elasticsearch - path: client - - title: JavaScript Client - prefix: javascript-api + repo: docs + path: shared/versions/stack/{version}.asciidoc + - title: App Search Node.js client + prefix: app-search-node + private: 1 + single: 1 current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x ] + branches: [ {main: master}, 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 ] live: *stacklive - index: docs/index.asciidoc - chunk: 1 - tags: Clients/JavaScript - subject: Clients + index: client-docs/app-search-node/index.asciidoc + tags: App Search Clients/Node.js + subject: App Search Clients sources: - - repo: elasticsearch-js - path: docs/ - - title: Ruby Client - prefix: ruby-api + repo: enterprise-search-pubs + path: client-docs/app-search-node + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - title: Enterprise Search Node.js client + prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: docs/index.asciidoc - chunk: 1 - tags: Clients/Ruby - subject: Clients + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + live: [ 8.10 ] + index: packages/enterprise-search/docs/index.asciidoc + tags: Enterprise Search Clients/Node.js + subject: Enterprise Search Clients sources: - - repo: elasticsearch-ruby - path: docs/ - - title: Go Client - prefix: go-api + repo: enterprise-search-js + path: packages/enterprise-search/docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - title: Enterprise Search PHP client + prefix: php current: *stackcurrent branches: [ {main: master}, 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 ] live: *stacklive - index: .doc/index.asciidoc - chunk: 1 - tags: Clients/Go - subject: Clients - sources: - - - repo: go-elasticsearch - path: .doc/ - - title: .NET Clients - prefix: net-api - current: 8.9 - branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] - live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] - index: docs/index.asciidoc - tags: Clients/.Net - subject: Clients - chunk: 1 + index: docs/guide/index.asciidoc + tags: Enterprise Search Clients/PHP + subject: Enterprise Search Clients sources: - - repo: elasticsearch-net - path: docs/ + repo: enterprise-search-php + path: docs/guide/ - - repo: elasticsearch-net - path: tests/Tests/Documentation - - title: PHP Client - prefix: php-api + repo: docs + path: shared/versions/stack/{version}.asciidoc + - title: Enterprise Search Python client + prefix: python current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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 ] live: *stacklive - index: docs/index.asciidoc - chunk: 1 - tags: Clients/PHP - subject: Clients + index: docs/guide/index.asciidoc + tags: Enterprise Search Clients/Python + subject: Enterprise Search Clients sources: - - repo: elasticsearch-php - path: docs/ + repo: enterprise-search-python + path: docs/guide/ - repo: docs - path: shared/attributes.asciidoc - - title: Perl Client - prefix: perl-api - current: master - branches: [ master, 8.x, 7.x ] - live: [ master, 8.x, 7.x ] - index: docs/index.asciidoc - chunk: 1 - tags: Clients/Perl - subject: Clients - sources: - - - repo: elasticsearch-perl - path: docs/ - - title: Python Client - prefix: python-api + path: shared/versions/stack/{version}.asciidoc + - title: Enterprise Search Ruby client + prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc - chunk: 1 - tags: Clients/Python - subject: Clients + tags: Enterprise Search Clients/Ruby + subject: Enterprise Search Clients sources: - - repo: elasticsearch-py + repo: enterprise-search-ruby path: docs/guide/ - - title: eland - prefix: eland - current: main - branches: [ {main: master} ] - live: [ main ] - index: docs/guide/index.asciidoc - chunk: 1 - tags: Clients/eland - subject: Clients - sources: - - - repo: eland - path: docs/guide - - title: Rust Client - prefix: rust-api - current: main - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] - live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] - index: docs/index.asciidoc - chunk: 1 - tags: Clients/Rust - subject: Clients - sources: - - - repo: elasticsearch-rs - path: docs/ - - title: Java REST Client (deprecated) - prefix: java-rest - current: 7.17 - branches: [ 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: [ 7.17, 6.8 ] - index: docs/java-rest/index.asciidoc - tags: Clients/JavaREST - subject: Clients - chunk: 1 - sources: - - - repo: elasticsearch - path: docs/java-rest - - - repo: elasticsearch - path: docs/Versions.asciidoc - - - repo: elasticsearch - path: client - exclude_branches: [ 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - title: Java Transport Client (deprecated) - prefix: java-api - current: 7.17 - branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - live: [7.17, 6.8] - index: docs/java-api/index.asciidoc - tags: Clients/Java - subject: Clients - chunk: 1 + - title: Workplace Search Node.js client + prefix: workplace-search-node + private: 1 + single: 1 + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: client-docs/workplace-search-node/index.asciidoc + tags: Workplace Search Clients/Node.js + subject: Workplace Search Clients sources: - - repo: elasticsearch - path: docs/java-api - - - repo: elasticsearch - path: docs/Versions.asciidoc - exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: client/rest-high-level/src/test/java/org/elasticsearch/client - exclude_branches: [ 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - - repo: elasticsearch - path: server/src/internalClusterTest/java/org/elasticsearch/client/documentation - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: server/src/test/java/org/elasticsearch/client/documentation - exclude_branches: [ 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: elasticsearch - path: modules/reindex/src/test/java/org/elasticsearch/client/documentation - exclude_branches: [ 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + repo: enterprise-search-pubs + path: client-docs/workplace-search-node - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - - - title: Community Contributed Clients - prefix: community - branches: [{main: master}] - current: main - index: docs/community-clients/index.asciidoc - single: 1 - tags: Clients/Community - subject: Clients - sources: - - - repo: elasticsearch - path: docs/community-clients - - title: Elasticsearch for Apache Hadoop and Spark - prefix: en/elasticsearch/hadoop + - title: "Observability: APM, Logs, Metrics, and Uptime" + sections: + - title: Observability + prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive - index: docs/src/reference/asciidoc/index.adoc - tags: Elasticsearch/Apache Hadoop - subject: Elasticsearch - sources: - - - repo: elasticsearch-hadoop - path: docs/src/reference/asciidoc - - title: Curator Index Management - prefix: en/elasticsearch/client/curator - current: 8.0 - branches: [ 8.0, 7.0, 6.0, 5.8, 5.7, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 4.3, 4.2, 4.1, 4.0, 3.5, 3.4, 3.3 ] - index: docs/asciidoc/index.asciidoc - tags: Clients/Curator - subject: Clients - sources: - - - repo: curator - path: docs/asciidoc - - - title: "Cloud: Provision, Manage and Monitor the Elastic Stack" - sections: - - title: Elasticsearch Service - Hosted Elastic Stack - prefix: en/cloud - tags: Cloud/Reference - subject: Elastic Cloud - current: *cloudSaasCurrent - branches: [ { *cloudSaasCurrent : latest} ] - index: docs/saas/index.asciidoc - chunk: 1 - private: 1 - sources: - - - repo: cloud - path: docs/saas - - - repo: cloud - path: docs/shared - - title: Elasticsearch Add-On for Heroku - Hosted Elasticsearch and Kibana for Heroku Users - prefix: en/cloud-heroku - tags: Cloud-Heroku/Reference - subject: Elasticsearch Add-On for Heroku - current: *cloudSaasCurrent - branches: [ { *cloudSaasCurrent : latest} ] - index: docs/heroku/index.asciidoc - chunk: 1 - noindex: 1 - private: 1 - sources: - - - repo: cloud - path: docs/saas - - - repo: cloud - path: docs/shared - - - repo: cloud - path: docs/heroku - - title: Elastic Cloud Enterprise - Elastic Cloud on your Infrastructure - prefix: en/cloud-enterprise - tags: CloudEnterprise/Reference - subject: ECE - current: ms-92 - live: - - ms-92 - - ms-81 - - ms-78 - - ms-75 - - ms-72 - - ms-70 - - ms-69 - branches: - - ms-92: 3.6 - - ms-81: 3.5 - - ms-78: 3.4 - - ms-75: 3.3 - - ms-72: 3.2 - - ms-70: 3.1 - - ms-69: 3.0 - - ms-65: 2.13 - - ms-62: 2.12 - - ms-59: 2.11 - - ms-57: 2.10 - - ms-53: 2.9 - - ms-49: 2.8 - - ms-47: 2.7 - - release-ms-41: 2.6 - - 2.5 - - 2.4 - - 2.3 - - 2.2 - - 2.1 - - 2.0 - - 1.1 - - 1.0 - index: docs/cloud-enterprise/index.asciidoc + index: docs/en/observability/index.asciidoc chunk: 2 - private: 1 + tags: Observability/Guide + subject: Observability sources: - - repo: cloud - # Grab the entire docs/ directory to get `ece-version.asciidoc` - path: docs + repo: observability-docs + path: docs/en - - repo: cloud - path: docs/shared - exclude_branches: [ 1.0 ] + repo: ingest-docs + path: docs/en - - repo: cloud-assets + repo: apm-server path: docs - map_branches: - ms-92: master - ms-81: master - ms-78: master - ms-75: master - ms-72: master - ms-70: master - ms-69: master - ms-65: master - ms-62: master - ms-59: master - ms-57: master - ms-53: master - ms-49: master - ms-47: master - release-ms-41: master - 2.5: master - 2.4: master - 2.3: master - 2.2: master - 2.1: master - 2.0: master - 1.1: master - 1.0: master - - - alternatives: { source_lang: console, alternative_lang: php } - repo: clients-team - path: docs/examples/elastic-cloud/php - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: go } - repo: clients-team - path: docs/examples/elastic-cloud/go - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: ruby } - repo: clients-team - path: docs/examples/elastic-cloud/ruby - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: java } - repo: clients-team - path: docs/examples/elastic-cloud/java - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: javascript } - repo: clients-team - path: docs/examples/elastic-cloud/javascript - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: python } - repo: clients-team - path: docs/examples/elastic-cloud/python - map_branches: *mapCloudEceToClientsTeam - - - alternatives: { source_lang: console, alternative_lang: csharp } - repo: clients-team - path: docs/examples/elastic-cloud/csharp - map_branches: *mapCloudEceToClientsTeam - - title: Elastic Cloud on Kubernetes - prefix: en/cloud-on-k8s - tags: Kubernetes/Reference - subject: ECK - current: 2.10 - branches: [ {main: master}, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] - index: docs/index.asciidoc - chunk: 1 - sources: + 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 ] - - repo: cloud-on-k8s - path: docs/ + 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 ] - repo: docs - path: shared/versions/stack/current.asciidoc - exclude_branches: [ 0.9, 0.8 ] - - - repo: docs - path: shared/attributes.asciidoc - - title: Elastic Cloud Control - The Command-Line Interface for Elasticsearch Service and ECE - prefix: en/ecctl - tags: CloudControl/Reference - subject: ECCTL - current: 1.11 - branches: [ master, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - index: docs/index.asciidoc - chunk: 1 - sources: - - - repo: ecctl - path: docs/ - - title: Elastic Cloud Terraform Provider - prefix: en/tpec - tags: CloudTerraform/Reference - subject: TPEC - current: 0.2 - branches: [ master, 0.2, 0.1 ] - index: docs-elastic/index.asciidoc - single: 1 - chunk: 1 - sources: - - - repo: terraform-provider-ec - path: docs-elastic/ - - - title: "Kibana: Explore, Visualize, and Share" - sections: - - title: Kibana Guide - prefix: en/kibana - current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - live: *stacklive - index: docs/index.x.asciidoc - chunk: 1 - tags: Kibana/Reference - subject: Kibana - toc_extra: extra/kibana_landing.html - sources: - - - repo: kibana - path: docs/ - - - repo: x-pack-kibana - prefix: kibana-extra/x-pack-kibana - path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: docs - path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: docs - path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - - - repo: kibana - # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) - path: ":(glob)examples/**/*.asciidoc" - exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: kibana - path: ":(glob)src/**/*.asciidoc" - exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - repo: kibana - path: ":(glob)x-pack/**/*.asciidoc" - exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - - - title: Enterprise Search - sections: - - title: Enterprise Search Guide - prefix: en/enterprise-search - index: enterprise-search-docs/index.asciidoc - private: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: Enterprise Search/Guide - subject: Enterprise Search - sources: - - - repo: enterprise-search-pubs - path: enterprise-search-docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Workplace Search Guide - prefix: en/workplace-search - index: workplace-search-docs/index.asciidoc - private: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: Workplace Search/Guide - subject: Workplace Search - sources: - - - repo: enterprise-search-pubs - path: workplace-search-docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: App Search Guide - prefix: en/app-search - index: app-search-docs/index.asciidoc - private: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: App Search/Guide - subject: App Search - sources: - - - repo: enterprise-search-pubs - path: app-search-docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Site Search Reference - prefix: en/swiftype/sitesearch - index: docs/sitesearch/index.asciidoc - private: 1 - current: master - branches: [ master ] - single: 1 - tags: Site Search/Reference - subject: Swiftype - sources: - - - repo: swiftype - path: docs - - title: Enterprise Search Clients - base_dir: en/enterprise-search-clients - sections: - - title: App Search JavaScript client - prefix: app-search-javascript - private: 1 - single: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: client-docs/app-search-javascript/index.asciidoc - tags: App Search Clients/JavaScript - subject: App Search Clients - sources: - - - repo: enterprise-search-pubs - path: client-docs/app-search-javascript - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: App Search Node.js client - prefix: app-search-node - private: 1 - single: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: client-docs/app-search-node/index.asciidoc - tags: App Search Clients/Node.js - subject: App Search Clients - sources: - - - repo: enterprise-search-pubs - path: client-docs/app-search-node - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Enterprise Search Node.js client - prefix: enterprise-search-node - current: *stackcurrent - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] - live: [ 8.10 ] - index: packages/enterprise-search/docs/index.asciidoc - tags: Enterprise Search Clients/Node.js - subject: Enterprise Search Clients - sources: - - - repo: enterprise-search-js - path: packages/enterprise-search/docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Enterprise Search PHP client - prefix: php - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: docs/guide/index.asciidoc - tags: Enterprise Search Clients/PHP - subject: Enterprise Search Clients - sources: - - - repo: enterprise-search-php - path: docs/guide/ - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Enterprise Search Python client - prefix: python - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: docs/guide/index.asciidoc - tags: Enterprise Search Clients/Python - subject: Enterprise Search Clients - sources: - - - repo: enterprise-search-python - path: docs/guide/ - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Enterprise Search Ruby client - prefix: ruby - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: docs/guide/index.asciidoc - tags: Enterprise Search Clients/Ruby - subject: Enterprise Search Clients - sources: - - - repo: enterprise-search-ruby - path: docs/guide/ - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: Workplace Search Node.js client - prefix: workplace-search-node - private: 1 - single: 1 - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: client-docs/workplace-search-node/index.asciidoc - tags: Workplace Search Clients/Node.js - subject: Workplace Search Clients - sources: - - - repo: enterprise-search-pubs - path: client-docs/workplace-search-node - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - title: "Observability: APM, Logs, Metrics, and Uptime" - sections: - - title: Observability - prefix: en/observability - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive - index: docs/en/observability/index.asciidoc - chunk: 2 - tags: Observability/Guide - subject: Observability - sources: - - - repo: observability-docs - path: docs/en - - - repo: ingest-docs - path: docs/en - - - repo: apm-server - path: 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 ] - - - 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 ] - - - repo: docs - path: shared/versions/stack/{version}.asciidoc + path: shared/versions/stack/{version}.asciidoc - repo: docs path: shared/attributes.asciidoc @@ -1452,42 +680,6 @@ contents: - repo: apm-mutating-webhook path: docs - - title: Legacy APM (standalone) - sections: - - title: Legacy APM Overview - prefix: get-started - index: docs/guide/index.asciidoc - current: 7.15 - branches: [ 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 ] - chunk: 1 - tags: APM Server/Reference - subject: APM - sources: - - - repo: apm-server - path: docs/guide - - - repo: apm-server - path: docs - - title: Legacy APM Server Reference - prefix: server - index: docs/index.asciidoc - current: 7.15 - branches: [ 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 ] - chunk: 1 - tags: APM Server/Reference - subject: APM - sources: - - - repo: apm-server - path: changelogs - exclude_branches: [ 6.0 ] - - - repo: apm-server - path: docs - - - repo: apm-server - path: CHANGELOG.asciidoc - title: ECS logging base_dir: en/ecs-logging sections: @@ -1690,113 +882,789 @@ contents: - repo: ecs-logging path: docs - - - title: Elastic Security + - title: Security sections: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] + live: *stacklive + index: docs/index.asciidoc + chunk: 1 + tags: Security/Guide + subject: Security + sources: + - + repo: security-docs + path: docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - + repo: stack-docs + path: docs/en + - title: Elastic Stack + sections: + - title: Curator Index Management + prefix: en/elasticsearch/client/curator + current: 8.0 + branches: [ 8.0, 7.0, 6.0, 5.8, 5.7, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 4.3, 4.2, 4.1, 4.0, 3.5, 3.4, 3.3 ] + index: docs/asciidoc/index.asciidoc + tags: Clients/Curator + subject: Clients + sources: + - + repo: curator + path: docs/asciidoc + - title: Elastic Common Schema (ECS) Reference + prefix: en/ecs + current: 8.11 + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 1.12 ] + index: docs/index.asciidoc + chunk: 2 + tags: Elastic Common Schema (ECS)/Reference + subject: Elastic Common Schema (ECS) + sources: + - + repo: ecs + path: docs/ + - title: Elastic Ingest Reference Architectures + prefix: en/ingest + current: *stackcurrent + index: docs/en/ingest-arch/index.asciidoc + branches: [ {main: master}, 8.11, 8.10, 8.9 ] + live: [ 8.11 ] + chunk: 1 + tags: Ingest/Reference + subject: Ingest + sources: + - + repo: ingest-docs + path: docs/en + - + repo: docs + path: shared/attributes.asciidoc + - title: Elastic Logging Plugin for Docker + prefix: en/beats/loggingplugin + current: *stackcurrent + index: x-pack/dockerlogbeat/docs/index.asciidoc + branches: [ {main: master}, 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 ] + chunk: 1 + tags: Elastic Logging Plugin/Reference + respect_edit_url_overrides: true + subject: Elastic Logging Plugin + sources: + - + repo: beats + path: x-pack/dockerlogbeat/docs + - + repo: beats + path: libbeat/docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Elasticsearch Clients + base_dir: en/elasticsearch/client + toc_extra: extra/client_docs_landing.html + sections: + - title: Java Client + prefix: java-api-client + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: docs/index.asciidoc + chunk: 1 + tags: Clients/Java + subject: Clients + sources: + - + repo: elasticsearch-java + path: docs/ + - + repo: elasticsearch-java + path: java-client/src/test/java/co/elastic/clients/documentation + - + repo: elasticsearch + path: docs/java-rest/ + - + repo: elasticsearch + path: client + - title: JavaScript Client + prefix: javascript-api + current: *stackcurrent + branches: [ {main: master}, 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, 6.x, 5.x ] + live: *stacklive + index: docs/index.asciidoc + chunk: 1 + tags: Clients/JavaScript + subject: Clients + sources: + - + repo: elasticsearch-js + path: docs/ + - title: Ruby Client + prefix: ruby-api + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: docs/index.asciidoc + chunk: 1 + tags: Clients/Ruby + subject: Clients + sources: + - + repo: elasticsearch-ruby + path: docs/ + - title: Go Client + prefix: go-api + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: .doc/index.asciidoc + chunk: 1 + tags: Clients/Go + subject: Clients + sources: + - + repo: go-elasticsearch + path: .doc/ + - title: .NET Clients + prefix: net-api + current: 8.9 + branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] + live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] + index: docs/index.asciidoc + tags: Clients/.Net + subject: Clients + chunk: 1 + sources: + - + repo: elasticsearch-net + path: docs/ + - + repo: elasticsearch-net + path: tests/Tests/Documentation + - title: PHP Client + prefix: php-api + current: *stackcurrent + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + live: *stacklive + index: docs/index.asciidoc + chunk: 1 + tags: Clients/PHP + subject: Clients + sources: + - + repo: elasticsearch-php + path: docs/ + - + repo: docs + path: shared/attributes.asciidoc + - title: Perl Client + prefix: perl-api + current: master + branches: [ master, 8.x, 7.x ] + live: [ master, 8.x, 7.x ] + index: docs/index.asciidoc + chunk: 1 + tags: Clients/Perl + subject: Clients + sources: + - + repo: elasticsearch-perl + path: docs/ + - title: Python Client + prefix: python-api + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: docs/guide/index.asciidoc + chunk: 1 + tags: Clients/Python + subject: Clients + sources: + - + repo: elasticsearch-py + path: docs/guide/ + - title: eland + prefix: eland + current: main + branches: [ {main: master} ] + live: [ main ] + index: docs/guide/index.asciidoc + chunk: 1 + tags: Clients/eland + subject: Clients + sources: + - + repo: eland + path: docs/guide + - title: Rust Client + prefix: rust-api + current: main + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + live: [ main, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ] + index: docs/index.asciidoc + chunk: 1 + tags: Clients/Rust + subject: Clients + sources: + - + repo: elasticsearch-rs + path: docs/ + - title: Java REST Client (deprecated) + prefix: java-rest + current: 7.17 + branches: [ 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: [ 7.17, 6.8 ] + index: docs/java-rest/index.asciidoc + tags: Clients/JavaREST + subject: Clients + chunk: 1 + sources: + - + repo: elasticsearch + path: docs/java-rest + - + repo: elasticsearch + path: docs/Versions.asciidoc + - + repo: elasticsearch + path: client + exclude_branches: [ 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - title: Java Transport Client (deprecated) + prefix: java-api + current: 7.17 + branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + live: [7.17, 6.8] + index: docs/java-api/index.asciidoc + tags: Clients/Java + subject: Clients + chunk: 1 + sources: + - + repo: elasticsearch + path: docs/java-api + - + repo: elasticsearch + path: docs/Versions.asciidoc + exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: client/rest-high-level/src/test/java/org/elasticsearch/client + exclude_branches: [ 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + + - + repo: elasticsearch + path: server/src/internalClusterTest/java/org/elasticsearch/client/documentation + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: server/src/test/java/org/elasticsearch/client/documentation + exclude_branches: [ 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: modules/reindex/src/test/java/org/elasticsearch/client/documentation + exclude_branches: [ 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + + - title: Community Contributed Clients + prefix: community + branches: [{main: master}] + current: main + index: docs/community-clients/index.asciidoc + single: 1 + tags: Clients/Community + subject: Clients + sources: + - + repo: elasticsearch + path: docs/community-clients + - title: Elasticsearch for Apache Hadoop and Spark + prefix: en/elasticsearch/hadoop + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + index: docs/src/reference/asciidoc/index.adoc + tags: Elasticsearch/Apache Hadoop + subject: Elasticsearch + sources: + - + repo: elasticsearch-hadoop + path: docs/src/reference/asciidoc + - title: Elasticsearch Relevance Engine (ESRE) + prefix: en/esre + index: esre-docs/index.asciidoc + private: 1 + current: *stackcurrent + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8 ] + live: [ 8.10 ] + chunk: 1 + tags: ESRE/Guide + subject: ESRE + sources: + - + repo: enterprise-search-pubs + path: esre-docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - title: Glossary + prefix: en/elastic-stack-glossary + current: main + index: docs/en/glossary/index.asciidoc + branches: [ {main: master} ] + tags: Elastic Stack/Glossary + subject: Elastic Stack + sources: + - + repo: stack-docs + path: docs/en + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Installation and Upgrade Guide + prefix: en/elastic-stack + current: *stackcurrent + index: docs/en/install-upgrade/index.asciidoc + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Elastic Stack/Installation and Upgrade + subject: Elastic Stack + sources: + - + repo: stack-docs + path: docs/en + - + repo: apm-server + path: docs/ + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: beats + path: libbeat/docs + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: elasticsearch + path: docs/ + - + repo: elasticsearch-hadoop + path: docs/src/reference/asciidoc + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: security-docs + path: docs/ + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: kibana + path: docs/ + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: logstash + path: docs/ + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: observability-docs + path: docs/en/observability + exclude_branches: [ main, 8.11, 8.10, 8.9, 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 ] + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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/attributes.asciidoc + exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + - + repo: docs + path: shared/attributes62.asciidoc + exclude_branches: [ main, 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, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + - title: Kibana Guide + prefix: en/kibana + current: *stackcurrent + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + live: *stacklive + index: docs/index.x.asciidoc + chunk: 1 + tags: Kibana/Reference + subject: Kibana + toc_extra: extra/kibana_landing.html + sources: + - + repo: kibana + path: docs/ + - + repo: x-pack-kibana + prefix: kibana-extra/x-pack-kibana + path: docs/en + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: docs + path: shared/attributes62.asciidoc + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: docs + path: shared/legacy-attrs.asciidoc + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + - + repo: kibana + # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) + path: ":(glob)examples/**/*.asciidoc" + exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: kibana + path: ":(glob)src/**/*.asciidoc" + exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - + repo: kibana + path: ":(glob)x-pack/**/*.asciidoc" + exclude_branches: [ 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + - title: Machine Learning + prefix: en/machine-learning + current: *stackcurrent + index: docs/en/stack/ml/index.asciidoc + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Elastic Stack/Machine Learning + subject: Machine Learning + sources: + - + repo: stack-docs + path: docs/en/stack + - + repo: elasticsearch + path: docs + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - + repo: docs + path: shared/settings.asciidoc + - title: Painless Scripting Language + prefix: en/elasticsearch/painless + current: *stackcurrent + branches: [ {main: master}, 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] + live: *stacklive + index: docs/painless/index.asciidoc + chunk: 1 + tags: Elasticsearch/Painless + subject: Elasticsearch + sources: + - + repo: elasticsearch + path: docs/painless + - + repo: elasticsearch + path: docs/Versions.asciidoc + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - title: Plugins and Integrations + prefix: en/elasticsearch/plugins + repo: elasticsearch + current: *stackcurrent + index: docs/plugins/index.asciidoc + branches: [ {main: master}, 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, 1.7 ] + live: *stacklive + chunk: 2 + tags: Elasticsearch/Plugins + subject: Elasticsearch + sources: + - + repo: elasticsearch + path: docs/plugins + - + repo: elasticsearch + path: docs/Versions.asciidoc + exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: buildSrc/src/main/resources/ + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: build-tools-internal/src/main/resources/ + exclude_branches: [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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: elasticsearch + path: build-tools/src/main/resources/ + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + - title: "Starting with the Elasticsearch Platform and its Solutions" + prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions + current: *stackcurrent + index: welcome-to-elastic/index.asciidoc + branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + live: [ 8.10 ] + chunk: 1 + tags: Elastic/Starting with the Elasticsearch Platform and its Solutions + subject: Starting with the Elasticsearch Platform and its Solutions + sources: + - + repo: tech-content + path: welcome-to-elastic + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + + - title: "Ingest: Add your data" + sections: + - title: Auditbeat Reference + prefix: en/beats/auditbeat + index: auditbeat/docs/index.asciidoc + current: *stackcurrent + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Auditbeat/Reference + respect_edit_url_overrides: true + subject: Auditbeat + sources: + - + repo: beats + path: auditbeat + - + repo: beats + path: auditbeat/docs + - + repo: beats + path: x-pack/auditbeat + exclude_branches: [ 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ] + - + repo: beats + path: auditbeat/module + - + repo: beats + path: auditbeat/scripts + - + repo: beats + path: CHANGELOG.asciidoc + - + repo: beats + path: libbeat/docs + - + repo: beats + path: libbeat/processors/*/docs/* + exclude_branches: *beatsProcessorExclude + - + repo: beats + path: x-pack/libbeat/processors/*/docs/* + exclude_branches: [ 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 ] + - + repo: beats + path: libbeat/outputs/*/docs/* + exclude_branches: *beatsOutputExclude + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: *beatsSharedExclude + - title: Beats Developer Guide + prefix: en/beats/devguide + index: docs/devguide/index.asciidoc + current: main + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Devguide/Reference + subject: Beats + respect_edit_url_overrides: true + sources: + - + repo: beats + path: docs + - + repo: beats + path: libbeat/docs + - + repo: beats + path: metricbeat/module + - + repo: beats + path: metricbeat/scripts + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: *beatsSharedExclude + - title: Beats Platform Reference + prefix: en/beats/libbeat + index: libbeat/docs/index.asciidoc + current: *stackcurrent + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive - index: docs/index.asciidoc chunk: 1 - tags: Security/Guide - subject: Security + tags: Libbeat/Reference + subject: libbeat + respect_edit_url_overrides: true sources: - - repo: security-docs - path: docs + repo: beats + path: libbeat/docs + - + repo: beats + path: CHANGELOG.asciidoc - repo: docs path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude - repo: docs path: shared/attributes.asciidoc + exclude_branches: *beatsSharedExclude + - title: Elastic Ingest Reference Architectures + prefix: en/ingest + current: *stackcurrent + index: docs/en/ingest-arch/index.asciidoc + branches: [ {main: master}, 8.11, 8.10, 8.9 ] + live: [ 8.11 ] + chunk: 1 + tags: Ingest/Reference + subject: Ingest + sources: - - repo: stack-docs + repo: ingest-docs path: docs/en - - title: SIEM Guide - prefix: en/siem/guide - current: 7.8 - branches: [ 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] - live: [ 7.8 ] - index: docs/en/siem/index.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Elastic Logging Plugin for Docker + prefix: en/beats/loggingplugin + current: *stackcurrent + index: x-pack/dockerlogbeat/docs/index.asciidoc + branches: [ {main: master}, 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 ] chunk: 1 - tags: SIEM/Guide - subject: SIEM + tags: Elastic Logging Plugin/Reference + respect_edit_url_overrides: true + subject: Elastic Logging Plugin sources: - - repo: stack-docs - path: docs/en + repo: beats + path: x-pack/dockerlogbeat/docs + - + repo: beats + path: libbeat/docs - repo: docs path: shared/versions/stack/{version}.asciidoc - repo: docs path: shared/attributes.asciidoc - - - - title: "Logstash: Collect, Enrich, and Transport" - sections: - - title: Logstash Reference - prefix: en/logstash + - title: Filebeat Reference + prefix: en/beats/filebeat + index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive - index: docs/index.x.asciidoc chunk: 1 - tags: Logstash/Reference - subject: Logstash + tags: Filebeat/Reference respect_edit_url_overrides: true + subject: Filebeat sources: - - repo: logstash - path: docs/ + repo: beats + path: filebeat - - repo: x-pack-logstash - prefix: logstash-extra/x-pack-logstash - path: docs/en - private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + repo: beats + path: filebeat/docs - - repo: logstash-docs - path: docs/ + repo: beats + path: x-pack/filebeat/docs + exclude_branches: [ 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 ] - - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: [ 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, 1.5 ] + repo: beats + path: x-pack/libbeat/docs + exclude_branches: *beatsXpackLibbeatExclude - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: [ 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, 1.5 ] + repo: beats + path: CHANGELOG.asciidoc - - repo: docs - path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + repo: beats + path: libbeat/docs - - repo: docs - path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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 Versioned Plugin Reference - prefix: en/logstash-versioned-plugins - current: versioned_plugin_docs - branches: [ versioned_plugin_docs ] - index: docs/versioned-plugins/index.asciidoc - private: 1 - chunk: 1 - noindex: 1 - tags: Logstash/Plugin Reference - subject: Logstash - sources: + repo: beats + path: libbeat/processors/*/docs/* + exclude_branches: *beatsProcessorExclude - - repo: logstash-docs - path: docs/versioned-plugins + repo: beats + path: x-pack/filebeat/processors/*/docs/* + exclude_branches: *beatsProcessorExclude + - + repo: beats + path: x-pack/libbeat/processors/*/docs/* + exclude_branches: [ 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 ] + - + repo: beats + path: libbeat/outputs/*/docs/* + exclude_branches: *beatsOutputExclude + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude - repo: docs path: shared/attributes.asciidoc - - - title: "Fleet: Install and Manage Elastic Agents" - sections: + exclude_branches: *beatsSharedExclude - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent @@ -1822,8 +1690,54 @@ contents: - repo: apm-server path: docs - exclude_branches: [ 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 ] - + exclude_branches: [ 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 ] + - title: Heartbeat Reference + prefix: en/beats/heartbeat + current: *stackcurrent + index: heartbeat/docs/index.asciidoc + branches: [ {main: master}, 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 ] + live: *stacklive + chunk: 1 + tags: Heartbeat/Reference + respect_edit_url_overrides: true + subject: Heartbeat + sources: + - + repo: beats + path: heartbeat + - + repo: beats + path: heartbeat/docs + - + repo: beats + path: CHANGELOG.asciidoc + - + repo: beats + path: libbeat/docs + - + repo: beats + path: x-pack/libbeat/docs + exclude_branches: *beatsXpackLibbeatExclude + - + repo: beats + path: libbeat/processors/*/docs/* + exclude_branches: *beatsProcessorExclude + - + repo: beats + path: x-pack/libbeat/processors/*/docs/* + exclude_branches: [ 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 ] + - + repo: beats + path: libbeat/outputs/*/docs/* + exclude_branches: *beatsOutputExclude + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude + - + repo: docs + path: shared/attributes.asciidoc + exclude_branches: *beatsSharedExclude - title: Integrations Developer Guide prefix: en/integrations-developer current: main @@ -1849,103 +1763,109 @@ contents: - repo: package-spec path: spec - - - title: "Cloud Native: Ship Data from Your Cloud Provider" - sections: - - title: Elastic Serverless Forwarder Guide - prefix: en/esf - index: docs/en/index.asciidoc - current: main - branches: [ {main: master} ] - live: [ main ] - chunk: 2 - tags: Cloud Native Ingest/Reference - subject: cloud native ingest + - title: Logstash Reference + prefix: en/logstash + current: *stackcurrent + branches: [ {main: master}, 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, 1.5 ] + live: *stacklive + index: docs/index.x.asciidoc + chunk: 1 + tags: Logstash/Reference + subject: Logstash + respect_edit_url_overrides: true sources: - - repo: esf + repo: logstash + path: docs/ + - + repo: x-pack-logstash + prefix: logstash-extra/x-pack-logstash path: docs/en + private: true + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + - + repo: logstash-docs + path: docs/ - repo: docs path: shared/versions/stack/{version}.asciidoc + exclude_branches: [ 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, 1.5 ] - repo: docs path: shared/attributes.asciidoc - - - title: Amazon Kinesis Data Firehose Ingest Guide - prefix: en/kinesis - index: docs/en/aws-firehose/index.asciidoc + exclude_branches: [ 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, 1.5 ] + - + repo: docs + path: shared/attributes62.asciidoc + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + - + repo: docs + path: shared/legacy-attrs.asciidoc + exclude_branches: [ main, 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 and Kubernetes + prefix: en/logstash-kubernetes current: main + index: docsk8s/index.asciidoc branches: [ {main: master} ] - live: [ main ] + noindex: 1 chunk: 1 - tags: Cloud Native Ingest/Reference - subject: cloud native ingest + tags: Logstash/Kubernetes + subject: Logstash sources: - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc + repo: logstash + path: docsk8s - repo: docs path: shared/attributes.asciidoc - - - title: "Beats: Collect, Parse, and Ship" - sections: - - title: Beats Platform Reference - prefix: en/beats/libbeat - index: libbeat/docs/index.asciidoc - current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] - live: *stacklive + - title: Logstash Versioned Plugin Reference + prefix: en/logstash-versioned-plugins + current: versioned_plugin_docs + branches: [ versioned_plugin_docs ] + index: docs/versioned-plugins/index.asciidoc + private: 1 chunk: 1 - tags: Libbeat/Reference - subject: libbeat - respect_edit_url_overrides: true + noindex: 1 + tags: Logstash/Plugin Reference + subject: Logstash sources: - - repo: beats - path: libbeat/docs - - - repo: beats - path: CHANGELOG.asciidoc - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude + repo: logstash-docs + path: docs/versioned-plugins - repo: docs path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Auditbeat Reference - prefix: en/beats/auditbeat - index: auditbeat/docs/index.asciidoc + - title: Metricbeat Reference + prefix: en/beats/metricbeat + index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 - tags: Auditbeat/Reference + tags: Metricbeat/Reference respect_edit_url_overrides: true - subject: Auditbeat + subject: Metricbeat sources: - repo: beats - path: auditbeat + path: metricbeat - repo: beats - path: auditbeat/docs + path: metricbeat/docs - repo: beats - path: x-pack/auditbeat - exclude_branches: [ 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ] + path: metricbeat/module - repo: beats - path: auditbeat/module + path: x-pack/libbeat/docs + exclude_branches: *beatsXpackLibbeatExclude - repo: beats - path: auditbeat/scripts + path: x-pack/metricbeat/module + 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 ] + - + repo: beats + path: metricbeat/scripts - repo: beats path: CHANGELOG.asciidoc @@ -1972,31 +1892,23 @@ contents: repo: docs path: shared/attributes.asciidoc exclude_branches: *beatsSharedExclude - - title: Filebeat Reference - prefix: en/beats/filebeat - index: filebeat/docs/index.asciidoc + - title: Packetbeat Reference + prefix: en/beats/packetbeat + index: packetbeat/docs/index.asciidoc current: *stackcurrent branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 - tags: Filebeat/Reference + tags: Packetbeat/Reference respect_edit_url_overrides: true - subject: Filebeat + subject: Packetbeat sources: - repo: beats - path: filebeat - - - repo: beats - path: filebeat/docs - - - repo: beats - path: x-pack/filebeat/docs - exclude_branches: [ 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 ] + path: packetbeat - repo: beats - path: x-pack/libbeat/docs - exclude_branches: *beatsXpackLibbeatExclude + path: packetbeat/docs - repo: beats path: CHANGELOG.asciidoc @@ -2007,10 +1919,6 @@ contents: repo: beats path: libbeat/processors/*/docs/* exclude_branches: *beatsProcessorExclude - - - repo: beats - path: x-pack/filebeat/processors/*/docs/* - exclude_branches: *beatsProcessorExclude - repo: beats path: x-pack/libbeat/processors/*/docs/* @@ -2027,23 +1935,23 @@ contents: repo: docs path: shared/attributes.asciidoc exclude_branches: *beatsSharedExclude - - title: Functionbeat Reference - prefix: en/beats/functionbeat + - title: Winlogbeat Reference + prefix: en/beats/winlogbeat + index: winlogbeat/docs/index.asciidoc current: *stackcurrent - index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 - tags: Functionbeat/Reference + tags: Winlogbeat/Reference respect_edit_url_overrides: true - subject: Functionbeat + subject: Winlogbeat sources: - repo: beats - path: x-pack/functionbeat + path: winlogbeat - repo: beats - path: x-pack/functionbeat/docs + path: winlogbeat/docs - repo: beats path: CHANGELOG.asciidoc @@ -2065,181 +1973,344 @@ contents: - repo: docs path: shared/versions/stack/{version}.asciidoc + exclude_branches: *beatsSharedExclude - repo: docs path: shared/attributes.asciidoc + exclude_branches: *beatsSharedExclude + + - title: "Cloud: Provision, Manage and Monitor the Elastic Stack" + sections: + - title: Amazon Kinesis Data Firehose Ingest Guide + prefix: en/kinesis + index: docs/en/aws-firehose/index.asciidoc + current: main + branches: [ {main: master} ] + live: [ main ] + chunk: 1 + tags: Cloud Native Ingest/Reference + subject: cloud native ingest + sources: - - repo: beats - path: x-pack/libbeat/docs - exclude_branches: *beatsXpackLibbeatExclude + repo: observability-docs + path: docs/en - - repo: beats - path: filebeat/docs - exclude_branches: [ 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 ] - - title: Heartbeat Reference - prefix: en/beats/heartbeat - current: *stackcurrent - index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] - live: *stacklive + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Elasticsearch Add-On for Heroku - Hosted Elasticsearch and Kibana for Heroku Users + prefix: en/cloud-heroku + tags: Cloud-Heroku/Reference + subject: Elasticsearch Add-On for Heroku + current: *cloudSaasCurrent + branches: [ { *cloudSaasCurrent : latest} ] + index: docs/heroku/index.asciidoc chunk: 1 - tags: Heartbeat/Reference - respect_edit_url_overrides: true - subject: Heartbeat + noindex: 1 + private: 1 sources: - - repo: beats - path: heartbeat + repo: cloud + path: docs/saas + - + repo: cloud + path: docs/shared + - + repo: cloud + path: docs/heroku + - title: Elastic Cloud Enterprise - Elastic Cloud on your Infrastructure + prefix: en/cloud-enterprise + tags: CloudEnterprise/Reference + subject: ECE + current: ms-92 + live: + - ms-92 + - ms-81 + - ms-78 + - ms-75 + - ms-72 + - ms-70 + - ms-69 + branches: + - ms-92: 3.6 + - ms-81: 3.5 + - ms-78: 3.4 + - ms-75: 3.3 + - ms-72: 3.2 + - ms-70: 3.1 + - ms-69: 3.0 + - ms-65: 2.13 + - ms-62: 2.12 + - ms-59: 2.11 + - ms-57: 2.10 + - ms-53: 2.9 + - ms-49: 2.8 + - ms-47: 2.7 + - release-ms-41: 2.6 + - 2.5 + - 2.4 + - 2.3 + - 2.2 + - 2.1 + - 2.0 + - 1.1 + - 1.0 + index: docs/cloud-enterprise/index.asciidoc + chunk: 2 + private: 1 + sources: + - + repo: cloud + # Grab the entire docs/ directory to get `ece-version.asciidoc` + path: docs + - + repo: cloud + path: docs/shared + exclude_branches: [ 1.0 ] + - + repo: cloud-assets + path: docs + map_branches: + ms-92: master + ms-81: master + ms-78: master + ms-75: master + ms-72: master + ms-70: master + ms-69: master + ms-65: master + ms-62: master + ms-59: master + ms-57: master + ms-53: master + ms-49: master + ms-47: master + release-ms-41: master + 2.5: master + 2.4: master + 2.3: master + 2.2: master + 2.1: master + 2.0: master + 1.1: master + 1.0: master + - + alternatives: { source_lang: console, alternative_lang: php } + repo: clients-team + path: docs/examples/elastic-cloud/php + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: heartbeat/docs + alternatives: { source_lang: console, alternative_lang: go } + repo: clients-team + path: docs/examples/elastic-cloud/go + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: CHANGELOG.asciidoc + alternatives: { source_lang: console, alternative_lang: ruby } + repo: clients-team + path: docs/examples/elastic-cloud/ruby + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: libbeat/docs + alternatives: { source_lang: console, alternative_lang: java } + repo: clients-team + path: docs/examples/elastic-cloud/java + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: x-pack/libbeat/docs - exclude_branches: *beatsXpackLibbeatExclude + alternatives: { source_lang: console, alternative_lang: javascript } + repo: clients-team + path: docs/examples/elastic-cloud/javascript + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: libbeat/processors/*/docs/* - exclude_branches: *beatsProcessorExclude + alternatives: { source_lang: console, alternative_lang: python } + repo: clients-team + path: docs/examples/elastic-cloud/python + map_branches: *mapCloudEceToClientsTeam - - repo: beats - path: x-pack/libbeat/processors/*/docs/* - exclude_branches: [ 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 ] + alternatives: { source_lang: console, alternative_lang: csharp } + repo: clients-team + path: docs/examples/elastic-cloud/csharp + map_branches: *mapCloudEceToClientsTeam + - title: Elastic Cloud on Kubernetes + prefix: en/cloud-on-k8s + tags: Kubernetes/Reference + subject: ECK + current: 2.10 + branches: [ {main: master}, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + index: docs/index.asciidoc + chunk: 1 + sources: - - repo: beats - path: libbeat/outputs/*/docs/* - exclude_branches: *beatsOutputExclude + repo: cloud-on-k8s + path: docs/ - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude + path: shared/versions/stack/current.asciidoc + exclude_branches: [ 0.9, 0.8 ] - repo: docs path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Metricbeat Reference - prefix: en/beats/metricbeat - index: metricbeat/docs/index.asciidoc - current: *stackcurrent - branches: [ {main: master}, 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 ] - live: *stacklive + - title: Elastic Cloud Control - The Command-Line Interface for Elasticsearch Service and ECE + prefix: en/ecctl + tags: CloudControl/Reference + subject: ECCTL + current: 1.11 + branches: [ master, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + index: docs/index.asciidoc chunk: 1 - tags: Metricbeat/Reference - respect_edit_url_overrides: true - subject: Metricbeat sources: - - repo: beats - path: metricbeat - - - repo: beats - path: metricbeat/docs - - - repo: beats - path: metricbeat/module - - - repo: beats - path: x-pack/libbeat/docs - exclude_branches: *beatsXpackLibbeatExclude + repo: ecctl + path: docs/ + - title: Elastic Cloud Terraform Provider + prefix: en/tpec + tags: CloudTerraform/Reference + subject: TPEC + current: 0.2 + branches: [ master, 0.2, 0.1 ] + index: docs-elastic/index.asciidoc + single: 1 + chunk: 1 + sources: - - repo: beats - path: x-pack/metricbeat/module - 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 ] + repo: terraform-provider-ec + path: docs-elastic/ + - title: Elastic Serverless Forwarder Guide + prefix: en/esf + index: docs/en/index.asciidoc + current: main + branches: [ {main: master} ] + live: [ main ] + chunk: 2 + tags: Cloud Native Ingest/Reference + subject: cloud native ingest + sources: - - repo: beats - path: metricbeat/scripts + repo: esf + path: docs/en - - repo: beats - path: CHANGELOG.asciidoc + repo: docs + path: shared/versions/stack/{version}.asciidoc - - repo: beats - path: libbeat/docs + repo: docs + path: shared/attributes.asciidoc + - title: Elasticsearch Service - Hosted Elastic Stack + prefix: en/cloud + tags: Cloud/Reference + subject: Elastic Cloud + current: *cloudSaasCurrent + branches: [ { *cloudSaasCurrent : latest} ] + index: docs/saas/index.asciidoc + chunk: 1 + private: 1 + sources: - - repo: beats - path: libbeat/processors/*/docs/* - exclude_branches: *beatsProcessorExclude + repo: cloud + path: docs/saas - - repo: beats - path: x-pack/libbeat/processors/*/docs/* - exclude_branches: [ 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 ] + repo: cloud + path: docs/shared + + - title: Legacy Documentation + sections: + - title: Elastic Stack and Google Cloud's Anthos + prefix: en/elastic-stack-gke + current: main + index: docs/en/gke-on-prem/index.asciidoc + branches: [ {main: master} ] + private: 1 + noindex: 1 + chunk: 1 + tags: Elastic Stack/Google + subject: Elastic Stack + sources: - - repo: beats - path: libbeat/outputs/*/docs/* - exclude_branches: *beatsOutputExclude + repo: stack-docs + path: docs/en/gke-on-prem - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude - repo: docs path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Packetbeat Reference - prefix: en/beats/packetbeat - index: packetbeat/docs/index.asciidoc - current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] - live: *stacklive + + - title: Elasticsearch - The Definitive Guide + prefix: en/elasticsearch/guide + current: 2.x + branches: [ master, 2.x, 1.x ] + index: book.asciidoc chunk: 1 - tags: Packetbeat/Reference - respect_edit_url_overrides: true - subject: Packetbeat + noindex: 1 + private: 1 + tags: Legacy/Elasticsearch/Definitive Guide + subject: Elasticsearch + suppress_migration_warnings: true sources: - - repo: beats - path: packetbeat - - - repo: beats - path: packetbeat/docs - - - repo: beats - path: CHANGELOG.asciidoc - - - repo: beats - path: libbeat/docs + repo: guide + path: / - - repo: beats - path: libbeat/processors/*/docs/* - exclude_branches: *beatsProcessorExclude + repo: docs + path: shared/legacy-attrs.asciidoc + exclude_branches: [ master, 2.x] + + - title: Elasticsearch Resiliency Status + prefix: en/elasticsearch/resiliency + toc: 1 + branches: [{main: master}] + current: main + index: docs/resiliency/index.asciidoc + single: 1 + tags: Elasticsearch/Resiliency Status + subject: Elasticsearch + sources: - - repo: beats - path: x-pack/libbeat/processors/*/docs/* - exclude_branches: [ 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 ] + repo: elasticsearch + path: docs/resiliency - - repo: beats - path: libbeat/outputs/*/docs/* - exclude_branches: *beatsOutputExclude + repo: elasticsearch + path: docs/Versions.asciidoc - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: docs path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Winlogbeat Reference - prefix: en/beats/winlogbeat - index: winlogbeat/docs/index.asciidoc + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + + - title: Elasticsearch.js for 5.6-7.6 + prefix: en/elasticsearch/client/elasticsearch-js + current: 16.x + branches: [ 16.x ] + index: docs/index.asciidoc + chunk: 1 + private: 1 + noindex: 1 + tags: Legacy/Clients/Elasticsearch-js + subject: Clients + sources: + - + repo: elasticsearch-js-legacy + path: docs + + - title: Functionbeat Reference + prefix: en/beats/functionbeat current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + index: x-pack/functionbeat/docs/index.asciidoc + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 - tags: Winlogbeat/Reference + tags: Functionbeat/Reference respect_edit_url_overrides: true - subject: Winlogbeat + subject: Functionbeat sources: - repo: beats - path: winlogbeat + path: x-pack/functionbeat - repo: beats - path: winlogbeat/docs + path: x-pack/functionbeat/docs - repo: beats path: CHANGELOG.asciidoc @@ -2261,86 +2332,18 @@ contents: - repo: docs path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude - - - repo: docs - path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Beats Developer Guide - prefix: en/beats/devguide - index: docs/devguide/index.asciidoc - current: main - branches: [ {main: master}, 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 ] - live: *stacklive - chunk: 1 - tags: Devguide/Reference - subject: Beats - respect_edit_url_overrides: true - sources: - - - repo: beats - path: docs - - - repo: beats - path: libbeat/docs - - - repo: beats - path: metricbeat/module - - - repo: beats - path: metricbeat/scripts - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - exclude_branches: *beatsSharedExclude - repo: docs path: shared/attributes.asciidoc - exclude_branches: *beatsSharedExclude - - title: Elastic Logging Plugin for Docker - prefix: en/beats/loggingplugin - current: *stackcurrent - index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] - chunk: 1 - tags: Elastic Logging Plugin/Reference - respect_edit_url_overrides: true - subject: Elastic Logging Plugin - sources: - repo: beats - path: x-pack/dockerlogbeat/docs + path: x-pack/libbeat/docs + exclude_branches: *beatsXpackLibbeatExclude - repo: beats - path: libbeat/docs - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - - title: Docs in Development - sections: - - title: Logstash and Kubernetes - prefix: en/logstash-kubernetes - current: main - index: docsk8s/index.asciidoc - branches: [ {main: master} ] - noindex: 1 - chunk: 1 - tags: Logstash/Kubernetes - subject: Logstash - sources: - - - repo: logstash - path: docsk8s - - - repo: docs - path: shared/attributes.asciidoc + path: filebeat/docs + exclude_branches: [ 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 ] - - title: Legacy Documentation - sections: - title: Getting Started prefix: en/elastic-stack-get-started current: 8.2 @@ -2366,26 +2369,63 @@ contents: path: docs/ exclude_branches: [ 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 ] - - title: Elastic Stack and Google Cloud's Anthos - prefix: en/elastic-stack-gke - current: main - index: docs/en/gke-on-prem/index.asciidoc - branches: [ {main: master} ] + - title: Graph Reference for 2.x + prefix: en/graph + repo: x-pack + chunk: 1 + private: 1 + noindex: 1 + tags: Legacy/Graph/Reference + subject: Graph + current: 2.4 + index: docs/public/graph/index.asciidoc + branches: [ 2.4, 2.3 ] + sources: + - + repo: x-pack + path: docs/public/graph + - + repo: docs + path: shared/legacy-attrs.asciidoc + + - title: Groovy API + prefix: en/elasticsearch/client/groovy-api + current: 2.4 + branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + index: docs/groovy-api/index.asciidoc private: 1 noindex: 1 + tags: Legacy/Clients/Groovy + subject: Clients + sources: + - + repo: elasticsearch + path: docs/groovy-api + - + repo: elasticsearch + path: docs/Versions.asciidoc + exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + + - title: Infrastructure Monitoring Guide for 6.5-7.4 + prefix: en/infrastructure/guide + current: 7.4 + branches: [ 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ] + index: docs/en/infraops/index.asciidoc chunk: 1 - tags: Elastic Stack/Google - subject: Elastic Stack + private: 1 + tags: Infrastructure/Guide + subject: Infrastructure sources: - repo: stack-docs - path: docs/en/gke-on-prem + path: docs/en - repo: docs path: shared/versions/stack/{version}.asciidoc - repo: docs path: shared/attributes.asciidoc + - title: Journalbeat Reference for 6.5-7.15 prefix: en/beats/journalbeat current: 7.15 @@ -2426,164 +2466,63 @@ contents: - repo: docs path: shared/attributes.asciidoc - - title: Logs Monitoring Guide for 7.5-7.9 - prefix: en/logs/guide - current: 7.9 - branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] - index: docs/en/logs/index.asciidoc - chunk: 1 - private: 1 - tags: Logs/Guide - subject: Logs - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Metrics Monitoring Guide for 7.5-7.9 - prefix: en/metrics/guide - current: 7.9 - branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] - index: docs/en/metrics/index.asciidoc - chunk: 1 - private: 1 - tags: Metrics/Guide - subject: Metrics - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Uptime Monitoring Guide for 7.2-7.9 - prefix: en/uptime - current: 7.9 - branches: [ 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] - index: docs/en/uptime/index.asciidoc - chunk: 1 - private: 1 - tags: Uptime/Guide - subject: Uptime - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Infrastructure Monitoring Guide for 6.5-7.4 - prefix: en/infrastructure/guide - current: 7.4 - branches: [ 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ] - index: docs/en/infraops/index.asciidoc - chunk: 1 - private: 1 - tags: Infrastructure/Guide - subject: Infrastructure - sources: - - - repo: stack-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Stack Overview - prefix: en/elastic-stack-overview - current: 7.4 - index: docs/en/stack/index.asciidoc - branches: [ 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3 ] + + - title: Legacy APM Overview + prefix: get-started + index: docs/guide/index.asciidoc + current: 7.15 + branches: [ 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 ] chunk: 1 - noindex: 1 - tags: Legacy/Elastic Stack/Overview - subject: Elastic Stack + tags: APM Server/Reference + subject: APM sources: - - repo: stack-docs - path: docs/en/stack - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc + repo: apm-server + path: docs/guide - - repo: docs - path: shared/settings.asciidoc - - title: X-Pack Reference for 6.0-6.2 and 5.x - prefix: en/x-pack + repo: apm-server + path: docs + + - title: Legacy APM Server Reference + prefix: server + index: docs/index.asciidoc + current: 7.15 + branches: [ 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 ] chunk: 1 - private: 1 - noindex: 1 - tags: Legacy/XPack/Reference - current: 6.2 - subject: X-Pack - index: docs/en/index.asciidoc - branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + tags: APM Server/Reference + subject: APM sources: - - repo: x-pack - path: docs/en - - - repo: x-pack-kibana - prefix: kibana-extra/x-pack-kibana - path: docs/en - exclude_branches: [ master, 6.7, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0] + repo: apm-server + path: changelogs + exclude_branches: [ 6.0 ] - - repo: x-pack-elasticsearch - prefix: elasticsearch-extra/x-pack-elasticsearch - path: docs/en - exclude_branches: [ master, 6.7, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0] + repo: apm-server + path: docs - - repo: docs - path: shared/attributes62.asciidoc - exclude_branches: [ 5.4, 5.3, 5.2, 5.1, 5.0 ] - - title: Elasticsearch - The Definitive Guide - prefix: en/elasticsearch/guide - current: 2.x - branches: [ master, 2.x, 1.x ] - index: book.asciidoc + repo: apm-server + path: CHANGELOG.asciidoc + + - title: Logs Monitoring Guide for 7.5-7.9 + prefix: en/logs/guide + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] + index: docs/en/logs/index.asciidoc chunk: 1 - noindex: 1 private: 1 - tags: Legacy/Elasticsearch/Definitive Guide - subject: Elasticsearch - suppress_migration_warnings: true + tags: Logs/Guide + subject: Logs sources: - - repo: guide - path: / + repo: observability-docs + path: docs/en - repo: docs - path: shared/legacy-attrs.asciidoc - exclude_branches: [ master, 2.x] - - title: Sense Editor for 4.x - prefix: en/sense - current: master - branches: [ master ] - index: docs/index.asciidoc - noindex: 1 - private: 1 - tags: Legacy/Elasticsearch/Sense-Editor - subject: Sense - sources: + path: shared/versions/stack/{version}.asciidoc - - repo: sense - path: docs + repo: docs + path: shared/attributes.asciidoc + - title: Marvel Reference for 2.x and 1.x prefix: en/marvel chunk: 1 @@ -2602,41 +2541,27 @@ contents: repo: docs path: shared/legacy-attrs.asciidoc exclude_branches: [marvel-1.3] - - title: Shield Reference for 2.x and 1.x - prefix: en/shield + + - title: Metrics Monitoring Guide for 7.5-7.9 + prefix: en/metrics/guide + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] + index: docs/en/metrics/index.asciidoc chunk: 1 private: 1 - noindex: 1 - tags: Legacy/Shield/Reference - subject: Shield - current: 2.4 - index: docs/public/shield/index.asciidoc - branches: [2.4, 2.3, 2.2, 2.1, 2.0, {shield-1.3: 1.3}, {shield-1.2: 1.2}, {shield-1.1: 1.1}, {shield-1.0: 1.0}] + tags: Metrics/Guide + subject: Metrics sources: - - repo: x-pack - path: docs/public/shield + repo: observability-docs + path: docs/en - repo: docs - path: shared/legacy-attrs.asciidoc - exclude_branches: [shield-1.2, shield-1.1 , shield-1.0] - - title: Watcher Reference for 2.x and 1.x - prefix: en/watcher - chunk: 1 - private: 1 - noindex: 1 - tags: Legacy/Watcher/Reference - subject: Watcher - current: 2.4 - index: docs/public/watcher/index.asciidoc - branches: [2.4, 2.3, 2.2, 2.1, 2.0, {watcher-1.0: 1.0}] - sources: - - - repo: x-pack - path: docs/public/watcher + path: shared/versions/stack/{version}.asciidoc - repo: docs - path: shared/legacy-attrs.asciidoc + path: shared/attributes.asciidoc + - title: Reporting Reference for 2.x prefix: en/reporting chunk: 1 @@ -2651,41 +2576,74 @@ contents: - repo: x-pack path: docs/public/reporting - - title: Graph Reference for 2.x - prefix: en/graph - repo: x-pack + + - title: Sense Editor for 4.x + prefix: en/sense + current: master + branches: [ master ] + index: docs/index.asciidoc + noindex: 1 + private: 1 + tags: Legacy/Elasticsearch/Sense-Editor + subject: Sense + sources: + - + repo: sense + path: docs + + - title: Shield Reference for 2.x and 1.x + prefix: en/shield chunk: 1 private: 1 noindex: 1 - tags: Legacy/Graph/Reference - subject: Graph + tags: Legacy/Shield/Reference + subject: Shield current: 2.4 - index: docs/public/graph/index.asciidoc - branches: [ 2.4, 2.3 ] + index: docs/public/shield/index.asciidoc + branches: [2.4, 2.3, 2.2, 2.1, 2.0, {shield-1.3: 1.3}, {shield-1.2: 1.2}, {shield-1.1: 1.1}, {shield-1.0: 1.0}] sources: - repo: x-pack - path: docs/public/graph + path: docs/public/shield - repo: docs path: shared/legacy-attrs.asciidoc - - title: Groovy API - prefix: en/elasticsearch/client/groovy-api - current: 2.4 - branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - index: docs/groovy-api/index.asciidoc - private: 1 - noindex: 1 - tags: Legacy/Clients/Groovy - subject: Clients + exclude_branches: [shield-1.2, shield-1.1 , shield-1.0] + + - title: SIEM Guide + prefix: en/siem/guide + current: 7.8 + branches: [ 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] + live: [ 7.8 ] + index: docs/en/siem/index.asciidoc + chunk: 1 + tags: SIEM/Guide + subject: SIEM sources: - - repo: elasticsearch - path: docs/groovy-api + repo: stack-docs + path: docs/en - - repo: elasticsearch - path: docs/Versions.asciidoc - exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + + - title: Site Search Reference + prefix: en/swiftype/sitesearch + index: docs/sitesearch/index.asciidoc + private: 1 + current: master + branches: [ master ] + single: 1 + tags: Site Search/Reference + subject: Swiftype + sources: + - + repo: swiftype + path: docs + - title: Topbeat Reference prefix: en/beats/topbeat index: topbeat/docs/index.asciidoc @@ -2706,20 +2664,96 @@ contents: - repo: beats path: libbeat/docs - - title: Elasticsearch.js for 5.6-7.6 - prefix: en/elasticsearch/client/elasticsearch-js - current: 16.x - branches: [ 16.x ] - index: docs/index.asciidoc + + - title: Uptime Monitoring Guide for 7.2-7.9 + prefix: en/uptime + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] + index: docs/en/uptime/index.asciidoc + chunk: 1 + private: 1 + tags: Uptime/Guide + subject: Uptime + sources: + - + repo: observability-docs + path: docs/en + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + + - title: Stack Overview + prefix: en/elastic-stack-overview + current: 7.4 + index: docs/en/stack/index.asciidoc + branches: [ 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3 ] + chunk: 1 + noindex: 1 + tags: Legacy/Elastic Stack/Overview + subject: Elastic Stack + sources: + - + repo: stack-docs + path: docs/en/stack + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - + repo: docs + path: shared/settings.asciidoc + + - title: Watcher Reference for 2.x and 1.x + prefix: en/watcher chunk: 1 private: 1 noindex: 1 - tags: Legacy/Clients/Elasticsearch-js - subject: Clients + tags: Legacy/Watcher/Reference + subject: Watcher + current: 2.4 + index: docs/public/watcher/index.asciidoc + branches: [2.4, 2.3, 2.2, 2.1, 2.0, {watcher-1.0: 1.0}] sources: - - repo: elasticsearch-js-legacy - path: docs + repo: x-pack + path: docs/public/watcher + - + repo: docs + path: shared/legacy-attrs.asciidoc + + - title: X-Pack Reference for 6.0-6.2 and 5.x + prefix: en/x-pack + chunk: 1 + private: 1 + noindex: 1 + tags: Legacy/XPack/Reference + current: 6.2 + subject: X-Pack + index: docs/en/index.asciidoc + branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + sources: + - + repo: x-pack + path: docs/en + - + repo: x-pack-kibana + prefix: kibana-extra/x-pack-kibana + path: docs/en + exclude_branches: [ master, 6.7, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0] + - + repo: x-pack-elasticsearch + prefix: elasticsearch-extra/x-pack-elasticsearch + path: docs/en + exclude_branches: [ master, 6.7, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0] + - + repo: docs + path: shared/attributes62.asciidoc + exclude_branches: [ 5.4, 5.3, 5.2, 5.1, 5.0 ] - title: 简体中文 base_dir: cn diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 967d447b92431..dcbef044484cd 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -39,327 +39,670 @@ } @media (min-width:769px) { - .ul-col-md-2 { + .ul-col-md-2, div#content { columns: 2; -webkit-columns: 2; -moz-columns: 2; } } + + :root { + --color-white: #fff; + --color-light-ink: #535966; + --subnav-item-link-color: var(--color-light-ink); + --color-gray: #e6ebf2; + --color-lighter-gray: #f9fbfc; + --color-elastic-blue: #07c; + --color-heading: #343741; + --color-callout: #f5f7fa; + --color-dark-blue: #005a9e; + --button-primary-color: var(--color-white); + --button-primary-bg: var(--color-elastic-blue); + --button-primary-border-color: var(--color-elastic-blue); + --button-primary-hover-bg: var(--color-dark-blue); + --button-primary-hover-border-color: var(--color-dark-blue); + } + + html, + body { + overflow-x: hidden; + } + + #guide h1, + #guide h2, + #guide h3, + #guide h4, + #guide h5, + #guide h6 { + font-family: MierB, Inter, Arial, sans-serif; + color: var(--color-heading); + text-align: center; + } + + #guide h2 { + font-size: 40px; + font-weight: 500; + margin: 16px 0; + } + #guide h3 { + margin: 0; + font-weight: 400; + } + + #guide .patterns:before { + content: ""; + display: block; + top: 60px; + left: 0; + background: no-repeat url(https://images.contentstack.io/v3/assets/bltefdd0b53724fa2ce/blt8d8a47b0bda71e1e/60412d88c7198e3af48f726d/generic-top-left.svg); + background-size: 100%; + margin-left: -439px; + width: 560px; + height: 300px; + position: absolute; + } + + #guide .patterns:after { + content: ""; + background: no-repeat url(https://images.contentstack.io/v3/assets/bltefdd0b53724fa2ce/blt9f40c83ad2785983/6011c55b3e567f1011da3dce/generic-bottom-right.svg); + background-size: 100%; + width: 680px; + height: 400px; + display: block; + margin-left: auto; + position: absolute; + top: -96px; + right: -483px; + } + + #guide h1.title { + font-size: 48px; + font-weight: 500; + z-index: 10; + } + + #guide .container-fluid { + max-width: 1280px; + margin: 0 auto; + } + + #middle_col { + padding-top: 120px; + width: 100%; + max-width: 1280px; + flex: 0 0 auto; + } + + #right_col, + .titlepage hr { + display: none; + } + + #guide .subnavigation { + top: 00px; + border-bottom: 1px solid var(--color-gray); + z-index: 6; + background-color: var(--color-lighter-gray); + height: 60px; + line-height: 60px; + text-align: right; + position: absolute; + width: 100%; + } + + #guide .subnavigation p { + width: 100%; + max-width: 1280px; + margin: 0 -30px; + } + + #guide .subnavigation:before, + #guide .subnavigation:after { + content: ""; + position: absolute; + background-color: var(--color-lighter-gray); + border-bottom: 1px solid var(--color-gray); + top: 0; + bottom: 0; + width: 9999px; + } + + #guide .subnavigation:before { + right: 100%; + } + #guide .subnavigation:after { + left: 100%; + } + + #guide .legalnotice + div p a { + color: var(--subnav-item-link-color); + font-weight: 600; + font-size: 14px; + } + + #guide .tabs { + margin-bottom: 120px; + } + + #capability-tabs-container { + margin-top: 75px; + } + + #guide [role=tablist] { + margin: 0 auto 50px; + overflow: visible; + width: 350px; + text-align: center; + display: flex; + justify-content: center; + border-bottom: 1px solid var(--color-dark-gray); + } + + #guide [role=tab] { + border: none; + border-bottom: 4px solid transparent; + padding: 0.3em 0.8em 0.7em; + background: none; + font-weight: 700; + font-size: 16px; + font-family: MierB,Inter,Arial,sans-serif; + } + + #guide [role=tab][aria-selected=true] { + background: none; + border-bottom: 4px solid var(--color-elastic-blue); + color: var(--color-elastic-blue); + } + + #guide [role=tab][aria-selected=false]:hover { + border-bottom: 3px solid var(--color-heading); + cursor: pointer; + } + + #guide [role=tab][aria-selected=true]:not(:focus):not(:hover):before, + #guide [role=tab]:focus:before, + #guide [role=tab]:hover:before { + border-top: none; + } + + @keyframes onlyFadeIn { + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } + } + + #guide [role=tabpanel] { + padding: 0; + border: none; + background: none; + box-shadow: none; + -webkit-animation: onlyFadeIn 1s; + animation: onlyFadeIn 1s; + } + + #guide .card { + overflow: hidden; + border-radius: 10px; + padding: 32px; + -moz-transition: all 0.4s ease; + -webkit-transition: all 0.4s ease; + -o-transition: all 0.4s ease; + -ms-transition: all 0.4s ease; + transition: all 0.4s ease; + } + + #guide .card:hover { + padding: 32px; + -moz-box-shadow: 0px 5px 24px rgba(0, 0, 0, 0.12); + -webkit-box-shadow: 0px 5px 24px rgba(0, 0, 0, 0.12); + -o-box-shadow: 0px 5px 24px rgba(0, 0, 0, 0.12); + -ms-box-shadow: 0px 5px 24px rgba(0, 0, 0, 0.12); + box-shadow: 0px 5px 24px rgba(0, 0, 0, 0.12); + } + + #guide .card h3 { + text-align: left; + margin-bottom: 0; + padding-bottom: 0; + font-size: 28px; + } + + #guide .card span.button { + margin-top: 20px; + } + + #guide .card-border.card-border-top { + background-color: var(--color-elastic-blue); + position: absolute; + border-style: none; + border-width: 1px; + left: 0px; + top: 0px; + right: 0px; + bottom: auto; + height: 6px; + max-height: 6px; + } + + #guide .need-help { + padding-bottom: 50px; + max-width: 700px; + margin: 0 auto; + } + + #guide .need-help ul { + margin-left: 45px; + margin-top: 40px; + } + + #guide .marketing-callout { + background-color: var(--color-callout); + text-align: center; + padding: 80px 0 96px; + margin: 96px 0; + position: relative; + display: none; + } + + #guide .marketing-callout h2 { + padding: 0; + } + + #guide .marketing-callout a { + font-family: MierB,Inter,Arial,sans-serif; + font-size: 16px; + color: var(--button-primary-color); + background-color: var(--button-primary-bg); + border-color: var(--button-primary-border-color); + background-color: var(--button-primary-bg); + color: white; + font-weight: 600; + min-width: 200px; + min-height: 60px; + padding: 8px 24px; + text-align: center; + text-decoration: none; + box-shadow: none; + border: 2px solid; + border-radius: 6px; + -webkit-transition: all 100ms ease-in; + transition: all 100ms ease-in; + display: inline-block; + line-height: 40px; + margin-top: 10px; + } + + #guide .marketing-callout a:hover { + background-color: var(--button-primary-hover-bg); + border-color: var(--button-primary-hover-border-color); + text-decoration: none!important; + } + + #guide .marketing-callout:before, + #guide .marketing-callout:after { + content: ""; + position: absolute; + background-color: var(--color-callout); + top: 0; + bottom: 0; + width: 9999px; + } + + #guide .marketing-callout:before { + right: 100%; + } + #guide .marketing-callout:after { + left: 100%; + } + + div#content { + margin: 50px 0 60px; + } + + #guide div.docs-link-section { + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + break-inside: avoid; + margin-bottom: 60px; + } + + #guide div.docs-link-section h3 { + text-align: left; + font-size: 16px; + line-height: 22px; + letter-spacing: .12em; + text-transform: uppercase; + font-family: Inter, Arial, sans-serif; + font-weight: 600; + } + + #guide div.docs-link-section h3 .toggle-icon { + display: inline-block; + -webkit-transition: transform 0.2s ease-in-out; + transition: transform 0.2s ease-in-out; + transform: rotate(180deg); + position: relative; + left: 10px; + } + + #guide div.legacy-docs { + cursor: pointer; + } + + #guide div.docs-link-section.hidden h3 .toggle-icon { + transform: rotate(0); + } + + #guide div.legacy-docs.hidden div { + display: none; + } + + @media screen and (max-width: 992px) { + .guide-section { + padding-right:15px + } + #guide .need-help ul { + margin-left: 0; + } + } + + #feedbackWidget { + margin: 0 auto 50px; + border: none; + }
    -
    -
    -

    -

    Learn about Elastic

    -

    - Elastic provides flexible search, monitoring, and security solutions based on Elasticsearch. -

    -

    - All Elastic docs - Release docs - Videos & Webinars -

    -
    -
    -
    - -
    -
    + + +
    + +
    +
    + + +
    -

    The Elastic Stack

    -

    What exactly is the "Elastic Stack"? It’s a fast and highly scalable set of components — Elasticsearch, Kibana, Beats, Logstash, and others — that together enable you to securely take data from any source, in any format, and then search, analyze, and visualize it.

    - -
    - About the Elastic Stack components - -

    You can deploy the Elastic Stack as a Cloud service supported on AWS, Google Cloud, and Azure, or as an on-prem installation on your own hardware.

    - - - - - - Administer Visualize Alert Analyze - - Index Store Search Analyze - - Consolidate Transform Enrich - - Protect Collect Preprocess Ship - - - Elasticsearch clients - - Fleet and Elastic Agent - - - - - Logstash - - - - - Kibana - - - - - Elasticsearch ingest pipelines - - Elasticsearch - - Beats - - APM - - - - - Other queues and processors - - - - - Interfaces, applications, consumers, websites - - - - - Other shippers and sources - - Consume - - Store - - Ingest - - - - - - - - - - - - - Components of the Elastic Stack - - -

    Ingest

    -

    Elastic provides a number of components that ingest data. Collect and ship logs, metrics, and other types of data with Elastic Agent or Beats. Manage your Elastic Agents with Fleet. Collect detailed performance information with Elastic APM.

    -

    If you want to transform or enrich data before it’s stored, you can use Elasticsearch ingest pipelines or Logstash.

    -

    Trying to decide which ingest component to use? Refer to Adding data to Elasticsearch to help you decide.

    -
    -
    - Fleet and Elastic Agent -
    -
    -

    - Elastic Agent is a single, unified way to add monitoring for logs, metrics, and other types of data to a host. It can also protect hosts from security threats, query data from operating systems, forward data from remote services or hardware, and more. Each agent has a single policy to which you can add integrations for new data sources, security protections, and more. -

    -

    Fleet enables you to centrally manage Elastic Agents and their policies. Use Fleet to monitor the state of all your Elastic Agents, manage agent policies, and upgrade Elastic Agent binaries or integrations.

    -

    Learn more about Fleet and Elastic Agent.

    -
    -
    - APM -
    -
    - Elastic APM is an application performance monitoring system built on the Elastic Stack. It allows you to monitor software services and applications in real-time, by collecting detailed performance information on response time for incoming requests, database queries, calls to caches, external HTTP requests, and more. This makes it easy to pinpoint and fix performance problems quickly. Learn more about APM. -
    -
    - Beats -
    -
    - Beats are data shippers that you install as agents on your servers to send operational data to Elasticsearch. Beats are available for many standard observability data scenarios, including audit data, log files and journals, cloud data, availability, metrics, network traffic, and Windows event logs. Learn more about Beats. -
    -
    - Elasticsearch ingest pipelines -
    -
    - Ingest pipelines let you perform common transformations on your data before indexing them into Elasticsearch. You can configure one or more "processor" tasks to run sequentially, making specific changes to your documents before storing them in Elasticsearch. Learn more about ingest pipelines. -
    -
    - Logstash -
    -
    - Logstash is a data collection engine with real-time pipelining capabilities. It can dynamically unify data from disparate sources and normalize the data into destinations of your choice. Logstash supports a broad array of input, filter, and output plugins, with many native codecs further simplifying the ingestion process. Learn more about Logstash. -
    -
    - -

    Store

    -
    -
    - Elasticsearch -
    -
    - Elasticsearch is the distributed search and analytics engine at the heart of the Elastic Stack. It provides near real-time search and analytics for all types of data. Whether you have structured or unstructured text, numerical data, or geospatial data, Elasticsearch can efficiently store and index it in a way that supports fast searches. Elasticsearch provides a REST API that enables you to store data in Elasticsearch and retrieve it. The REST API also provides access to Elasticsearch’s search and analytics capabilities. Learn more about Elasticsearch. -
    -
    - -

    Consume

    -

    Use Kibana to query and visualize the data that’s stored in Elasticsearch. Or, use the Elasticsearch clients to access data in Elasticsearch directly from common programming languages.

    -
    -
    - Kibana -
    -
    - Kibana is the tool to harness your Elasticsearch data and to manage the Elastic Stack. Use it to analyze and visualize the data that’s stored in Elasticsearch. Kibana is also the home for the Elastic Enterprise Search, Elastic Observability and Elastic Security solutions. Learn more about Kibana. -
    -
    - Elasticsearch clients -
    -
    - The clients provide a convenient mechanism to manage API requests and responses to and from Elasticsearch from popular languages such as Java, Ruby, Go, Python, and others. Both official and community contributed clients are available. Learn more about the Elasticsearch clients. -
    -
    -
    - -

    Serverless projects

    -

    Create serverless projects for an autoscaled and fully-managed Elastic solution based on Elasticsearch, Observability, or Security. To learn more, check out the Serverless docs.

    - -

    Get started

    -

    New to Elastic? Learn how you can make the most of your data with the Elastic Stack. - Get hands-on with a solution and quickly see data in action, or start from a blank page.

    -
    -
    - -
    -

    +

    -

    Build custom applications with your data using Elasticsearch.

    -
    - -
    -
    - -
    -

    - - Observability -

    -

    Monitor hosts by collecting logs and metrics with Elastic Observability.

    -
    -     +

    + Search +

    +

    Build custom applications with your data using Elasticsearch.

    + + View Elasticsearch docs + + + + + +
    + +
    +
    + +
    +
    + + +

    + Observability +

    +

    Monitor applications and systems with Elastic Observability.

    + + View Observability docs + + + + + +
    +     +
    +
    + +
    +
    + + +

    + Security +

    +

    Detect, investigate, and respond to threats with Elastic Security.

    + + View Security docs + + + + + +
    +     +
    -
    - +
    + + -
    -
    - -
    -

    - - Security -

    -

    Protect hosts with endpoint threat intelligence from Elastic Security.

    +
    +
    + +
    +
    + +

    + Fleet and Elastic Agent +

    +

    A unified method to collect logs, metrics, and security data.

    + + View Fleet and Elastic Agent docs + + + + + +
    +
    - -
    -
    - -
    -

    - - Observe Kubernetes -

    -

    Monitor your Kubernetes infrastructure with Elastic Observability.

    +
    + +
    +
    + +

    + Beats +

    +

    Lightweight data shippers that send data to your cluster.

    + + View Beats docs + + + + + + +
    +     +
    +
    + +
    +
    + +

    + Integrations +

    +

    Integrations enable you to collect and connect your data with the Elastic Stack.

    + + View Integrations docs + + + + + +
    +
    - -
    -
    - -
    -

    - - Custom solution -

    -

    Deploy your own platform to store, search, and visualize any data.

    -
    -
    -
    -
    -

    - - Featured topics -

    + +
    -
    -
    -

    - - Subscribe -

    -
    - +

    ' + expect(converted).to include 'Section 1' end it 'includes a link to the abbreviated section' do expect(converted).to include <<~HTML.strip @@ -364,23 +359,15 @@ Words. ASCIIDOC end - context 'the title' do - it "doesn't include the subtitle" do - expect(converted).to include(<<~HTML) - Title | Elastic - - HTML - end - end context 'the header' do it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
    +

    Title

    Subtitle

    -
    HTML @@ -407,10 +394,10 @@ it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
    +

    foo

    -
    HTML @@ -495,64 +482,6 @@ end end end - context 'when the head is disabled' do - let(:convert_attributes) do - { - # Shrink the output slightly so it is easier to read - 'stylesheet!' => false, - # Disable the head - 'noheader' => true, - } - end - let(:input) do - <<~ASCIIDOC - = Title - - Words. - ASCIIDOC - end - context 'the header' do - it "doesn't contain the title h1" do - expect(converted).not_to include('Title') - end - end - context 'the body' do - it "doesn't have attributes" do - expect(converted).to include('') - end - it "doesn't include the 'book' wrapper" do - expect(converted).not_to include(<<~HTML) -
    - HTML - end - end - - context 'when there is a page-header' do - let(:convert_attributes) do - { - # Shrink the output slightly so it is easier to read - 'stylesheet!' => false, - 'noheader' => true, - 'page-header' => '
    ', - } - end - let(:input) do - <<~ASCIIDOC - = Title - - Words. - ASCIIDOC - end - context 'the header' do - it 'contains the page-header right after the body tag' do - expect(converted).not_to include <<~HTML - -
    - HTML - end - end - end - end context 'when the head is disabled' do let(:convert_attributes) do { @@ -634,9 +563,10 @@ end end it "is wrapped in docbook's funny titlepage" do + level = hlevel < 2 ? 2 : hlevel expect(converted).to include(<<~HTML)
    - #{title}#{xpack_tag} + #{title}#{xpack_tag}
    HTML end @@ -801,7 +731,7 @@ include_examples 'section basics', 'appendix', 1, '_foo', 'Appendix A: Foo' it "doesn't bump the h tags of sections within it" do - expect(converted).to include 'Bar' + expect(converted).to include 'Bar' end end end diff --git a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb index 884fac8a63a0d..7102aa0821309 100644 --- a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb +++ b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb @@ -195,7 +195,7 @@ end it 'uses the attributes for the header' do expect(converted).to include <<~HTML -

    Header

    +

    Header

    HTML end it 'uses the attributes outside of the header' do @@ -299,7 +299,7 @@ expect(converted).to eq <<~HTML
    -

    Example

    +

    Example

    @@ -340,7 +340,7 @@ expect(converted).to eq <<~HTML
    -

    Example

    +

    Example

    @@ -470,7 +470,7 @@ end it 'has the right offset' do expect(converted).to include <<~HTML -

    Target

    +

    Target

    HTML end end diff --git a/resources/web/docs_js/__tests__/docs.test.js b/resources/web/docs_js/__tests__/docs.test.js index 87ad943e037b4..4b862bf1e30b0 100644 --- a/resources/web/docs_js/__tests__/docs.test.js +++ b/resources/web/docs_js/__tests__/docs.test.js @@ -115,7 +115,7 @@ function describeInitHeaders(name, guideBody, onThisPageAssertions) { describe(name, () => { beforeEach(() => { document.body.innerHTML = dedent ` -
    +
    ${guideBody}
    @@ -142,28 +142,28 @@ describe('On This Page', () => { `; const oneSubsection = dedent ` ${onlyTitle} -

    +

    Near Realtime (NRT) -

    + `; const twoSubsections = dedent ` ${oneSubsection} -

    +

    Cluster -

    + `; const fourSubsections = dedent ` ${twoSubsections} -

    +

    Observability -

    -

    +

    +

    APM -

    + `; describeInitHeaders('for page with just a title', onlyTitle, () => { diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index.js index 6b180c4b2a3bd..ef684eaf67a8f 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index.js @@ -63,10 +63,10 @@ export function init_headers(sticky_content, lang_strings) { this_page.append('

    ' + lang_strings('On this page') + '

    '); var ul = $('
      ').appendTo(this_page); var items = 0; - var baseHeadingLevel = 0; - $('#guide a[id]:not([href])').each( - function(i, el) { + // Get all headings inside the main body of the doc + $('div#content a[id]:not([href])').each( + function(i) { // Make headers into real links for permalinks this.href = '#' + this.id; @@ -76,17 +76,11 @@ export function init_headers(sticky_content, lang_strings) { // Assume initial heading is an H1, but adjust if it's not let hLevel = 0; if ($(this).parent().is("h2")){ - hLevel = 1; + hLevel = 0; } else if ($(this).parent().is("h3")){ - hLevel = 2; + hLevel = 1; } else if ($(this).parent().is("h4")){ - hLevel = 3; - } - - // Set the base heading level for the page to the title page level + 1 - // This ensures top level headings aren't nested - if (i === 0){ - baseHeadingLevel = hLevel + 1; + hLevel = 2; } // Build list items for all headings except the page title @@ -94,8 +88,7 @@ export function init_headers(sticky_content, lang_strings) { title_container.find('a,.added,.coming,.deprecated,.experimental') .remove(); var text = title_container.html(); - const adjustedLevel = hLevel - baseHeadingLevel; - const li = '
    • ' + text + '
      • '; + const li = '
    • ' + text + '
      • '; ul.append(li); } } @@ -252,7 +245,9 @@ function highlight_otp() { }) }) - document.querySelectorAll('#guide a[id]').forEach((heading) => { + document.querySelectorAll('div#content a[id]').forEach((heading, i) => { + // Skip the first heading since it's not visible + if (i === 0) return observer.observe(heading); }) } @@ -346,6 +341,42 @@ $(function() { AlternativeSwitcher(store()); + // Get all headings inside the main body of the doc + const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6') + let allLevels = [] + // Create a list of all heading levels used on the page + allHeadings.each(function(index) { + // Don't include the first heading because that's the title + if (index === 0) return; + if (!allLevels.includes($(this).prop('nodeName'))) allLevels.push($(this).prop('nodeName')); + }) + // Update the heading level to be incremental + // (i.e. the first heading after the title should be an h2 and + // then deeper levels should be adjusted so they are incremental) + allHeadings.each(function(index) { + const currentHeading = $(this) + const contents = currentHeading.prop('innerHTML') + // Don't include the first heading because that's the + // title and we always want that to be an h1 + if (index > 0) { + if (allLevels[0] && ($(this).prop('nodeName') === allLevels[0])) { + $(this).replaceWith(`

      ${contents}

      `); + } + if (allLevels[1] && ($(this).prop('nodeName') === allLevels[1])) { + $(this).replaceWith(`

      ${contents}

      `); + } + if (allLevels[2] && ($(this).prop('nodeName') === allLevels[2])) { + $(this).replaceWith(`

      ${contents}

      `); + } + if (allLevels[3] && ($(this).prop('nodeName') === allLevels[3])) { + $(this).replaceWith(`
      ${contents}
      `); + } + if (allLevels[4] && ($(this).prop('nodeName') === allLevels[4])) { + $(this).replaceWith(`
      ${contents}
      `); + } + } + }) + // If breadcrumbs contain a dropdown (e.g. APM, ECS Logging) // handle interaction with the dropdown if ($('#related-products')) { @@ -454,7 +485,7 @@ $(function() { var div = $('div.toc'); // Fetch toc.html unless there is already a .toc on the page - if (div.length == 0 && $('#guide').find('div.article,div.book').length == 0) { + if (div.length == 0) { var url = location.href.replace(/[^\/]+$/, 'toc.html'); var toc = $.get(url, {}, function(data) { left_col.append(data); diff --git a/resources/web/style/admonishment.pcss b/resources/web/style/admonishment.pcss index 5413a1c7f59b0..8fa20318458da 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -85,8 +85,13 @@ .admon_content { margin-left: 80px; - h3 { + /* On page load, the heading level may be changed, + but we always what to style it the same way */ + h2, h3, h4, h5, h6 { margin: 3px 0; + font-size: 22px; + font-weight: 600; + a { font-weight: 600; } } p:last-of-type { margin-bottom: 0em; diff --git a/resources/web/style/console_widget.pcss b/resources/web/style/console_widget.pcss index 0ea12fe5c2361..819c2e0dee455 100644 --- a/resources/web/style/console_widget.pcss +++ b/resources/web/style/console_widget.pcss @@ -65,7 +65,9 @@ .try_console_selector { text-align: center; - h4 { + /* On page load, the heading level may be changed, + but we always what to style it the same way */ + h2, h3, h4, h5, h6 { font-size: 30px; } diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index 4210868e4c5fe..26b0a3e046191 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -19,11 +19,6 @@ background-image: inline("img/link.png"); } } - h1 { - font-size: 36px; - margin: 10px 0 10px; - a { font-weight: 300; } - } h2 { font-size: 29px; margin: 20px 0; @@ -82,5 +77,20 @@ .title { margin: 10px 0 16px; } + /* Styles the page header, which is always an h1 + wrapped in a div with the titlepage class, and always + has the title class. */ + h1.title { + margin: 24px 0; + font-size: 36px; + padding: 0; + a { font-weight: 300; } + } + } + + /* Hide the first heading within the main content + of the page since it is the same as the title */ + div#content > div > .titlepage { + display: none; } -} \ No newline at end of file +} From 84062306675b0458d5e1b4a23ddf10bf17931f5d Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 18 Jun 2024 13:51:52 -0600 Subject: [PATCH 0843/1049] Revert "Always use h1 for first heading on a page (#3009)" (#3018) This reverts commit d16085bebe5c46534a1242a0f1fd85c984643f4e. --- extra/docs_landing.html | 4 - integtest/spec/single_book_spec.rb | 128 +++++++++ .../asciidoctor/lib/chunker/breadcrumbs.rb | 2 +- .../asciidoctor/lib/chunker/extension.rb | 28 +- .../lib/docbook_compat/convert_document.rb | 36 +-- .../lib/docbook_compat/extension.rb | 27 +- resources/asciidoctor/spec/chunker_spec.rb | 244 +++++++----------- .../asciidoctor/spec/docbook_compat_spec.rb | 88 ++++++- .../spec/elastic_compat_preprocessor_spec.rb | 8 +- resources/web/docs_js/__tests__/docs.test.js | 18 +- resources/web/docs_js/index.js | 63 ++--- resources/web/style/admonishment.pcss | 7 +- resources/web/style/console_widget.pcss | 4 +- resources/web/style/heading.pcss | 22 +- 14 files changed, 366 insertions(+), 313 deletions(-) diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 2a4655b81196a..af1d8079cb448 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -138,10 +138,6 @@ display: none; } - #left_col { - display: none; - } - #guide .subnavigation { top: 00px; border-bottom: 1px solid var(--color-gray); diff --git a/integtest/spec/single_book_spec.rb b/integtest/spec/single_book_spec.rb index a40f2f4dee365..f5f5cf49a47a4 100644 --- a/integtest/spec/single_book_spec.rb +++ b/integtest/spec/single_book_spec.rb @@ -314,6 +314,134 @@ end end + context 'regarding the xpack tag' do + let(:edit_me) do + <<~HTML.strip + edit + HTML + end + let(:xpack_tag) do + <<~HTML.strip + + HTML + end + let(:rx) { %r{<#{h} class="title">(.+?)} } + let(:title_tag) do + return unless body + + m = rx.match(body) + raise "Can't find title_tag with #{rx} in #{body}" unless m + + m[1] + end + shared_examples 'xpack tag title' do |has_tag| + it 'contains the edit_me link' do + expect(title_tag).to include(edit_me) + end + if has_tag + it 'contains the xpack tag' do + expect(title_tag).to include(xpack_tag) + end + else + it "doesn't contain the xpack tag" do + expect(title_tag).not_to include(xpack_tag) + end + end + end + shared_examples 'part page titles' do |onpart| + page_context 'part.html' do + let(:h) { 'h1' } + let(:id) { 'part' } + include_examples 'xpack tag title', onpart + end + end + shared_examples 'chapter page titles' do |onchapter, onfloater, onsection| + page_context 'chapter.html' do + let(:h) { 'h2' } + context 'the chapter title' do + let(:id) { 'chapter' } + include_examples 'xpack tag title', onchapter + end + context 'the section title' do + let(:id) { 'section' } + include_examples 'xpack tag title', onsection + end + context 'the float title' do + let(:rx) { %r{

      (.+?)

      } } + include_examples 'xpack tag title', onfloater + end + end + end + + def self.xpack_tag_context(onpart, onchapter, onfloater, onsection, + hide_xpack) + convert_single_before_context do |src| + index = xpack_tag_test_asciidoc onpart, onchapter, onfloater, onsection, + hide_xpack + src.write 'index.asciidoc', index + end + + include_examples 'part page titles', + onpart && !hide_xpack + include_examples 'chapter page titles', onchapter && !hide_xpack, + onfloater && !hide_xpack, onsection && !hide_xpack + end + + def self.xpack_tag_test_asciidoc(onpart, onchapter, onfloater, onsection, + hide_xpack) + <<~ASCIIDOC + = Title + + #{hide_xpack ? ':hide-xpack-tags: true' : ''} + + #{onpart ? '[role="xpack"]' : ''} + [[part]] + = Part + + #{onchapter ? '[role="xpack"]' : ''} + [[chapter]] + == Chapter + + Chapter words. + + [[floater]] + [float] + == #{onfloater ? '[xpack]#Floater#' : 'Floater'} + + Floater words. + + #{onsection ? '[role="xpack"]' : ''} + [[section]] + === Section + + Section words. + ASCIIDOC + end + + context 'when not hiding xpack tags' do + context 'when the xpack role is on a part' do + xpack_tag_context true, false, false, false, false + end + context 'when the xpack role is on a chapter' do + xpack_tag_context false, true, false, false, false + end + context 'when the xpack role is on a floating title' do + xpack_tag_context false, false, true, false, false + end + context 'when the xpack role is on a section' do + xpack_tag_context false, false, false, true, false + end + context 'when the xpack role is on everything' do + xpack_tag_context true, true, true, true, false + end + end + context 'when hiding xpack tags' do + context 'when the xpack role is on everything' do + xpack_tag_context true, true, true, true, true + end + end + end + context 'for README.asciidoc' do convert_single_before_context do |src| root = File.expand_path('../../', __dir__) diff --git a/resources/asciidoctor/lib/chunker/breadcrumbs.rb b/resources/asciidoctor/lib/chunker/breadcrumbs.rb index c2b6ef4a3da2c..edce3e8403cde 100644 --- a/resources/asciidoctor/lib/chunker/breadcrumbs.rb +++ b/resources/asciidoctor/lib/chunker/breadcrumbs.rb @@ -22,7 +22,7 @@ def generate_breadcrumbs(doc, section) update_breadcrumbs_cases(result, chev, doc) - result.join("\n") + Asciidoctor::Block.new doc, :pass, source: result.join("\n") end def update_breadcrumbs_cases(result, chev, doc) diff --git a/resources/asciidoctor/lib/chunker/extension.rb b/resources/asciidoctor/lib/chunker/extension.rb index 5274cbfbe138a..c5a54e8cbf4ea 100644 --- a/resources/asciidoctor/lib/chunker/extension.rb +++ b/resources/asciidoctor/lib/chunker/extension.rb @@ -57,15 +57,6 @@ def convert_section(section) return yield unless section.level <= @chunk_level html = form_section_into_page doc, section, yield - # Replace the breadcrumbs placeholder with - # the generated breadcrumbs - if html =~ %r{} - html.gsub!( - %r{}, - generate_breadcrumbs(doc, section).to_s - ) - # raise("Couldn't add breadcrumbs in #{html}") - end write doc, "#{section.id}.html", html '' end @@ -102,11 +93,12 @@ def form_section_into_page(doc, section, html) # We don't use asciidoctor's "parent" documents here because they don't # seem to buy us much and they are an "internal" detail. subdoc = Asciidoctor::Document.new [], subdoc_opts(doc, section) - add_subdoc_sections doc, subdoc, html + add_subdoc_sections doc, subdoc, section, html subdoc.convert end - def add_subdoc_sections(doc, subdoc, html) + def add_subdoc_sections(doc, subdoc, section, html) + subdoc << generate_breadcrumbs(doc, section) nav = Nav.new subdoc subdoc << nav.header subdoc << Asciidoctor::Block.new(subdoc, :pass, source: html) @@ -129,10 +121,7 @@ def subdoc_opts(doc, section) def subdoc_attrs(doc, section) attrs = doc.attributes.dup maintitle = doc.doctitle partition: true - # Rendered h1 heading - attrs['doctitle'] = subdoc_doctitle section - # Value of `title` in the `head` - attrs['title'] = subdoc_title section, maintitle + attrs['doctitle'] = subdoc_title section, maintitle # Asciidoctor defaults these attribute to empty string if they aren't # specified and setting them to `nil` clears them. Since we want to # preserve the configuration from the parent into the child, we clear @@ -141,20 +130,13 @@ def subdoc_attrs(doc, section) attrs['stylesheet'] = nil unless attrs['stylesheet'] attrs['icons'] = nil unless attrs['icons'] attrs['subdoc'] = true # Mark the subdoc so we don't try and chunk it + attrs['noheader'] = true attrs['title-separator'] = '' attrs['canonical-url'] = section.attributes['canonical-url'] attrs.merge! find_related(section) attrs end - # For the `h1` heading that appears on the rendered page, - # use just the page title - def subdoc_doctitle(section) - strip_tags section.captioned_title.to_s - end - - # For the `title` in the `head`, use the page title followed - # by the site title ("Elastic") def subdoc_title(section, maintitle) strip_tags "#{section.captioned_title} | #{maintitle.main}" end diff --git a/resources/asciidoctor/lib/docbook_compat/convert_document.rb b/resources/asciidoctor/lib/docbook_compat/convert_document.rb index cf39b1189c857..3bcb567fd4468 100644 --- a/resources/asciidoctor/lib/docbook_compat/convert_document.rb +++ b/resources/asciidoctor/lib/docbook_compat/convert_document.rb @@ -25,7 +25,7 @@ def convert_document(doc) def munge_html(doc, html, wants_toc) title = doc.doctitle partition: true munge_html_tag html - munge_head doc.attr('title-extra'), html + munge_head doc.attr('title-extra'), title, html munge_body doc, html munge_title doc, title, html add_toc doc, html if wants_toc @@ -36,28 +36,17 @@ def munge_html_tag(html) raise("Coudn't fix html in #{html}") end - def munge_head(title_extra, html) - if html !~ %r{^([\S\s]+)<\/title>$}m - raise("Couldn't munge <title> in #{html}") - end - - html.gsub!(%r{^<title>([\S\s]+)<\/title>$}m) do - add_content_meta Regexp.last_match[1], title_extra - end + def munge_head(title_extra, title, html) + html.gsub!( + %r{<title>.+?}m, <<~HTML + #{strip_tags title.main}#{title_extra} | Elastic + + HTML + ) || raise("Couldn't munge in #{html}") munge_meta html end - def add_content_meta(match, title_extra) - # If multiple lines, get just the first line - clean_title = match.gsub!(/\n[\S\s]+/, '') || match - clean_title = strip_tags clean_title - <<~HTML - <title>#{clean_title}#{title_extra} | Elastic - - HTML - end - META_VIEWPORT = <<~HTML HTML @@ -72,14 +61,12 @@ def munge_meta(html) end def munge_title(doc, title, html) + return if doc.attr 'noheader' + # Important: we're not replacing the whole header - it still will have a # closing
      . - # - # We also add a placeholder for the breadcrumbs that will be replaced - # in resources/asciidoctor/lib/chunker/extension.rb header_start = <<~HTML
      - #{docbook_style_title doc, title} HTML html.gsub!(%r{ +
      HTML end diff --git a/resources/asciidoctor/lib/docbook_compat/extension.rb b/resources/asciidoctor/lib/docbook_compat/extension.rb index 5d310742d84de..c50aecb5230de 100644 --- a/resources/asciidoctor/lib/docbook_compat/extension.rb +++ b/resources/asciidoctor/lib/docbook_compat/extension.rb @@ -77,20 +77,19 @@ def xpack_tag(node) end def hlevel(section) - # If the heading level is less than 2, use 2, - # otherwise use the given heading level. - # - # This ensures: - # - There are no `h0`s, which are not valid HTML elements. - # - There are no `h1`s in the page's main content since - # we only want one `h1` per page, and one is generated - # automatically and added to the page header (outside - # div#content). - if section.level < 2 - 2 - else - section.level - end + # Walk up the ancestry until the ancestor's parent is the document. The + # ancestor that we end up with is the "biggest" section containing this + # section. Except don't walk *all* the way. Because docbook doesn't. + # See that `unless` below? If we were walking it should be `until` but + # docbook *doesn't* walk. It just does this. Why? Ghosts maybe. I dunno. + # But we're trying to emulate docbook. So here we are. + ancestor = section + ancestor = ancestor.parent unless ancestor.parent.context == :document + # If *that* section is level 0 then we have to bump the hlevel of our + # section by one. The argument for this goes: we have to bump the level 0 + # section's hlevel by one anyway because there *isn't* an h0 tag. So we + # have to bump all of its children. + section.level + (ancestor.level.zero? ? 1 : 0) end SECTION_WRAPPER_CLASSES = %w[part chapter].freeze diff --git a/resources/asciidoctor/spec/chunker_spec.rb b/resources/asciidoctor/spec/chunker_spec.rb index b34acedae44d8..1f9bf79c5af1b 100644 --- a/resources/asciidoctor/spec/chunker_spec.rb +++ b/resources/asciidoctor/spec/chunker_spec.rb @@ -197,6 +197,14 @@ def dest_file(file)

      Words words.[1]

      HTML end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title +
      + HTML + end it 'contains a link to the second section' do expect(contents).to include( 'Section 2' @@ -228,6 +236,14 @@ def dest_file(file) it 'contains the contents' do expect(contents).to include '

      Words again.

      ' end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title +
      + HTML + end it 'contains a link to an element in the first section' do expect(contents).to include( 'override text' @@ -246,36 +262,6 @@ def dest_file(file) HTML end end - context 'breadcrumbs' do - before(:each) do - # We need docbook compat to verify breadcrumbs - # We unregister_all first because the order that we - # register the plugins matters. - Asciidoctor::Extensions.unregister_all - Asciidoctor::Extensions.register DocbookCompat - Asciidoctor::Extensions.register Chunker - end - file_context 'the first section', 's1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title -
      - HTML - end - end - file_context 'the second section', 's2.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title -
      - HTML - end - end - end end context 'there is a level 2 section' do let(:input) do @@ -416,25 +402,13 @@ def dest_file(file) include_examples 'standard page', 'index', nil let(:prev_title) { 'Title [fooo]' } include_examples 'subpage' - end - context 'breadcrumbs' do - before(:each) do - # We need docbook compat to verify breadcrumbs - # We unregister_all first because the order that we - # register the plugins matters. - Asciidoctor::Extensions.unregister_all - Asciidoctor::Extensions.register DocbookCompat - Asciidoctor::Extensions.register Chunker - end - file_context 'the section', 's1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title [fooo] -
      - HTML - end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title [fooo] +
      + HTML end end end @@ -534,7 +508,7 @@ def dest_file(file) end it 'contains the heading' do expect(contents).to include( - '

      Section: With subtitle

      ' + '

      Section: With subtitle

      ' ) end it 'contains the contents' do @@ -654,6 +628,14 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      S1

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title +
      + HTML + end it 'contains a link to the level 3 section' do expect(contents).to include('S2_1_1') end @@ -664,6 +646,15 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      S1_1

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title + ›S1 +
      + HTML + end end file_context 'the second level 1 section', 's2.html' do include_examples 'standard page', 's1_1', 's2_1' @@ -671,6 +662,14 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      S2

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title +
      + HTML + end end file_context 'the second level 2 section', 's2_1.html' do include_examples 'standard page', 's2', 's2_2' @@ -681,6 +680,15 @@ def dest_file(file) it 'contains the level 3 section' do expect(contents).to include('

      S2_1_1

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title + ›S2 +
      + HTML + end end file_context 'the last level 2 section', 's2_2.html' do include_examples 'standard page', 's2_1', nil @@ -688,68 +696,14 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      S2_2

      ') end - end - context 'breadcrumbs' do - before(:each) do - # We need docbook compat to verify breadcrumbs - # We unregister_all first because the order that we - # register the plugins matters. - Asciidoctor::Extensions.unregister_all - Asciidoctor::Extensions.register DocbookCompat - Asciidoctor::Extensions.register Chunker - end - file_context 'the first level 1 section', 's1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title -
      - HTML - end - file_context 'the first level 2 section', 's1_1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title - ›S1 -
      - HTML - end - end - file_context 'the second level 1 section', 's2.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title -
      - HTML - end - end - file_context 'the second level 2 section', 's2_1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title - ›S2 -
      - HTML - end - end - file_context 'the last level 2 section', 's2_2.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title - ›S2 -
      - HTML - end - end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title + ›S2 +
      + HTML end end end @@ -808,6 +762,14 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      Appendix A: Foo

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title +
      + HTML + end end file_context 'the first page in the appendix', 'app_1.html' do include_examples 'standard page', 'app', 'app_2' @@ -817,6 +779,15 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      Foo 1

      ') end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title + ›Foo +
      + HTML + end end file_context 'the first page in the appendix', 'app_2.html' do include_examples 'standard page', 'app_1', nil @@ -825,47 +796,14 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

      Foo 2

      ') end - end - context 'breadcrumbs' do - before(:each) do - # We need docbook compat to verify breadcrumbs - # We unregister_all first because the order that we - # register the plugins matters. - Asciidoctor::Extensions.unregister_all - Asciidoctor::Extensions.register DocbookCompat - Asciidoctor::Extensions.register Chunker - end - file_context 'the appendix', 'app.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title -
      - HTML - end - file_context 'the first page in the appendix', 'app_1.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title - ›Foo -
      - HTML - end - end - file_context 'the first page in the appendix', 'app_2.html' do - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
      - Elastic Docs - ›Title - ›Foo -
      - HTML - end - end + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
      + Elastic Docs + ›Title + ›Foo +
      + HTML end end end diff --git a/resources/asciidoctor/spec/docbook_compat_spec.rb b/resources/asciidoctor/spec/docbook_compat_spec.rb index 5f7ada5f31775..4d8650c6f276d 100644 --- a/resources/asciidoctor/spec/docbook_compat_spec.rb +++ b/resources/asciidoctor/spec/docbook_compat_spec.rb @@ -111,10 +111,12 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
      -

      Title

      +
      + +
      HTML end end @@ -131,10 +133,12 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
      -

      Title

      +
      + +
      HTML end end @@ -165,10 +169,10 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
      -

      Title

      +
      HTML end @@ -176,6 +180,7 @@ context 'the table of contents' do it 'is outside the titlepage' do expect(converted).to include(<<~HTML) +
      @@ -288,7 +293,7 @@ expect(converted).not_to include '' end it 'includes the unabbreviated title' do - expect(converted).to include 'Section 1' + expect(converted).to include 'Section 1' end it 'includes a link to the abbreviated section' do expect(converted).to include <<~HTML.strip @@ -359,15 +364,23 @@ Words. ASCIIDOC end + context 'the title' do + it "doesn't include the subtitle" do + expect(converted).to include(<<~HTML) + Title | Elastic + + HTML + end + end context 'the header' do it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
      -

      Title

      Subtitle

      +
      HTML @@ -394,10 +407,10 @@ it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
      -

      foo

      +
      HTML @@ -482,6 +495,64 @@ end end end + context 'when the head is disabled' do + let(:convert_attributes) do + { + # Shrink the output slightly so it is easier to read + 'stylesheet!' => false, + # Disable the head + 'noheader' => true, + } + end + let(:input) do + <<~ASCIIDOC + = Title + + Words. + ASCIIDOC + end + context 'the header' do + it "doesn't contain the title h1" do + expect(converted).not_to include('Title') + end + end + context 'the body' do + it "doesn't have attributes" do + expect(converted).to include('') + end + it "doesn't include the 'book' wrapper" do + expect(converted).not_to include(<<~HTML) +
      + HTML + end + end + + context 'when there is a page-header' do + let(:convert_attributes) do + { + # Shrink the output slightly so it is easier to read + 'stylesheet!' => false, + 'noheader' => true, + 'page-header' => '
      ', + } + end + let(:input) do + <<~ASCIIDOC + = Title + + Words. + ASCIIDOC + end + context 'the header' do + it 'contains the page-header right after the body tag' do + expect(converted).not_to include <<~HTML + +
      + HTML + end + end + end + end context 'when the head is disabled' do let(:convert_attributes) do { @@ -563,10 +634,9 @@ end end it "is wrapped in docbook's funny titlepage" do - level = hlevel < 2 ? 2 : hlevel expect(converted).to include(<<~HTML)
      - #{title}#{xpack_tag} + #{title}#{xpack_tag}
      HTML end @@ -731,7 +801,7 @@ include_examples 'section basics', 'appendix', 1, '_foo', 'Appendix A: Foo' it "doesn't bump the h tags of sections within it" do - expect(converted).to include 'Bar' + expect(converted).to include 'Bar' end end end diff --git a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb index 7102aa0821309..884fac8a63a0d 100644 --- a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb +++ b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb @@ -195,7 +195,7 @@ end it 'uses the attributes for the header' do expect(converted).to include <<~HTML -

      Header

      +

      Header

      HTML end it 'uses the attributes outside of the header' do @@ -299,7 +299,7 @@ expect(converted).to eq <<~HTML
      -

      Example

      +

      Example

      @@ -340,7 +340,7 @@ expect(converted).to eq <<~HTML
      -

      Example

      +

      Example

      @@ -470,7 +470,7 @@ end it 'has the right offset' do expect(converted).to include <<~HTML -

      Target

      +

      Target

      HTML end end diff --git a/resources/web/docs_js/__tests__/docs.test.js b/resources/web/docs_js/__tests__/docs.test.js index 4b862bf1e30b0..87ad943e037b4 100644 --- a/resources/web/docs_js/__tests__/docs.test.js +++ b/resources/web/docs_js/__tests__/docs.test.js @@ -115,7 +115,7 @@ function describeInitHeaders(name, guideBody, onThisPageAssertions) { describe(name, () => { beforeEach(() => { document.body.innerHTML = dedent ` -
      +
      ${guideBody}
      @@ -142,28 +142,28 @@ describe('On This Page', () => { `; const oneSubsection = dedent ` ${onlyTitle} -

      +

      Near Realtime (NRT) -

      + `; const twoSubsections = dedent ` ${oneSubsection} -

      +

      Cluster -

      + `; const fourSubsections = dedent ` ${twoSubsections} -

      +

      Observability -

      -

      +

      +

      APM -

      + `; describeInitHeaders('for page with just a title', onlyTitle, () => { diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index.js index ef684eaf67a8f..6b180c4b2a3bd 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index.js @@ -63,10 +63,10 @@ export function init_headers(sticky_content, lang_strings) { this_page.append('

      ' + lang_strings('On this page') + '

      '); var ul = $('
        ').appendTo(this_page); var items = 0; + var baseHeadingLevel = 0; - // Get all headings inside the main body of the doc - $('div#content a[id]:not([href])').each( - function(i) { + $('#guide a[id]:not([href])').each( + function(i, el) { // Make headers into real links for permalinks this.href = '#' + this.id; @@ -76,11 +76,17 @@ export function init_headers(sticky_content, lang_strings) { // Assume initial heading is an H1, but adjust if it's not let hLevel = 0; if ($(this).parent().is("h2")){ - hLevel = 0; - } else if ($(this).parent().is("h3")){ hLevel = 1; - } else if ($(this).parent().is("h4")){ + } else if ($(this).parent().is("h3")){ hLevel = 2; + } else if ($(this).parent().is("h4")){ + hLevel = 3; + } + + // Set the base heading level for the page to the title page level + 1 + // This ensures top level headings aren't nested + if (i === 0){ + baseHeadingLevel = hLevel + 1; } // Build list items for all headings except the page title @@ -88,7 +94,8 @@ export function init_headers(sticky_content, lang_strings) { title_container.find('a,.added,.coming,.deprecated,.experimental') .remove(); var text = title_container.html(); - const li = '
      • ' + text + '
        • '; + const adjustedLevel = hLevel - baseHeadingLevel; + const li = '
      • ' + text + '
        • '; ul.append(li); } } @@ -245,9 +252,7 @@ function highlight_otp() { }) }) - document.querySelectorAll('div#content a[id]').forEach((heading, i) => { - // Skip the first heading since it's not visible - if (i === 0) return + document.querySelectorAll('#guide a[id]').forEach((heading) => { observer.observe(heading); }) } @@ -341,42 +346,6 @@ $(function() { AlternativeSwitcher(store()); - // Get all headings inside the main body of the doc - const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6') - let allLevels = [] - // Create a list of all heading levels used on the page - allHeadings.each(function(index) { - // Don't include the first heading because that's the title - if (index === 0) return; - if (!allLevels.includes($(this).prop('nodeName'))) allLevels.push($(this).prop('nodeName')); - }) - // Update the heading level to be incremental - // (i.e. the first heading after the title should be an h2 and - // then deeper levels should be adjusted so they are incremental) - allHeadings.each(function(index) { - const currentHeading = $(this) - const contents = currentHeading.prop('innerHTML') - // Don't include the first heading because that's the - // title and we always want that to be an h1 - if (index > 0) { - if (allLevels[0] && ($(this).prop('nodeName') === allLevels[0])) { - $(this).replaceWith(`

        ${contents}

        `); - } - if (allLevels[1] && ($(this).prop('nodeName') === allLevels[1])) { - $(this).replaceWith(`

        ${contents}

        `); - } - if (allLevels[2] && ($(this).prop('nodeName') === allLevels[2])) { - $(this).replaceWith(`

        ${contents}

        `); - } - if (allLevels[3] && ($(this).prop('nodeName') === allLevels[3])) { - $(this).replaceWith(`
        ${contents}
        `); - } - if (allLevels[4] && ($(this).prop('nodeName') === allLevels[4])) { - $(this).replaceWith(`
        ${contents}
        `); - } - } - }) - // If breadcrumbs contain a dropdown (e.g. APM, ECS Logging) // handle interaction with the dropdown if ($('#related-products')) { @@ -485,7 +454,7 @@ $(function() { var div = $('div.toc'); // Fetch toc.html unless there is already a .toc on the page - if (div.length == 0) { + if (div.length == 0 && $('#guide').find('div.article,div.book').length == 0) { var url = location.href.replace(/[^\/]+$/, 'toc.html'); var toc = $.get(url, {}, function(data) { left_col.append(data); diff --git a/resources/web/style/admonishment.pcss b/resources/web/style/admonishment.pcss index 8fa20318458da..5413a1c7f59b0 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -85,13 +85,8 @@ .admon_content { margin-left: 80px; - /* On page load, the heading level may be changed, - but we always what to style it the same way */ - h2, h3, h4, h5, h6 { + h3 { margin: 3px 0; - font-size: 22px; - font-weight: 600; - a { font-weight: 600; } } p:last-of-type { margin-bottom: 0em; diff --git a/resources/web/style/console_widget.pcss b/resources/web/style/console_widget.pcss index 819c2e0dee455..0ea12fe5c2361 100644 --- a/resources/web/style/console_widget.pcss +++ b/resources/web/style/console_widget.pcss @@ -65,9 +65,7 @@ .try_console_selector { text-align: center; - /* On page load, the heading level may be changed, - but we always what to style it the same way */ - h2, h3, h4, h5, h6 { + h4 { font-size: 30px; } diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index 26b0a3e046191..4210868e4c5fe 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -19,6 +19,11 @@ background-image: inline("img/link.png"); } } + h1 { + font-size: 36px; + margin: 10px 0 10px; + a { font-weight: 300; } + } h2 { font-size: 29px; margin: 20px 0; @@ -77,20 +82,5 @@ .title { margin: 10px 0 16px; } - /* Styles the page header, which is always an h1 - wrapped in a div with the titlepage class, and always - has the title class. */ - h1.title { - margin: 24px 0; - font-size: 36px; - padding: 0; - a { font-weight: 300; } - } - } - - /* Hide the first heading within the main content - of the page since it is the same as the title */ - div#content > div > .titlepage { - display: none; } -} +} \ No newline at end of file From 0eae7e0cf1dafa46b8e11a2c51d67b29408863b7 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 18 Jun 2024 16:48:14 -0500 Subject: [PATCH 0844/1049] Update name of css and js files (#3017) * update name of css and js files * fix tests * Revert "Revert "Always use h1 for first heading on a page (#3009)" (#3018)" This reverts commit 84062306675b0458d5e1b4a23ddf10bf17931f5d. --------- Co-authored-by: bmorelli25 --- .gitignore | 1 + extra/docs_landing.html | 4 + integtest/spec/all_books_spec.rb | 4 +- integtest/spec/helper/dsl/convert_all.rb | 4 +- integtest/spec/single_book_spec.rb | 136 +--------- lib/ES/Util.pm | 14 +- .../asciidoctor/lib/chunker/breadcrumbs.rb | 2 +- .../asciidoctor/lib/chunker/extension.rb | 28 +- .../lib/docbook_compat/convert_document.rb | 36 ++- .../lib/docbook_compat/extension.rb | 27 +- resources/asciidoctor/spec/chunker_spec.rb | 244 +++++++++++------- .../asciidoctor/spec/docbook_compat_spec.rb | 88 +------ .../spec/elastic_compat_preprocessor_spec.rb | 8 +- .../web/__test__/air_gapped_template.test.js | 4 +- resources/web/air_gapped_template.html | 4 +- resources/web/docs_js/__tests__/docs.test.js | 20 +- .../web/docs_js/{index.js => index-v1.js} | 95 ++++--- resources/web/style/admonishment.pcss | 7 +- resources/web/style/console_widget.pcss | 4 +- resources/web/style/heading.pcss | 22 +- resources/web/{styles.pcss => styles-v1.pcss} | 0 resources/web/template.html | 4 +- 22 files changed, 352 insertions(+), 404 deletions(-) rename resources/web/docs_js/{index.js => index-v1.js} (87%) rename resources/web/{styles.pcss => styles-v1.pcss} (100%) diff --git a/.gitignore b/.gitignore index 05a17090ed58d..f62a2b023b0f0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ bin .settings .classpath /styles.css +/styles-v1.css .project .vscode .DS_Store diff --git a/extra/docs_landing.html b/extra/docs_landing.html index af1d8079cb448..2a4655b81196a 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -138,6 +138,10 @@ display: none; } + #left_col { + display: none; + } + #guide .subnavigation { top: 00px; border-bottom: 1px solid var(--color-gray); diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 48ffd22317f2b..35dffd848cea4 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -48,7 +48,7 @@ def self.has_license(name, heading) TXT end end - file_context 'html/static/docs.js' do + file_context 'html/static/docs-v1.js' do has_license 'code-prettify', 'The Apache 2.0 License' has_license "code-prettify's lang-sql", 'The Apache 2.0 License' has_license "code-prettify's lang-yaml", 'The Apache 2.0 License' @@ -64,7 +64,7 @@ def self.has_license(name, heading) has_license 'redux-thunk', 'The MIT License (MIT)' has_license 'symbol-observable', 'The MIT License (MIT)' end - file_context 'html/static/styles.css' do + file_context 'html/static/styles-v1.css' do has_license 'Bootstrap', 'The MIT License (MIT)' has_license 'Inter', 'SIL OPEN FONT LICENSE' has_license 'Noto Sans Japanese', 'SIL OPEN FONT LICENSE' diff --git a/integtest/spec/helper/dsl/convert_all.rb b/integtest/spec/helper/dsl/convert_all.rb index 653c4d8afd646..5d1d210916f19 100644 --- a/integtest/spec/helper/dsl/convert_all.rb +++ b/integtest/spec/helper/dsl/convert_all.rb @@ -69,7 +69,7 @@ def convert_all_before_context(relative_conf: false, target_branch: nil, end end end - file_context 'html/static/docs.js' do + file_context 'html/static/docs-v1.js' do it 'is minified' do expect(contents).to include(<<~JS.strip) return a&&a.__esModule?{d:a.default}:{d:a} @@ -89,7 +89,7 @@ def convert_all_before_context(relative_conf: false, target_branch: nil, expect(contents).not_to include('sourceMappingURL=') end end - file_context 'html/static/styles.css' do + file_context 'html/static/styles-v1.css' do it 'is minified' do expect(contents).to include(<<~CSS.strip) *{font-family:Inter,sans-serif} diff --git a/integtest/spec/single_book_spec.rb b/integtest/spec/single_book_spec.rb index f5f5cf49a47a4..0b250fabe8129 100644 --- a/integtest/spec/single_book_spec.rb +++ b/integtest/spec/single_book_spec.rb @@ -34,12 +34,12 @@ end it 'has a link to the css' do expect(head).to include(<<~HTML) - + HTML end it 'has a link to the js' do expect(contents).to include(<<~HTML) - + HTML end it 'has the right language' do @@ -314,134 +314,6 @@ end end - context 'regarding the xpack tag' do - let(:edit_me) do - <<~HTML.strip - edit - HTML - end - let(:xpack_tag) do - <<~HTML.strip - - HTML - end - let(:rx) { %r{<#{h} class="title">(.+?)} } - let(:title_tag) do - return unless body - - m = rx.match(body) - raise "Can't find title_tag with #{rx} in #{body}" unless m - - m[1] - end - shared_examples 'xpack tag title' do |has_tag| - it 'contains the edit_me link' do - expect(title_tag).to include(edit_me) - end - if has_tag - it 'contains the xpack tag' do - expect(title_tag).to include(xpack_tag) - end - else - it "doesn't contain the xpack tag" do - expect(title_tag).not_to include(xpack_tag) - end - end - end - shared_examples 'part page titles' do |onpart| - page_context 'part.html' do - let(:h) { 'h1' } - let(:id) { 'part' } - include_examples 'xpack tag title', onpart - end - end - shared_examples 'chapter page titles' do |onchapter, onfloater, onsection| - page_context 'chapter.html' do - let(:h) { 'h2' } - context 'the chapter title' do - let(:id) { 'chapter' } - include_examples 'xpack tag title', onchapter - end - context 'the section title' do - let(:id) { 'section' } - include_examples 'xpack tag title', onsection - end - context 'the float title' do - let(:rx) { %r{

        (.+?)

        } } - include_examples 'xpack tag title', onfloater - end - end - end - - def self.xpack_tag_context(onpart, onchapter, onfloater, onsection, - hide_xpack) - convert_single_before_context do |src| - index = xpack_tag_test_asciidoc onpart, onchapter, onfloater, onsection, - hide_xpack - src.write 'index.asciidoc', index - end - - include_examples 'part page titles', - onpart && !hide_xpack - include_examples 'chapter page titles', onchapter && !hide_xpack, - onfloater && !hide_xpack, onsection && !hide_xpack - end - - def self.xpack_tag_test_asciidoc(onpart, onchapter, onfloater, onsection, - hide_xpack) - <<~ASCIIDOC - = Title - - #{hide_xpack ? ':hide-xpack-tags: true' : ''} - - #{onpart ? '[role="xpack"]' : ''} - [[part]] - = Part - - #{onchapter ? '[role="xpack"]' : ''} - [[chapter]] - == Chapter - - Chapter words. - - [[floater]] - [float] - == #{onfloater ? '[xpack]#Floater#' : 'Floater'} - - Floater words. - - #{onsection ? '[role="xpack"]' : ''} - [[section]] - === Section - - Section words. - ASCIIDOC - end - - context 'when not hiding xpack tags' do - context 'when the xpack role is on a part' do - xpack_tag_context true, false, false, false, false - end - context 'when the xpack role is on a chapter' do - xpack_tag_context false, true, false, false, false - end - context 'when the xpack role is on a floating title' do - xpack_tag_context false, false, true, false, false - end - context 'when the xpack role is on a section' do - xpack_tag_context false, false, false, true, false - end - context 'when the xpack role is on everything' do - xpack_tag_context true, true, true, true, false - end - end - context 'when hiding xpack tags' do - context 'when the xpack role is on everything' do - xpack_tag_context true, true, true, true, true - end - end - end - context 'for README.asciidoc' do convert_single_before_context do |src| root = File.expand_path('../../', __dir__) @@ -851,13 +723,13 @@ def self.convert_with_source_branch_before_context(branch) end let(:toc) { Net::HTTP.get_response(URI("#{root}/toc.html")) } let(:js) do - Net::HTTP.get_response(URI("#{static}/docs.js")) + Net::HTTP.get_response(URI("#{static}/docs-v1.js")) end let(:jquery) do Net::HTTP.get_response(URI("#{static}/jquery.js")) end let(:css) do - Net::HTTP.get_response(URI("#{static}/styles.css")) + Net::HTTP.get_response(URI("#{static}/styles-v1.css")) end include_examples 'the root' diff --git a/lib/ES/Util.pm b/lib/ES/Util.pm index 67d798830d7b2..ed5c2317b3bf8 100644 --- a/lib/ES/Util.pm +++ b/lib/ES/Util.pm @@ -493,7 +493,7 @@ sub write_nginx_test_config { my $web_conf; if ( $watching_web ) { $web_conf = <<"CONF" - rewrite ^/guide/static/docs\\.js(.*)\$ /guide/static/docs_js/index.js\$1 last; + rewrite ^/guide/static/docs\\.js(.*)\$ /guide/static/docs_js/index-v1.js\$1 last; location ^~ /guide/static/jquery.js { alias /node_modules/jquery/dist/jquery.js; types { @@ -695,7 +695,7 @@ sub start_web_resources_watcher { --public-url /guide/static/ --hmr-port 8001 -d /tmp/parcel/ - resources/web/docs_js/index.js resources/web/styles.pcss) ); + resources/web/docs_js/index-v1.js resources/web/styles-v1.pcss) ); } #=================================== @@ -721,8 +721,8 @@ sub build_web_resources { my ( $dest ) = @_; my $parcel_out = dir('/tmp/parcel'); - my $compiled_js = $parcel_out->file('docs_js/index.js'); - my $compiled_css = $parcel_out->file('styles.css'); + my $compiled_js = $parcel_out->file('docs_js/index-v1.js'); + my $compiled_css = $parcel_out->file('styles-v1.css'); unless ( -e $compiled_js && -e $compiled_css ) { # We write the compiled js and css to /tmp so we can use them on @@ -735,15 +735,15 @@ sub build_web_resources { '--public-url', '/guide/static/', '--experimental-scope-hoisting', '--no-source-maps', '-d', $parcel_out, - 'resources/web/docs_js/index.js', 'resources/web/styles.pcss'; + 'resources/web/docs_js/index-v1.js', 'resources/web/styles-v1.pcss'; die "Parcel didn't make $compiled_js" unless -e $compiled_js; die "Parcel didn't make $compiled_css" unless -e $compiled_css; } my $static_dir = $dest->subdir( 'raw' )->subdir( 'static' ); $static_dir->mkpath; - my $js = $static_dir->file( 'docs.js' ); - my $css = $static_dir->file( 'styles.css' ); + my $js = $static_dir->file( 'docs-v1.js' ); + my $css = $static_dir->file( 'styles-v1.css' ); my $js_licenses = file( 'resources/web/docs.js.licenses' ); my $css_licenses = file( 'resources/web/styles.css.licenses' ); $js->spew( diff --git a/resources/asciidoctor/lib/chunker/breadcrumbs.rb b/resources/asciidoctor/lib/chunker/breadcrumbs.rb index edce3e8403cde..c2b6ef4a3da2c 100644 --- a/resources/asciidoctor/lib/chunker/breadcrumbs.rb +++ b/resources/asciidoctor/lib/chunker/breadcrumbs.rb @@ -22,7 +22,7 @@ def generate_breadcrumbs(doc, section) update_breadcrumbs_cases(result, chev, doc) - Asciidoctor::Block.new doc, :pass, source: result.join("\n") + result.join("\n") end def update_breadcrumbs_cases(result, chev, doc) diff --git a/resources/asciidoctor/lib/chunker/extension.rb b/resources/asciidoctor/lib/chunker/extension.rb index c5a54e8cbf4ea..5274cbfbe138a 100644 --- a/resources/asciidoctor/lib/chunker/extension.rb +++ b/resources/asciidoctor/lib/chunker/extension.rb @@ -57,6 +57,15 @@ def convert_section(section) return yield unless section.level <= @chunk_level html = form_section_into_page doc, section, yield + # Replace the breadcrumbs placeholder with + # the generated breadcrumbs + if html =~ %r{} + html.gsub!( + %r{}, + generate_breadcrumbs(doc, section).to_s + ) + # raise("Couldn't add breadcrumbs in #{html}") + end write doc, "#{section.id}.html", html '' end @@ -93,12 +102,11 @@ def form_section_into_page(doc, section, html) # We don't use asciidoctor's "parent" documents here because they don't # seem to buy us much and they are an "internal" detail. subdoc = Asciidoctor::Document.new [], subdoc_opts(doc, section) - add_subdoc_sections doc, subdoc, section, html + add_subdoc_sections doc, subdoc, html subdoc.convert end - def add_subdoc_sections(doc, subdoc, section, html) - subdoc << generate_breadcrumbs(doc, section) + def add_subdoc_sections(doc, subdoc, html) nav = Nav.new subdoc subdoc << nav.header subdoc << Asciidoctor::Block.new(subdoc, :pass, source: html) @@ -121,7 +129,10 @@ def subdoc_opts(doc, section) def subdoc_attrs(doc, section) attrs = doc.attributes.dup maintitle = doc.doctitle partition: true - attrs['doctitle'] = subdoc_title section, maintitle + # Rendered h1 heading + attrs['doctitle'] = subdoc_doctitle section + # Value of `title` in the `head` + attrs['title'] = subdoc_title section, maintitle # Asciidoctor defaults these attribute to empty string if they aren't # specified and setting them to `nil` clears them. Since we want to # preserve the configuration from the parent into the child, we clear @@ -130,13 +141,20 @@ def subdoc_attrs(doc, section) attrs['stylesheet'] = nil unless attrs['stylesheet'] attrs['icons'] = nil unless attrs['icons'] attrs['subdoc'] = true # Mark the subdoc so we don't try and chunk it - attrs['noheader'] = true attrs['title-separator'] = '' attrs['canonical-url'] = section.attributes['canonical-url'] attrs.merge! find_related(section) attrs end + # For the `h1` heading that appears on the rendered page, + # use just the page title + def subdoc_doctitle(section) + strip_tags section.captioned_title.to_s + end + + # For the `title` in the `head`, use the page title followed + # by the site title ("Elastic") def subdoc_title(section, maintitle) strip_tags "#{section.captioned_title} | #{maintitle.main}" end diff --git a/resources/asciidoctor/lib/docbook_compat/convert_document.rb b/resources/asciidoctor/lib/docbook_compat/convert_document.rb index 3bcb567fd4468..cf39b1189c857 100644 --- a/resources/asciidoctor/lib/docbook_compat/convert_document.rb +++ b/resources/asciidoctor/lib/docbook_compat/convert_document.rb @@ -25,7 +25,7 @@ def convert_document(doc) def munge_html(doc, html, wants_toc) title = doc.doctitle partition: true munge_html_tag html - munge_head doc.attr('title-extra'), title, html + munge_head doc.attr('title-extra'), html munge_body doc, html munge_title doc, title, html add_toc doc, html if wants_toc @@ -36,17 +36,28 @@ def munge_html_tag(html) raise("Coudn't fix html in #{html}") end - def munge_head(title_extra, title, html) - html.gsub!( - %r{.+?}m, <<~HTML - #{strip_tags title.main}#{title_extra} | Elastic - - HTML - ) || raise("Couldn't munge in #{html}") + def munge_head(title_extra, html) + if html !~ %r{^<title>([\S\s]+)<\/title>$}m + raise("Couldn't munge <title> in #{html}") + end + + html.gsub!(%r{^<title>([\S\s]+)<\/title>$}m) do + add_content_meta Regexp.last_match[1], title_extra + end munge_meta html end + def add_content_meta(match, title_extra) + # If multiple lines, get just the first line + clean_title = match.gsub!(/\n[\S\s]+/, '') || match + clean_title = strip_tags clean_title + <<~HTML + <title>#{clean_title}#{title_extra} | Elastic + + HTML + end + META_VIEWPORT = <<~HTML HTML @@ -61,12 +72,14 @@ def munge_meta(html) end def munge_title(doc, title, html) - return if doc.attr 'noheader' - # Important: we're not replacing the whole header - it still will have a # closing
        . + # + # We also add a placeholder for the breadcrumbs that will be replaced + # in resources/asciidoctor/lib/chunker/extension.rb header_start = <<~HTML
        + #{docbook_style_title doc, title} HTML html.gsub!(%r{ -
        HTML end diff --git a/resources/asciidoctor/lib/docbook_compat/extension.rb b/resources/asciidoctor/lib/docbook_compat/extension.rb index c50aecb5230de..5d310742d84de 100644 --- a/resources/asciidoctor/lib/docbook_compat/extension.rb +++ b/resources/asciidoctor/lib/docbook_compat/extension.rb @@ -77,19 +77,20 @@ def xpack_tag(node) end def hlevel(section) - # Walk up the ancestry until the ancestor's parent is the document. The - # ancestor that we end up with is the "biggest" section containing this - # section. Except don't walk *all* the way. Because docbook doesn't. - # See that `unless` below? If we were walking it should be `until` but - # docbook *doesn't* walk. It just does this. Why? Ghosts maybe. I dunno. - # But we're trying to emulate docbook. So here we are. - ancestor = section - ancestor = ancestor.parent unless ancestor.parent.context == :document - # If *that* section is level 0 then we have to bump the hlevel of our - # section by one. The argument for this goes: we have to bump the level 0 - # section's hlevel by one anyway because there *isn't* an h0 tag. So we - # have to bump all of its children. - section.level + (ancestor.level.zero? ? 1 : 0) + # If the heading level is less than 2, use 2, + # otherwise use the given heading level. + # + # This ensures: + # - There are no `h0`s, which are not valid HTML elements. + # - There are no `h1`s in the page's main content since + # we only want one `h1` per page, and one is generated + # automatically and added to the page header (outside + # div#content). + if section.level < 2 + 2 + else + section.level + end end SECTION_WRAPPER_CLASSES = %w[part chapter].freeze diff --git a/resources/asciidoctor/spec/chunker_spec.rb b/resources/asciidoctor/spec/chunker_spec.rb index 1f9bf79c5af1b..b34acedae44d8 100644 --- a/resources/asciidoctor/spec/chunker_spec.rb +++ b/resources/asciidoctor/spec/chunker_spec.rb @@ -197,14 +197,6 @@ def dest_file(file)

        Words words.[1]

        HTML end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title -
        - HTML - end it 'contains a link to the second section' do expect(contents).to include( 'Section 2' @@ -236,14 +228,6 @@ def dest_file(file) it 'contains the contents' do expect(contents).to include '

        Words again.

        ' end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title -
        - HTML - end it 'contains a link to an element in the first section' do expect(contents).to include( 'override text' @@ -262,6 +246,36 @@ def dest_file(file) HTML end end + context 'breadcrumbs' do + before(:each) do + # We need docbook compat to verify breadcrumbs + # We unregister_all first because the order that we + # register the plugins matters. + Asciidoctor::Extensions.unregister_all + Asciidoctor::Extensions.register DocbookCompat + Asciidoctor::Extensions.register Chunker + end + file_context 'the first section', 's1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title +
        + HTML + end + end + file_context 'the second section', 's2.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title +
        + HTML + end + end + end end context 'there is a level 2 section' do let(:input) do @@ -402,13 +416,25 @@ def dest_file(file) include_examples 'standard page', 'index', nil let(:prev_title) { 'Title [fooo]' } include_examples 'subpage' - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title [fooo] -
        - HTML + end + context 'breadcrumbs' do + before(:each) do + # We need docbook compat to verify breadcrumbs + # We unregister_all first because the order that we + # register the plugins matters. + Asciidoctor::Extensions.unregister_all + Asciidoctor::Extensions.register DocbookCompat + Asciidoctor::Extensions.register Chunker + end + file_context 'the section', 's1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title [fooo] +
        + HTML + end end end end @@ -508,7 +534,7 @@ def dest_file(file) end it 'contains the heading' do expect(contents).to include( - '

        Section: With subtitle

        ' + '

        Section: With subtitle

        ' ) end it 'contains the contents' do @@ -628,14 +654,6 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        S1

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title -
        - HTML - end it 'contains a link to the level 3 section' do expect(contents).to include('S2_1_1') end @@ -646,15 +664,6 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        S1_1

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title - ›S1 -
        - HTML - end end file_context 'the second level 1 section', 's2.html' do include_examples 'standard page', 's1_1', 's2_1' @@ -662,14 +671,6 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        S2

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title -
        - HTML - end end file_context 'the second level 2 section', 's2_1.html' do include_examples 'standard page', 's2', 's2_2' @@ -680,15 +681,6 @@ def dest_file(file) it 'contains the level 3 section' do expect(contents).to include('

        S2_1_1

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title - ›S2 -
        - HTML - end end file_context 'the last level 2 section', 's2_2.html' do include_examples 'standard page', 's2_1', nil @@ -696,14 +688,68 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        S2_2

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title - ›S2 -
        - HTML + end + context 'breadcrumbs' do + before(:each) do + # We need docbook compat to verify breadcrumbs + # We unregister_all first because the order that we + # register the plugins matters. + Asciidoctor::Extensions.unregister_all + Asciidoctor::Extensions.register DocbookCompat + Asciidoctor::Extensions.register Chunker + end + file_context 'the first level 1 section', 's1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title +
        + HTML + end + file_context 'the first level 2 section', 's1_1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title + ›S1 +
        + HTML + end + end + file_context 'the second level 1 section', 's2.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title +
        + HTML + end + end + file_context 'the second level 2 section', 's2_1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title + ›S2 +
        + HTML + end + end + file_context 'the last level 2 section', 's2_2.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title + ›S2 +
        + HTML + end + end end end end @@ -762,14 +808,6 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        Appendix A: Foo

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title -
        - HTML - end end file_context 'the first page in the appendix', 'app_1.html' do include_examples 'standard page', 'app', 'app_2' @@ -779,15 +817,6 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        Foo 1

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title - ›Foo -
        - HTML - end end file_context 'the first page in the appendix', 'app_2.html' do include_examples 'standard page', 'app_1', nil @@ -796,14 +825,47 @@ def dest_file(file) it 'contains the heading' do expect(contents).to include('

        Foo 2

        ') end - it 'contains the breadcrumbs' do - expect(contents).to include <<~HTML -
        - Elastic Docs - ›Title - ›Foo -
        - HTML + end + context 'breadcrumbs' do + before(:each) do + # We need docbook compat to verify breadcrumbs + # We unregister_all first because the order that we + # register the plugins matters. + Asciidoctor::Extensions.unregister_all + Asciidoctor::Extensions.register DocbookCompat + Asciidoctor::Extensions.register Chunker + end + file_context 'the appendix', 'app.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title +
        + HTML + end + file_context 'the first page in the appendix', 'app_1.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title + ›Foo +
        + HTML + end + end + file_context 'the first page in the appendix', 'app_2.html' do + it 'contains the breadcrumbs' do + expect(contents).to include <<~HTML +
        + Elastic Docs + ›Title + ›Foo +
        + HTML + end + end end end end diff --git a/resources/asciidoctor/spec/docbook_compat_spec.rb b/resources/asciidoctor/spec/docbook_compat_spec.rb index 4d8650c6f276d..5f7ada5f31775 100644 --- a/resources/asciidoctor/spec/docbook_compat_spec.rb +++ b/resources/asciidoctor/spec/docbook_compat_spec.rb @@ -111,12 +111,10 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
        +

        Title

        -
        - -
        HTML end end @@ -133,12 +131,10 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
        +

        Title

        -
        - -
        HTML end end @@ -169,10 +165,10 @@ it "is wrapped in docbook's funny titlepage" do expect(converted).to include(<<~HTML)
        +

        Title

        -
        HTML end @@ -180,7 +176,6 @@ context 'the table of contents' do it 'is outside the titlepage' do expect(converted).to include(<<~HTML) -
        @@ -293,7 +288,7 @@ expect(converted).not_to include '' end it 'includes the unabbreviated title' do - expect(converted).to include 'Section 1' + expect(converted).to include 'Section 1' end it 'includes a link to the abbreviated section' do expect(converted).to include <<~HTML.strip @@ -364,23 +359,15 @@ Words. ASCIIDOC end - context 'the title' do - it "doesn't include the subtitle" do - expect(converted).to include(<<~HTML) - Title | Elastic - - HTML - end - end context 'the header' do it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
        +

        Title

        Subtitle

        -
        HTML @@ -407,10 +394,10 @@ it 'includes the title and subtitle' do expect(converted).to include(<<~HTML)
        +

        foo

        -
        HTML @@ -495,64 +482,6 @@ end end end - context 'when the head is disabled' do - let(:convert_attributes) do - { - # Shrink the output slightly so it is easier to read - 'stylesheet!' => false, - # Disable the head - 'noheader' => true, - } - end - let(:input) do - <<~ASCIIDOC - = Title - - Words. - ASCIIDOC - end - context 'the header' do - it "doesn't contain the title h1" do - expect(converted).not_to include('Title') - end - end - context 'the body' do - it "doesn't have attributes" do - expect(converted).to include('') - end - it "doesn't include the 'book' wrapper" do - expect(converted).not_to include(<<~HTML) -
        - HTML - end - end - - context 'when there is a page-header' do - let(:convert_attributes) do - { - # Shrink the output slightly so it is easier to read - 'stylesheet!' => false, - 'noheader' => true, - 'page-header' => '
        ', - } - end - let(:input) do - <<~ASCIIDOC - = Title - - Words. - ASCIIDOC - end - context 'the header' do - it 'contains the page-header right after the body tag' do - expect(converted).not_to include <<~HTML - -
        - HTML - end - end - end - end context 'when the head is disabled' do let(:convert_attributes) do { @@ -634,9 +563,10 @@ end end it "is wrapped in docbook's funny titlepage" do + level = hlevel < 2 ? 2 : hlevel expect(converted).to include(<<~HTML)
        - #{title}#{xpack_tag} + #{title}#{xpack_tag}
        HTML end @@ -801,7 +731,7 @@ include_examples 'section basics', 'appendix', 1, '_foo', 'Appendix A: Foo' it "doesn't bump the h tags of sections within it" do - expect(converted).to include 'Bar' + expect(converted).to include 'Bar' end end end diff --git a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb index 884fac8a63a0d..7102aa0821309 100644 --- a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb +++ b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb @@ -195,7 +195,7 @@ end it 'uses the attributes for the header' do expect(converted).to include <<~HTML -

        Header

        +

        Header

        HTML end it 'uses the attributes outside of the header' do @@ -299,7 +299,7 @@ expect(converted).to eq <<~HTML
        -

        Example

        +

        Example

        @@ -340,7 +340,7 @@ expect(converted).to eq <<~HTML
        -

        Example

        +

        Example

        @@ -470,7 +470,7 @@ end it 'has the right offset' do expect(converted).to include <<~HTML -

        Target

        +

        Target

        HTML end end diff --git a/resources/web/__test__/air_gapped_template.test.js b/resources/web/__test__/air_gapped_template.test.js index 21330037142e3..5cac7ab6aca9a 100644 --- a/resources/web/__test__/air_gapped_template.test.js +++ b/resources/web/__test__/air_gapped_template.test.js @@ -44,8 +44,8 @@ describe("air_gapped_template.html", () => { * the built-docs repo. */ const compiledWebResources = [ - "/guide/static/styles.css", - "/guide/static/docs.js", + "/guide/static/styles-v1.css", + "/guide/static/docs-v1.js", "/guide/static/jquery.js" ]; /** diff --git a/resources/web/air_gapped_template.html b/resources/web/air_gapped_template.html index 5dad3d7e9156e..4067c8d44c8c8 100644 --- a/resources/web/air_gapped_template.html +++ b/resources/web/air_gapped_template.html @@ -30,7 +30,7 @@ - + @@ -103,7 +103,7 @@
        - + diff --git a/resources/web/docs_js/__tests__/docs.test.js b/resources/web/docs_js/__tests__/docs.test.js index 87ad943e037b4..80bd11bf55484 100644 --- a/resources/web/docs_js/__tests__/docs.test.js +++ b/resources/web/docs_js/__tests__/docs.test.js @@ -1,6 +1,6 @@ import {jQuery} from "../deps"; import dedent from "../../../../../node_modules/dedent"; -import {init_console_widgets, init_headers} from "../index"; +import {init_console_widgets, init_headers} from "../index-v1"; import * as utils from "../utils"; import * as l from "../localization"; import store from "../store"; @@ -115,7 +115,7 @@ function describeInitHeaders(name, guideBody, onThisPageAssertions) { describe(name, () => { beforeEach(() => { document.body.innerHTML = dedent ` -
        +
        ${guideBody}
        @@ -142,28 +142,28 @@ describe('On This Page', () => { `; const oneSubsection = dedent ` ${onlyTitle} -

        +

        Near Realtime (NRT) -

        + `; const twoSubsections = dedent ` ${oneSubsection} -

        +

        Cluster -

        + `; const fourSubsections = dedent ` ${twoSubsections} -

        +

        Observability -

        -

        +

        +

        APM -

        + `; describeInitHeaders('for page with just a title', onlyTitle, () => { diff --git a/resources/web/docs_js/index.js b/resources/web/docs_js/index-v1.js similarity index 87% rename from resources/web/docs_js/index.js rename to resources/web/docs_js/index-v1.js index 6b180c4b2a3bd..aaf182c30a745 100644 --- a/resources/web/docs_js/index.js +++ b/resources/web/docs_js/index-v1.js @@ -1,20 +1,20 @@ -import AlternativeSwitcher from "./components/alternative_switcher"; -import ConsoleWidget from "./components/console_widget"; -import FeedbackModal from './components/feedback_modal'; -import FeedbackWidget from './components/feedback_widget'; -import Modal from "./components/modal"; -import mount from "./components/mount"; -import {switchTabs} from "./components/tabbed_widget"; -import {Cookies, $} from "./deps"; -import {lang_strings} from "./localization"; -import store from "./store"; +import AlternativeSwitcher from "./components/alternative_switcher.js"; +import ConsoleWidget from "./components/console_widget.jsx"; +import FeedbackModal from './components/feedback_modal.jsx'; +import FeedbackWidget from './components/feedback_widget.jsx'; +import Modal from "./components/modal.js"; +import mount from "./components/mount.js"; +import {switchTabs} from "./components/tabbed_widget.js"; +import {Cookies, $} from "./deps.js"; +import {lang_strings} from "./localization.js"; +import store from "./store.js"; import * as utils from "./utils.js"; -import PR from "../lib/prettify/prettify"; -import "./prettify/lang-asciidoc"; -import "./prettify/lang-console"; -import "../lib/prettify/lang-esql"; -import "../lib/prettify/lang-sql"; -import "../lib/prettify/lang-yaml"; +import PR from "../lib/prettify/prettify.js"; +import "./prettify/lang-asciidoc.js"; +import "./prettify/lang-console.js"; +import "../lib/prettify/lang-esql.js"; +import "../lib/prettify/lang-sql.js"; +import "../lib/prettify/lang-yaml.js"; // Add support for
        in IE and the like import "../../../../../node_modules/details-polyfill"; @@ -63,10 +63,10 @@ export function init_headers(sticky_content, lang_strings) { this_page.append('

        ' + lang_strings('On this page') + '

        '); var ul = $('
          ').appendTo(this_page); var items = 0; - var baseHeadingLevel = 0; - $('#guide a[id]:not([href])').each( - function(i, el) { + // Get all headings inside the main body of the doc + $('div#content a[id]:not([href])').each( + function(i) { // Make headers into real links for permalinks this.href = '#' + this.id; @@ -76,17 +76,11 @@ export function init_headers(sticky_content, lang_strings) { // Assume initial heading is an H1, but adjust if it's not let hLevel = 0; if ($(this).parent().is("h2")){ - hLevel = 1; + hLevel = 0; } else if ($(this).parent().is("h3")){ - hLevel = 2; + hLevel = 1; } else if ($(this).parent().is("h4")){ - hLevel = 3; - } - - // Set the base heading level for the page to the title page level + 1 - // This ensures top level headings aren't nested - if (i === 0){ - baseHeadingLevel = hLevel + 1; + hLevel = 2; } // Build list items for all headings except the page title @@ -94,8 +88,7 @@ export function init_headers(sticky_content, lang_strings) { title_container.find('a,.added,.coming,.deprecated,.experimental') .remove(); var text = title_container.html(); - const adjustedLevel = hLevel - baseHeadingLevel; - const li = '
        • ' + text + '
          • '; + const li = '
        • ' + text + '
          • '; ul.append(li); } } @@ -252,7 +245,9 @@ function highlight_otp() { }) }) - document.querySelectorAll('#guide a[id]').forEach((heading) => { + document.querySelectorAll('div#content a[id]').forEach((heading, i) => { + // Skip the first heading since it's not visible + if (i === 0) return observer.observe(heading); }) } @@ -346,6 +341,42 @@ $(function() { AlternativeSwitcher(store()); + // Get all headings inside the main body of the doc + const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6') + let allLevels = [] + // Create a list of all heading levels used on the page + allHeadings.each(function(index) { + // Don't include the first heading because that's the title + if (index === 0) return; + if (!allLevels.includes($(this).prop('nodeName'))) allLevels.push($(this).prop('nodeName')); + }) + // Update the heading level to be incremental + // (i.e. the first heading after the title should be an h2 and + // then deeper levels should be adjusted so they are incremental) + allHeadings.each(function(index) { + const currentHeading = $(this) + const contents = currentHeading.prop('innerHTML') + // Don't include the first heading because that's the + // title and we always want that to be an h1 + if (index > 0) { + if (allLevels[0] && ($(this).prop('nodeName') === allLevels[0])) { + $(this).replaceWith(`

          ${contents}

          `); + } + if (allLevels[1] && ($(this).prop('nodeName') === allLevels[1])) { + $(this).replaceWith(`

          ${contents}

          `); + } + if (allLevels[2] && ($(this).prop('nodeName') === allLevels[2])) { + $(this).replaceWith(`

          ${contents}

          `); + } + if (allLevels[3] && ($(this).prop('nodeName') === allLevels[3])) { + $(this).replaceWith(`
          ${contents}
          `); + } + if (allLevels[4] && ($(this).prop('nodeName') === allLevels[4])) { + $(this).replaceWith(`
          ${contents}
          `); + } + } + }) + // If breadcrumbs contain a dropdown (e.g. APM, ECS Logging) // handle interaction with the dropdown if ($('#related-products')) { @@ -454,7 +485,7 @@ $(function() { var div = $('div.toc'); // Fetch toc.html unless there is already a .toc on the page - if (div.length == 0 && $('#guide').find('div.article,div.book').length == 0) { + if (div.length == 0) { var url = location.href.replace(/[^\/]+$/, 'toc.html'); var toc = $.get(url, {}, function(data) { left_col.append(data); diff --git a/resources/web/style/admonishment.pcss b/resources/web/style/admonishment.pcss index 5413a1c7f59b0..8fa20318458da 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -85,8 +85,13 @@ .admon_content { margin-left: 80px; - h3 { + /* On page load, the heading level may be changed, + but we always what to style it the same way */ + h2, h3, h4, h5, h6 { margin: 3px 0; + font-size: 22px; + font-weight: 600; + a { font-weight: 600; } } p:last-of-type { margin-bottom: 0em; diff --git a/resources/web/style/console_widget.pcss b/resources/web/style/console_widget.pcss index 0ea12fe5c2361..819c2e0dee455 100644 --- a/resources/web/style/console_widget.pcss +++ b/resources/web/style/console_widget.pcss @@ -65,7 +65,9 @@ .try_console_selector { text-align: center; - h4 { + /* On page load, the heading level may be changed, + but we always what to style it the same way */ + h2, h3, h4, h5, h6 { font-size: 30px; } diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index 4210868e4c5fe..26b0a3e046191 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -19,11 +19,6 @@ background-image: inline("img/link.png"); } } - h1 { - font-size: 36px; - margin: 10px 0 10px; - a { font-weight: 300; } - } h2 { font-size: 29px; margin: 20px 0; @@ -82,5 +77,20 @@ .title { margin: 10px 0 16px; } + /* Styles the page header, which is always an h1 + wrapped in a div with the titlepage class, and always + has the title class. */ + h1.title { + margin: 24px 0; + font-size: 36px; + padding: 0; + a { font-weight: 300; } + } + } + + /* Hide the first heading within the main content + of the page since it is the same as the title */ + div#content > div > .titlepage { + display: none; } -} \ No newline at end of file +} diff --git a/resources/web/styles.pcss b/resources/web/styles-v1.pcss similarity index 100% rename from resources/web/styles.pcss rename to resources/web/styles-v1.pcss diff --git a/resources/web/template.html b/resources/web/template.html index 3e60653d14875..c651a0d0b9fa7 100644 --- a/resources/web/template.html +++ b/resources/web/template.html @@ -42,7 +42,7 @@ - + @@ -143,7 +143,7 @@
          - + From bf432e52ead0d8a3b37db2b90fdbbccd7996a6c3 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 18 Jun 2024 19:08:47 -0500 Subject: [PATCH 0845/1049] fix test (#3019) --- lib/ES/Util.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ES/Util.pm b/lib/ES/Util.pm index ed5c2317b3bf8..f1a0a358ad1c2 100644 --- a/lib/ES/Util.pm +++ b/lib/ES/Util.pm @@ -493,7 +493,7 @@ sub write_nginx_test_config { my $web_conf; if ( $watching_web ) { $web_conf = <<"CONF" - rewrite ^/guide/static/docs\\.js(.*)\$ /guide/static/docs_js/index-v1.js\$1 last; + rewrite ^/guide/static/docs-v1\\.js(.*)\$ /guide/static/docs_js/index-v1.js\$1 last; location ^~ /guide/static/jquery.js { alias /node_modules/jquery/dist/jquery.js; types { From 24f073b6a2ad09b727f41b0b8b06649027762214 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 20 Jun 2024 13:32:50 -0600 Subject: [PATCH 0846/1049] Add Link check pipeline to BK (#3021) * upd * fix --- .buildkite/link_check_pipeline.yml | 15 ++++++++++++ catalog-info.yaml | 39 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .buildkite/link_check_pipeline.yml diff --git a/.buildkite/link_check_pipeline.yml b/.buildkite/link_check_pipeline.yml new file mode 100644 index 0000000000000..f2d06cf5ad0f6 --- /dev/null +++ b/.buildkite/link_check_pipeline.yml @@ -0,0 +1,15 @@ +steps: + - label: 'Clone built-docs' + command: | + git clone git@github.com:elastic/built-docs --branch master --depth 1 + - label: 'ls' + command: | + ls + agents: + provider: "gcp" + image: family/docs-ubuntu-2204 + diskSizeGb: 150 + machineType: n2-standard-4 +# notify: +# - email: "docs-status@elastic.co" +# if: build.state == "failed" diff --git a/catalog-info.yaml b/catalog-info.yaml index 23267234066f9..1b4b261b05382 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -194,3 +194,42 @@ spec: access_level: BUILD_AND_READ everyone: access_level: READ_ONLY + +# Declare link-checker +--- +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pipeline-docs-link-checker + description: Link-checker + links: + - title: Pipeline + url: https://buildkite.com/elastic/docs-link-check + +spec: + type: buildkite-pipeline + owner: group:docs + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: docs / link_check + spec: + repository: elastic/docs + pipeline_file: ".buildkite/link_check_pipeline.yml" + provider_settings: + trigger_mode: none + schedules: + Daily Run: + branch: "master" + # This cron won't run until 2044 (yes, we want that for now) + cronline: "0 0 29 2 1" + message: "Check links between MDX and Legacy docs." + teams: + docs-build-guild: + access_level: MANAGE_BUILD_AND_READ + docs: + access_level: BUILD_AND_READ + everyone: + access_level: READ_ONLY \ No newline at end of file From 33870eab5d8aebe530adf95c9b9a59e4b85fa5d6 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Fri, 21 Jun 2024 15:02:10 -0500 Subject: [PATCH 0847/1049] Add edit link to h1s (#3015) * add edit link to h1s * fix tests, style --- .../asciidoctor/lib/chunker/extension.rb | 2 +- resources/web/style/heading.pcss | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/resources/asciidoctor/lib/chunker/extension.rb b/resources/asciidoctor/lib/chunker/extension.rb index 5274cbfbe138a..75b29d5f4701a 100644 --- a/resources/asciidoctor/lib/chunker/extension.rb +++ b/resources/asciidoctor/lib/chunker/extension.rb @@ -64,8 +64,8 @@ def convert_section(section) %r{}, generate_breadcrumbs(doc, section).to_s ) - # raise("Couldn't add breadcrumbs in #{html}") end + html.gsub!(%r{}, "#{section.attr('edit_me_link', '')}") write doc, "#{section.id}.html", html '' end diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index 26b0a3e046191..a6c882ea86c9b 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -81,11 +81,32 @@ wrapped in a div with the titlepage class, and always has the title class. */ h1.title { - margin: 24px 0; + margin: 18px 0; font-size: 36px; padding: 0; a { font-weight: 300; } } + &:has(h1.title) { + div { + &:has(>h1){ + display: flex; + align-items: flex-start; + justify-content: space-between; + padding-bottom: 0px; + + h1 { + margin-right: 12px; + } + } + } + + a.edit_me { + align-self: center; + position: relative; + transform: translateY(6px); + width: 32px; + } + } } /* Hide the first heading within the main content From fb16d016cfff79b9ec3611c8036f50c469a91be4 Mon Sep 17 00:00:00 2001 From: Katie Hughes Date: Tue, 25 Jun 2024 11:51:39 -0700 Subject: [PATCH 0848/1049] Update catalog-info.yaml (#3024) --- catalog-info.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 1b4b261b05382..615223d4aae5a 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -229,7 +229,9 @@ spec: teams: docs-build-guild: access_level: MANAGE_BUILD_AND_READ + docs-engineering: + access_level: MANAGE_BUILD_AND_READ docs: access_level: BUILD_AND_READ everyone: - access_level: READ_ONLY \ No newline at end of file + access_level: READ_ONLY From 6edb5cc57feb21a1f253cd85517f935a7d9dad0a Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 27 Jun 2024 07:21:25 -0700 Subject: [PATCH 0849/1049] ESS - Change current to ms-109 (#3022) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 23a6e419c3582..71b776d538cf4 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.14 stacklive: &stacklive [ 8.14, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-108 + cloudSaasCurrent: &cloudSaasCurrent ms-109 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 0db79c54da5c6e54c9488d1654d1adaec5be0f5a Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:42:22 -0400 Subject: [PATCH 0850/1049] Bump ECE docs to 3.7.2 (#3020) --- shared/versions/ece/ms-105.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/ece/ms-105.asciidoc b/shared/versions/ece/ms-105.asciidoc index a814c8ae43ca3..b1f3f94c9e9d4 100644 --- a/shared/versions/ece/ms-105.asciidoc +++ b/shared/versions/ece/ms-105.asciidoc @@ -1,3 +1,3 @@ -:ece-version: 3.7.1 +:ece-version: 3.7.2 :ece-version-short: 3.7 :ece-version-link: 3.7 \ No newline at end of file From 0581b5662a2b83c5e921bf37ad7076c3a55a98c1 Mon Sep 17 00:00:00 2001 From: Joe Peeples Date: Thu, 4 Jul 2024 03:59:13 -0400 Subject: [PATCH 0851/1049] Bump version to 8.14.2 (#3023) --- shared/versions/stack/8.14.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.14.asciidoc b/shared/versions/stack/8.14.asciidoc index 2cb7e82faaeb4..948e181124088 100644 --- a/shared/versions/stack/8.14.asciidoc +++ b/shared/versions/stack/8.14.asciidoc @@ -1,12 +1,12 @@ -:version: 8.14.1 +:version: 8.14.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.14.1 -:logstash_version: 8.14.1 -:elasticsearch_version: 8.14.1 -:kibana_version: 8.14.1 -:apm_server_version: 8.14.1 +:bare_version: 8.14.2 +:logstash_version: 8.14.2 +:elasticsearch_version: 8.14.2 +:kibana_version: 8.14.2 +:apm_server_version: 8.14.2 :branch: 8.14 :minor-version: 8.14 :major-version: 8.x From 6f8e8a60af84d9ded379d31384d3c9b5a92d9ef5 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 11 Jul 2024 04:38:44 -0700 Subject: [PATCH 0852/1049] Bump the docs version to 8.14.3 (#3028) --- shared/versions/stack/8.14.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.14.asciidoc b/shared/versions/stack/8.14.asciidoc index 948e181124088..736bade6ba459 100644 --- a/shared/versions/stack/8.14.asciidoc +++ b/shared/versions/stack/8.14.asciidoc @@ -1,12 +1,12 @@ -:version: 8.14.2 +:version: 8.14.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.14.2 -:logstash_version: 8.14.2 -:elasticsearch_version: 8.14.2 -:kibana_version: 8.14.2 -:apm_server_version: 8.14.2 +:bare_version: 8.14.3 +:logstash_version: 8.14.3 +:elasticsearch_version: 8.14.3 +:kibana_version: 8.14.3 +:apm_server_version: 8.14.3 :branch: 8.14 :minor-version: 8.14 :major-version: 8.x From 0b70deea4b0057fee179174ce61cbed8c817029c Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:05:52 +0100 Subject: [PATCH 0853/1049] Add stack-ref-80 attribute (#3032) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index c851cc8404337..5ecf3a1039913 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -58,6 +58,7 @@ Elastic-level pages :stack-ref-67: https://www.elastic.co/guide/en/elastic-stack/6.7 :stack-ref-68: https://www.elastic.co/guide/en/elastic-stack/6.8 :stack-ref-70: https://www.elastic.co/guide/en/elastic-stack/7.0 +:stack-ref-80: https://www.elastic.co/guide/en/elastic-stack/8.0 :stack-ov: https://www.elastic.co/guide/en/elastic-stack-overview/{branch} :stack-gs: https://www.elastic.co/guide/en/elastic-stack-get-started/{branch} :stack-gs-current: https://www.elastic.co/guide/en/elastic-stack-get-started/current From 5e660317e4555d52678dee7462781124ba94a64b Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Mon, 15 Jul 2024 09:53:11 -0700 Subject: [PATCH 0854/1049] Add INTEGRATIONS_DEV_DOCS variable to doc link checks (#3034) --- build_docs.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_docs.pl b/build_docs.pl index e3cc6dfdcb3ff..695537334b70a 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -354,7 +354,7 @@ sub check_kibana_links { my $extractor = sub { my $contents = shift; return sub { - while ( $contents =~ m!`(\$\{(?:baseUrl|ELASTIC.+|KIBANA_DOCS|PLUGIN_DOCS|FLEET_DOCS|APM_DOCS|STACK_DOCS|SECURITY_SOLUTION_DOCS|STACK_GETTING_STARTED|APP_SEARCH_DOCS|ENTERPRISE_SEARCH_DOCS|WORKPLACE_SEARCH_DOCS)\}[^`]+)`!g ) { + while ( $contents =~ m!`(\$\{(?:baseUrl|ELASTIC.+|KIBANA_DOCS|PLUGIN_DOCS|FLEET_DOCS|APM_DOCS|STACK_DOCS|SECURITY_SOLUTION_DOCS|STACK_GETTING_STARTED|APP_SEARCH_DOCS|ENTERPRISE_SEARCH_DOCS|INTEGRATIONS_DEV_DOCS|WORKPLACE_SEARCH_DOCS)\}[^`]+)`!g ) { my $path = $1; $path =~ s/\$\{(?:DOC_LINK_VERSION|urlVersion)\}/$version/; $path =~ s/\$\{(?:ECS_VERSION)\}/current/; @@ -375,6 +375,7 @@ sub check_kibana_links { $path =~ s!\$\{ENTERPRISE_SEARCH_DOCS\}!en/enterprise-search/$version/!; $path =~ s!\$\{WORKPLACE_SEARCH_DOCS\}!en/workplace-search/$version/!; $path =~ s!\$\{MACHINE_LEARNING_DOCS\}!en/machine-learning/$version/!; + $path =~ s!\$\{INTEGRATIONS_DEV_DOCS}!en/integrations-developer/current/!; # Replace the "https://www.elastic.co/guide/" URL prefix so that # it becomes a file path in the built docs. $path =~ s!\$\{(?:baseUrl|ELASTIC_WEBSITE_URL)\}guide/!!; From 8f8fa785c8375e461d8e1bd063426751ae6a8a3a Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Mon, 15 Jul 2024 15:09:25 -0500 Subject: [PATCH 0855/1049] Adds 8.15 and bumps master to 8.16 (#3029) * Adds 8.15 * Bumps master to 8.16 * Update shared/versions/stack/8.15.asciidoc Co-authored-by: Lisa Cawley * Update shared/versions/stack/8.15.asciidoc Co-authored-by: Lisa Cawley --------- Co-authored-by: Lisa Cawley --- conf.yaml | 128 +++++++++++++------------- shared/versions/stack/8.15.asciidoc | 69 ++++++++++++++ shared/versions/stack/master.asciidoc | 14 +-- 3 files changed, 140 insertions(+), 71 deletions(-) create mode 100644 shared/versions/stack/8.15.asciidoc diff --git a/conf.yaml b/conf.yaml index 71b776d538cf4..5ca3ab395fdba 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,7 +129,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -144,13 +144,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -166,7 +166,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -180,12 +180,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -241,7 +241,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -258,7 +258,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -275,7 +275,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -295,7 +295,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -312,7 +312,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -327,7 +327,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -342,7 +342,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -357,7 +357,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -372,7 +372,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -389,7 +389,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -406,7 +406,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 3 @@ -450,7 +450,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -923,7 +923,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -948,7 +948,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -992,7 +992,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1014,7 +1014,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x ] + branches: [ {main: master}, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1027,7 +1027,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1040,7 +1040,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1053,7 +1053,7 @@ contents: - title: .NET Clients prefix: net-api current: 8.9 - branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net @@ -1069,7 +1069,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1098,7 +1098,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1124,7 +1124,7 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: [ main, 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 ] index: docs/index.asciidoc chunk: 1 @@ -1224,7 +1224,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1238,7 +1238,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1271,7 +1271,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1283,38 +1283,38 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 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 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 ] + exclude_branches: [ main, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1331,7 +1331,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1346,7 +1346,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1358,11 +1358,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1380,7 +1380,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1404,7 +1404,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1430,7 +1430,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1446,7 +1446,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1470,7 +1470,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1485,7 +1485,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1508,11 +1508,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 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.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 ] + exclude_branches: [ main, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1528,7 +1528,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1543,11 +1543,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1569,7 +1569,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1635,7 +1635,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1688,7 +1688,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1719,7 +1719,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1744,7 +1744,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1799,7 +1799,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1846,7 +1846,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1903,7 +1903,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -1946,7 +1946,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2275,7 +2275,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc new file mode 100644 index 0000000000000..82a190a9ce390 --- /dev/null +++ b/shared/versions/stack/8.15.asciidoc @@ -0,0 +1,69 @@ +:version: 8.15.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.15.0 +:logstash_version: 8.15.0 +:elasticsearch_version: 8.15.0 +:kibana_version: 8.15.0 +:apm_server_version: 8.15.0 +:branch: 8.15 +:minor-version: 8.15 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.11 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 \ No newline at end of file diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 422f821f2119a..85b439eaddff4 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -1,14 +1,14 @@ -:version: 8.15.0 +:version: 8.16.0 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.0 -:logstash_version: 8.15.0 -:elasticsearch_version: 8.15.0 -:kibana_version: 8.15.0 -:apm_server_version: 8.15.0 +:bare_version: 8.16.0 +:logstash_version: 8.16.0 +:elasticsearch_version: 8.16.0 +:kibana_version: 8.16.0 +:apm_server_version: 8.16.0 :branch: master -:minor-version: 8.15 +:minor-version: 8.16 :major-version: 8.x :prev-major-version: 7.x :prev-major-last: 7.17 From 612ce2d58acb3a1e50f6eec31c83b943ecf8690c Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 16 Jul 2024 17:49:41 +0200 Subject: [PATCH 0856/1049] Update pull-requests.org-wide.json (#3035) --- .buildkite/pull-requests.org-wide.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 58f2975b9bc4a..6f031eb93fa6a 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -9,7 +9,7 @@ "admin", "write" ], - "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]", "dependabot[bot]"], + "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]", "dependabot[bot]", "elastic-renovate-prod[bot]"], "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", From c139d7ae5e851767252233afef2cf905e50b16b7 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 16 Jul 2024 10:00:27 -0700 Subject: [PATCH 0857/1049] Update banner for master doc versions (#3031) --- integtest/spec/all_books_spec.rb | 6 ++---- lib/ES/Book.pm | 12 +++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 35dffd848cea4..9a4164769f8a4 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,9 +639,7 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
          - You are looking at preliminary documentation for a future release. - Not what you want? See the - current release documentation. + This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details.
          HTML end @@ -975,7 +973,7 @@ def self.setup shared_examples 'future version' do it 'contains a "future" header' do expect(body).to include('
          ') - expect(body).to include('You are looking at preliminary documentation') + expect(body).to include('This documentation contains work-in-progress') end end shared_examples 'past version' do diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 0648f64113bd8..9ef7552154bff 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -25,9 +25,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER }, zh_cn => { @@ -52,9 +50,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER }, ko => { @@ -68,9 +64,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER } From 5d65d339920afbb10a0a0d949d4ae798376bd162 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:19:29 -0400 Subject: [PATCH 0858/1049] ESS - Change current to ms-110 (#3026) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 5ca3ab395fdba..754f5fa761c84 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.14 stacklive: &stacklive [ 8.14, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-109 + cloudSaasCurrent: &cloudSaasCurrent ms-110 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 546e87d7624fe6735f0d186b1115a4f26d6e3726 Mon Sep 17 00:00:00 2001 From: Karen Metts <35154725+karenzone@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:19:10 -0400 Subject: [PATCH 0859/1049] Add x-pack-auditbeat to conf.yaml (#3038) --- conf.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf.yaml b/conf.yaml index 754f5fa761c84..7f0009260ba3b 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1672,6 +1672,10 @@ contents: repo: beats path: x-pack/libbeat/processors/*/docs/* exclude_branches: [ 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 ] + - + repo: beats + path: x-pack/auditbeat/processors/*/docs/* + exclude_branches: [ 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, 1.3, 1.2, 1.1, 1.0.1 ] - repo: beats path: libbeat/outputs/*/docs/* From 9bc17c8a571816ba4b6c183bd0f04df42cded792 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 30 Jul 2024 09:21:31 -0600 Subject: [PATCH 0860/1049] Update 7.17.asciidoc (#3040) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 9b1d82bcffb3b..92accf83207cc 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.22 +:version: 7.17.23 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.22 -:logstash_version: 7.17.22 -:elasticsearch_version: 7.17.22 -:kibana_version: 7.17.22 -:apm_server_version: 7.17.22 +:bare_version: 7.17.23 +:logstash_version: 7.17.23 +:elasticsearch_version: 7.17.23 +:kibana_version: 7.17.23 +:apm_server_version: 7.17.23 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 1baddaa3bbecad83c848403242b84f79fc7607aa Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Wed, 7 Aug 2024 09:22:57 +0200 Subject: [PATCH 0861/1049] Add ECK 2.14 (#3042) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 7f0009260ba3b..37db7570e8527 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2150,7 +2150,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.13 - branches: [ {main: master}, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ {main: master}, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From d00a089dacc393f7271f4e5921f02e0ad325c5b1 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 8 Aug 2024 14:53:08 +0200 Subject: [PATCH 0862/1049] Make 2.14 the current version for ECK (#3043) * Make 2.14 the current version for ECK * fix bad merge --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 37db7570e8527..7b2ed33fc99ee 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2149,7 +2149,7 @@ contents: prefix: en/cloud-on-k8s tags: Kubernetes/Reference subject: ECK - current: 2.13 + current: 2.14 branches: [ {main: master}, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 From aacf6ef23d086946375db68f625d97609765dc3c Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Thu, 8 Aug 2024 11:06:00 -0500 Subject: [PATCH 0863/1049] Bumps current to 8.15.0 (#3036) --- conf.yaml | 4 ++-- shared/versions/stack/8.14.asciidoc | 2 +- shared/versions/stack/8.15.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index 7b2ed33fc99ee..6232507b8871e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -77,8 +77,8 @@ contents_title: Elastic documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.14 - stacklive: &stacklive [ 8.14, 7.17 ] + stackcurrent: &stackcurrent 8.15 + stacklive: &stacklive [ 8.15, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-110 diff --git a/shared/versions/stack/8.14.asciidoc b/shared/versions/stack/8.14.asciidoc index 736bade6ba459..b4d0343fce684 100644 --- a/shared/versions/stack/8.14.asciidoc +++ b/shared/versions/stack/8.14.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 82a190a9ce390..832f519f7821a 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -23,12 +23,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index 77628edfd105c..ad2a1e325db81 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.14.asciidoc[] +include::8.15.asciidoc[] From 347766ec884f2f2f65844c8533eaa82d496116ab Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:31:54 -0400 Subject: [PATCH 0864/1049] ESS - Change current to ms-111 (#3041) * ESS - Change current to ms-111 * Rebuild --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 6232507b8871e..999b28197dbc7 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.15 stacklive: &stacklive [ 8.15, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-110 + cloudSaasCurrent: &cloudSaasCurrent ms-111 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 99cb3d9ee0c85584cb54682cca21fbfcc76cf024 Mon Sep 17 00:00:00 2001 From: Jamie Tanna Date: Mon, 12 Aug 2024 17:55:08 +0100 Subject: [PATCH 0865/1049] Explicitly opt out of Renovate (#3046) This repository doesn't gain any value from using Renovate, so we can be super clear that we want to opt out. --- renovate.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000..6132aecd0b8b5 --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "enabled": false +} From 821dfbf75482a785d1c3ca332caa9f0478e120d8 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 15 Aug 2024 07:34:58 -0700 Subject: [PATCH 0866/1049] [DOCS] Version-aware API URLs (#3047) --- shared/versions/stack/8.15.asciidoc | 7 ++++++- shared/versions/stack/master.asciidoc | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 832f519f7821a..8cec296349700 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -66,4 +66,9 @@ ECS Logging //// Synthetics //// -:synthetics_version: v1.3.0 \ No newline at end of file +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 \ No newline at end of file diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 85b439eaddff4..d363828306003 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -67,3 +67,8 @@ ECS Logging Synthetics //// :synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana \ No newline at end of file From a11258b8c5ceff71716f0747c7a142983427df3c Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Mon, 19 Aug 2024 13:47:47 -0700 Subject: [PATCH 0867/1049] Bump Obs Guide chunk level (#3045) * Bump Obs Guide chunk level * handle h7s --------- Co-authored-by: Colleen McGinnis --- conf.yaml | 2 +- doc_build_aliases.sh | 2 +- resources/web/docs_js/index-v1.js | 2 +- resources/web/style/heading.pcss | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 999b28197dbc7..71b3833fde550 100644 --- a/conf.yaml +++ b/conf.yaml @@ -409,7 +409,7 @@ contents: branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc - chunk: 3 + chunk: 4 tags: Observability/Guide subject: Observability sources: diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 96ad32ec28c10..698c298018e49 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -110,7 +110,7 @@ alias docbldeesr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/enterprise-search-ru alias docbldewsn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/enterprise-search-pubs/client-docs/workplace-search-node/index.asciidoc --single' # Observability Guide 8.8 and later -alias docbldob='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 3 --resource $GIT_HOME/apm-server --resource=$GIT_HOME/ingest-docs/docs' +alias docbldob='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 4 --resource $GIT_HOME/apm-server --resource=$GIT_HOME/ingest-docs/docs' # Observability Guide 8.7 and earlier alias docbldobold='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/observability/index.asciidoc --chunk 2 --resource $GIT_HOME/beats/libbeat/docs --resource $GIT_HOME/apm-server/docs/guide --resource=$GIT_HOME/ingest-docs/docs' diff --git a/resources/web/docs_js/index-v1.js b/resources/web/docs_js/index-v1.js index aaf182c30a745..926bd0e2c0526 100644 --- a/resources/web/docs_js/index-v1.js +++ b/resources/web/docs_js/index-v1.js @@ -342,7 +342,7 @@ $(function() { AlternativeSwitcher(store()); // Get all headings inside the main body of the doc - const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6') + const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6,h7') let allLevels = [] // Create a list of all heading levels used on the page allHeadings.each(function(index) { diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index a6c882ea86c9b..8d689a0cfc45d 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -50,6 +50,11 @@ margin: 16px 0 5px; } + /** I _think_ h7 is not technically valid HTML tag, but in the event that the nesting is deep enough we can at least bold the text */ + h7 { + font-weight: 600; + } + /* Points folks to "edit" pages in github so they can contribute * to the docs! */ .edit_me { From 5a15bb98c9780dbda387299e2eeb2f934e285c62 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 27 Aug 2024 16:02:45 -0500 Subject: [PATCH 0868/1049] Move edit button out of heading elements (#3049) * move edit button outside heading tag * fix tests --- .../docbook_compat/convert_floating_title.rb | 6 ++-- .../lib/docbook_compat/extension.rb | 2 +- .../asciidoctor/spec/docbook_compat_spec.rb | 4 +-- resources/asciidoctor/spec/edit_me_spec.rb | 28 +++++++++---------- .../spec/elastic_compat_preprocessor_spec.rb | 8 +++--- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/resources/asciidoctor/lib/docbook_compat/convert_floating_title.rb b/resources/asciidoctor/lib/docbook_compat/convert_floating_title.rb index 665496a5ab95f..923cc6a314fe9 100644 --- a/resources/asciidoctor/lib/docbook_compat/convert_floating_title.rb +++ b/resources/asciidoctor/lib/docbook_compat/convert_floating_title.rb @@ -7,12 +7,14 @@ module ConvertFloatingTitle def convert_floating_title(node) tag_name = %(h#{node.level + 1}) [ + '
          ', '<', tag_name, node.role ? %( class="#{node.role}") : nil, '>', node.id ? %() : nil, node.title, - node.attr('edit_me_link', ''), xpack_tag(node), - '' + '', + node.attr('edit_me_link', ''), + '
          ' ].compact.join end end diff --git a/resources/asciidoctor/lib/docbook_compat/extension.rb b/resources/asciidoctor/lib/docbook_compat/extension.rb index 5d310742d84de..c16ef1db3a0ff 100644 --- a/resources/asciidoctor/lib/docbook_compat/extension.rb +++ b/resources/asciidoctor/lib/docbook_compat/extension.rb @@ -56,7 +56,7 @@ def convert_section(node) <<~HTML
          - #{node.captioned_title}#{node.attr 'edit_me_link', ''}#{xpack_tag node} +
          #{node.captioned_title}#{xpack_tag node}#{node.attr 'edit_me_link', ''}
          #{node.content}
          diff --git a/resources/asciidoctor/spec/docbook_compat_spec.rb b/resources/asciidoctor/spec/docbook_compat_spec.rb index 5f7ada5f31775..0fb4f34222eb1 100644 --- a/resources/asciidoctor/spec/docbook_compat_spec.rb +++ b/resources/asciidoctor/spec/docbook_compat_spec.rb @@ -566,7 +566,7 @@ level = hlevel < 2 ? 2 : hlevel expect(converted).to include(<<~HTML)
          - #{title}#{xpack_tag} +
          #{title}#{xpack_tag}
          HTML end @@ -976,7 +976,7 @@ end it 'has the xpack tag' do expect(converted).to include <<~HTML - Foo + Foo
          HTML end end diff --git a/resources/asciidoctor/spec/edit_me_spec.rb b/resources/asciidoctor/spec/edit_me_spec.rb index 24e643ff8e243..1a7d1323ee97f 100644 --- a/resources/asciidoctor/spec/edit_me_spec.rb +++ b/resources/asciidoctor/spec/edit_me_spec.rb @@ -75,11 +75,11 @@ def spec_dir_link(file) shared_examples 'has standard edit links' do it "adds a link to #{type} 1" do link = spec_dir_link "#{type}1.adoc" - expect(converted).to include("#{type.capitalize} 1#{link}Chapter#{stdin_link}Section 2#{link} +

          Section 2

          #{link}
          HTML end end @@ -188,7 +188,7 @@ def spec_dir_link(file) end it "doesn't have an edit me link" do expect(converted).to include <<~HTML -

          Section 2

          +

          Section 2

          HTML end end @@ -225,11 +225,11 @@ def spec_dir_link(file) shared_examples 'has standard edit links' do it "adds a link to #{type} 1" do link = spec_dir_link "#{type}1.adoc" - expect(converted).to include("#{type.capitalize} 1#{link}Chapter#{stdin_link}Section 2#{link} +

          Section 2

          #{link}
          HTML end end @@ -345,7 +345,7 @@ def spec_dir_link(file) end it "doesn't have an edit me link" do expect(converted).to include <<~HTML -

          Section 2

          +

          Section 2

          HTML end end diff --git a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb index 7102aa0821309..2c32438469eaa 100644 --- a/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb +++ b/resources/asciidoctor/spec/elastic_compat_preprocessor_spec.rb @@ -195,7 +195,7 @@ end it 'uses the attributes for the header' do expect(converted).to include <<~HTML -

          Header

          +

          Header

          HTML end it 'uses the attributes outside of the header' do @@ -299,7 +299,7 @@ expect(converted).to eq <<~HTML
          -

          Example

          +

          Example

          @@ -340,7 +340,7 @@ expect(converted).to eq <<~HTML
          -

          Example

          +

          Example

          @@ -470,7 +470,7 @@ end it 'has the right offset' do expect(converted).to include <<~HTML -

          Target

          +

          Target

          HTML end end From 0dbc7079afd5ee65a9b45d8d099e292b6ea39acd Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 3 Sep 2024 05:25:29 -0700 Subject: [PATCH 0869/1049] ESS - Change current to ms-112 (#3048) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 71b3833fde550..e637019f80beb 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.15 stacklive: &stacklive [ 8.15, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-111 + cloudSaasCurrent: &cloudSaasCurrent ms-112 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 0967b567ff915d05fdc1d9450c9b5533a4bf036f Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 4 Sep 2024 07:26:09 -0700 Subject: [PATCH 0870/1049] Add shared attribute for Elastic Cloud API (#3052) --- shared/attributes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 5ecf3a1039913..cd67a2f103586 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -202,7 +202,7 @@ Elastic Cloud :cloud-only: This feature is designed for indirect use by {ess-trial}[{ess}], {ece-ref}[{ece}], and {eck-ref}[{eck}]. Direct use is not supported. :ess-setting-change: {ess-icon} indicates a change to a supported {cloud}/ec-add-user-settings.html[user setting] for {ess}. :ess-skip-section: If you use {ess}, skip this section. {ess} handles these changes for you. - +:api-cloud: https://www.elastic.co/docs/api/doc/cloud ////////// Elasticsearch ////////// From fda1f1c74493490e8df2ec306d50a6f5197bda26 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 5 Sep 2024 10:13:03 -0700 Subject: [PATCH 0871/1049] Bump the docs version to 8.15.1 (#3050) --- shared/versions/stack/8.15.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 8cec296349700..42c30cd9d8be5 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -1,12 +1,12 @@ -:version: 8.15.0 +:version: 8.15.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.0 -:logstash_version: 8.15.0 -:elasticsearch_version: 8.15.0 -:kibana_version: 8.15.0 -:apm_server_version: 8.15.0 +:bare_version: 8.15.1 +:logstash_version: 8.15.1 +:elasticsearch_version: 8.15.1 +:kibana_version: 8.15.1 +:apm_server_version: 8.15.1 :branch: 8.15 :minor-version: 8.15 :major-version: 8.x From 122baca0ac9df774cef7b418a01637a7c6fd06dd Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 6 Sep 2024 10:44:03 -0700 Subject: [PATCH 0872/1049] Add 8.x branch attributes (#3054) --- shared/versions/stack/8.x.asciidoc | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 shared/versions/stack/8.x.asciidoc diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc new file mode 100644 index 0000000000000..ab724d4701acf --- /dev/null +++ b/shared/versions/stack/8.x.asciidoc @@ -0,0 +1,74 @@ +:version: 8.16.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.16.0 +:logstash_version: 8.16.0 +:elasticsearch_version: 8.16.0 +:kibana_version: 8.16.0 +:apm_server_version: 8.16.0 +:branch: 8.x +:minor-version: 8.16 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.11 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 \ No newline at end of file From a6e736288e09991aa8b027c89f87b81f622aa476 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 10 Sep 2024 02:22:14 -0700 Subject: [PATCH 0873/1049] Bump the docs version for 7.17.24 (#3053) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 92accf83207cc..e90ae2b75bff9 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.23 +:version: 7.17.24 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.23 -:logstash_version: 7.17.23 -:elasticsearch_version: 7.17.23 -:kibana_version: 7.17.23 -:apm_server_version: 7.17.23 +:bare_version: 7.17.24 +:logstash_version: 7.17.24 +:elasticsearch_version: 7.17.24 +:kibana_version: 7.17.24 +:apm_server_version: 7.17.24 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 2fc87e4020831c338c042ae76cce0a5322eac9fe Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:32:14 +0200 Subject: [PATCH 0874/1049] feat: skip build for APM Server if there are no code changes (#3051) * feat: skip build for APM Server if there are no code changes docs/build-pr is the slowest job in apm-server CI pipeline and it is impacting significantly developer velocity when merging PRs. Update the buildkite pipeline to exit early if there are no docs changes. APM Server docs is actually in a separate repository (observability-docs) and the few remaining files are barely touched (except for the changelog) * fix: diff with merge-base of target branch instead of tip --- .buildkite/scripts/build_pr.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 3aa9159e5bae2..dbd26227e817b 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -52,8 +52,23 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then cd ./product-repo && git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && - git switch pr_$GITHUB_PR_NUMBER && - cd .. + git switch pr_$GITHUB_PR_NUMBER + + if [[ "${GITHUB_PR_BASE_REPO}" == 'apm-server' ]]; then + docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) + else + docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD) + fi + + if [[ -z $docs_diff ]]; then + echo "${GITHUB_PR_TARGET_BRANCH} in ${GITHUB_PR_BASE_REPO} has no docs changes" + exit 0 + fi + + echo "diff:" + echo "$docs_diff" + + cd .. # For product repos - context in https://github.com/elastic/docs/commit/5b06c2dc1f50208fcf6025eaed6d5c4e81200330 build_args+=" --keep_hash" build_args+=" --sub_dir $GITHUB_PR_BASE_REPO:$GITHUB_PR_TARGET_BRANCH:./product-repo" From 1b8c088751b3fb7df5fecdaeb3a7852b5e8c4da0 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 11 Sep 2024 09:20:42 -0700 Subject: [PATCH 0875/1049] Revert "feat: skip build for APM Server if there are no code changes (#3051)" (#3062) This reverts commit 2fc87e4020831c338c042ae76cce0a5322eac9fe. --- .buildkite/scripts/build_pr.sh | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index dbd26227e817b..3aa9159e5bae2 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -52,23 +52,8 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then cd ./product-repo && git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && - git switch pr_$GITHUB_PR_NUMBER - - if [[ "${GITHUB_PR_BASE_REPO}" == 'apm-server' ]]; then - docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) - else - docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD) - fi - - if [[ -z $docs_diff ]]; then - echo "${GITHUB_PR_TARGET_BRANCH} in ${GITHUB_PR_BASE_REPO} has no docs changes" - exit 0 - fi - - echo "diff:" - echo "$docs_diff" - - cd .. + git switch pr_$GITHUB_PR_NUMBER && + cd .. # For product repos - context in https://github.com/elastic/docs/commit/5b06c2dc1f50208fcf6025eaed6d5c4e81200330 build_args+=" --keep_hash" build_args+=" --sub_dir $GITHUB_PR_BASE_REPO:$GITHUB_PR_TARGET_BRANCH:./product-repo" From 7e67b552816ac7263e37f4eea26109da520e4d04 Mon Sep 17 00:00:00 2001 From: Liam Thompson <32779855+leemthompo@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:35:36 +0100 Subject: [PATCH 0876/1049] Update local installation instructions in code widget (#3061) --- resources/web/docs_js/components/console_widget.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/docs_js/components/console_widget.jsx b/resources/web/docs_js/components/console_widget.jsx index e35c105e4b034..7b11aa1e2d069 100644 --- a/resources/web/docs_js/components/console_widget.jsx +++ b/resources/web/docs_js/components/console_widget.jsx @@ -150,7 +150,7 @@ export class _TryConsoleSelector extends Component {

          Install locally From 4f0d390c0a959f96669313e0939a9100fc736d21 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 11 Sep 2024 19:59:29 +0200 Subject: [PATCH 0877/1049] feat(agent-go): skip build for if there are no code changes (#3063) try to run the experiment with apm-agent-go for now only run the diff command for apm-agent-go fetch the target repo to avoid errors on repo different from main --- .buildkite/scripts/build_pr.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 3aa9159e5bae2..294060c226896 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -52,8 +52,24 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then cd ./product-repo && git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && - git switch pr_$GITHUB_PR_NUMBER && - cd .. + git switch pr_$GITHUB_PR_NUMBER + + if [[ "${GITHUB_PR_BASE_REPO}" == 'apm-agent-go' ]]; then + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) + else + docs_diff="always build" + fi + + if [[ -z $docs_diff ]]; then + echo "${GITHUB_PR_TARGET_BRANCH} in ${GITHUB_PR_BASE_REPO} has no docs changes" + exit 0 + fi + + echo "diff:" + echo "$docs_diff" + + cd .. # For product repos - context in https://github.com/elastic/docs/commit/5b06c2dc1f50208fcf6025eaed6d5c4e81200330 build_args+=" --keep_hash" build_args+=" --sub_dir $GITHUB_PR_BASE_REPO:$GITHUB_PR_TARGET_BRANCH:./product-repo" From 14394968052997fa99448077c65cc46cb1a3fd7e Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:21:43 +0200 Subject: [PATCH 0878/1049] fix: always diff against the remote branch (#3064) the check fails if we're targeting a branch that is not the default branch. Since we run git fetch before the diff, we know for a fact that the remote branch exist so just specify the remote and use the remote branch in the diff. --- .buildkite/scripts/build_pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 294060c226896..d1854c0ad1224 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -56,7 +56,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then if [[ "${GITHUB_PR_BASE_REPO}" == 'apm-agent-go' ]]; then git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) else docs_diff="always build" fi From 6766ca79009c9f14081ff32140e2b3a1dcfe8ccf Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 12 Sep 2024 00:19:19 +0200 Subject: [PATCH 0879/1049] feat: reword message when skipping docs PR (#3065) print the PR number and clarify it has no changes compared to the target branch --- .buildkite/scripts/build_pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index d1854c0ad1224..caf05ea2979c6 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -62,7 +62,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then fi if [[ -z $docs_diff ]]; then - echo "${GITHUB_PR_TARGET_BRANCH} in ${GITHUB_PR_BASE_REPO} has no docs changes" + echo "pull/${GITHUB_PR_NUMBER} in ${GITHUB_PR_BASE_REPO} has no docs changes compared to ${GITHUB_PR_TARGET_BRANCH}" exit 0 fi From 337a3cd4b6cf670cfaf4ade3d52eeeb09051490f Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:07:18 +0200 Subject: [PATCH 0880/1049] feat(apm-*): only build docs if there's a doc change (#3066) * feat(apm-*): only build docs if there's a doc change extend the check to all apm repositories and use a switch to make it easier to add more repo that share common file patterns * add comments --------- Co-authored-by: Brandon Morelli --- .buildkite/scripts/build_pr.sh | 38 +++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index caf05ea2979c6..70fa3c9cd8ce7 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -54,18 +54,42 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && git switch pr_$GITHUB_PR_NUMBER - if [[ "${GITHUB_PR_BASE_REPO}" == 'apm-agent-go' ]]; then - git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) - else - docs_diff="always build" - fi - + # Some repositories allow the documentation build to exit early if there are no doc-related changes + # For these repos, we fetch the latest changes from the target branch of the pull request and check + # for changes in specified files and directories with git diff. + case $GITHUB_PR_BASE_REPO in + + # repositories with a docs dir and changelog + "apm-aws-lambda" | "apm-agent-android" | "apm-agent-nodejs" | "apm-agent-python" | "apm-agent-ruby" | "apm-agent-rum-js" | "apm-agent-go" | "apm-agent-java" | "apm-agent-dotnet" | "apm-agent-php" | "apm-agent-ios") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) + ;; + + # repositories with a docs dir + "apm-k8s-attacher") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) + ;; + + # repositories with a docs dir, changelogs dir, and changelog + "apm-server") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) + ;; + + # All other repos will always build + *) + docs_diff="always build" + ;; + esac + + # If docs_diff is empty, exit early and succeed if [[ -z $docs_diff ]]; then echo "pull/${GITHUB_PR_NUMBER} in ${GITHUB_PR_BASE_REPO} has no docs changes compared to ${GITHUB_PR_TARGET_BRANCH}" exit 0 fi + # Regardless of whether we build or not, we print out the diff echo "diff:" echo "$docs_diff" From 751b7ccf9d3b8e469b3048a38b909e8b680f1952 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 12 Sep 2024 14:58:18 -0500 Subject: [PATCH 0881/1049] handle more heading levels (#3060) --- resources/web/docs_js/index-v1.js | 14 +++++++++----- resources/web/style/heading.pcss | 7 +++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/resources/web/docs_js/index-v1.js b/resources/web/docs_js/index-v1.js index 926bd0e2c0526..b8d6f31a988fc 100644 --- a/resources/web/docs_js/index-v1.js +++ b/resources/web/docs_js/index-v1.js @@ -71,16 +71,18 @@ export function init_headers(sticky_content, lang_strings) { this.href = '#' + this.id; // Extract on-this-page headers, without embedded links - var title_container = $(this).parent('h1,h2,h3,h4').clone(); + var title_container = $(this).parent('h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11,h12').clone(); if (title_container.length > 0) { // Assume initial heading is an H1, but adjust if it's not - let hLevel = 0; + let hLevel; if ($(this).parent().is("h2")){ hLevel = 0; } else if ($(this).parent().is("h3")){ hLevel = 1; } else if ($(this).parent().is("h4")){ hLevel = 2; + } else if ($(this).parent().is("h5,h6,h7,h8,h9,h10,h11,h12")) { + hLevel = null } // Build list items for all headings except the page title @@ -88,8 +90,10 @@ export function init_headers(sticky_content, lang_strings) { title_container.find('a,.added,.coming,.deprecated,.experimental') .remove(); var text = title_container.html(); - const li = '

        • ' + text + '
          • '; - ul.append(li); + if (hLevel !== null) { + const li = '
        • ' + text + '
          • '; + ul.append(li); + } } } }); @@ -342,7 +346,7 @@ $(function() { AlternativeSwitcher(store()); // Get all headings inside the main body of the doc - const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6,h7') + const allHeadings = $('div#content').find('h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11,h12') let allLevels = [] // Create a list of all heading levels used on the page allHeadings.each(function(index) { diff --git a/resources/web/style/heading.pcss b/resources/web/style/heading.pcss index 8d689a0cfc45d..e1bec88bfce9c 100644 --- a/resources/web/style/heading.pcss +++ b/resources/web/style/heading.pcss @@ -50,8 +50,11 @@ margin: 16px 0 5px; } - /** I _think_ h7 is not technically valid HTML tag, but in the event that the nesting is deep enough we can at least bold the text */ - h7 { + /** + Headings beyond h6 are not technically valid HTML tags, + but in the event that the nesting is deep enough we can at least bold the text. + **/ + h7, h8, h9, h10, h11, h12 { font-weight: 600; } From 53a7366e0b92d07e821783b020f8cfbf5355e2ca Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 12 Sep 2024 13:00:50 -0700 Subject: [PATCH 0882/1049] Add 8.x branches to documentation build (#3056) --- conf.yaml | 86 +++++++++++++++--------------- shared/attributes.asciidoc | 25 +++++++++ shared/versions/stack/8.x.asciidoc | 10 +++- 3 files changed, 76 insertions(+), 45 deletions(-) diff --git a/conf.yaml b/conf.yaml index e637019f80beb..aa70a3a1e149a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,7 +129,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, {8.x: 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -144,13 +144,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -166,7 +166,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -180,12 +180,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -199,22 +199,22 @@ contents: alternatives: { source_lang: console, alternative_lang: php } repo: elasticsearch-php path: docs/examples - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: python } repo: elasticsearch-py path: docs/examples - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: ruby } repo: elasticsearch-ruby path: docs/examples/guide - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: go } repo: go-elasticsearch path: .doc/examples/doc/ - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -226,12 +226,12 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js path: docs/doc_examples - exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: server/src/main/resources/org/elasticsearch/common @@ -241,7 +241,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -258,7 +258,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -275,7 +275,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -295,7 +295,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -312,7 +312,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -389,7 +389,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -948,7 +948,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 7.17 ] + branches: [ {main: master}, {8.x: 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -992,7 +992,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1224,7 +1224,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1238,7 +1238,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1291,7 +1291,7 @@ contents: - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ @@ -1310,7 +1310,7 @@ contents: - repo: logstash path: docs/ - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability @@ -1380,7 +1380,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1404,7 +1404,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, {8.x: 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1430,7 +1430,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, {8.x: 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1446,7 +1446,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1470,7 +1470,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1512,7 +1512,7 @@ contents: - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, {8.x: 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1528,7 +1528,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1543,11 +1543,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 8.x, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1569,7 +1569,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1635,7 +1635,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1692,7 +1692,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1723,7 +1723,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1748,7 +1748,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1803,7 +1803,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1850,7 +1850,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1907,7 +1907,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -1950,7 +1950,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2279,7 +2279,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index cd67a2f103586..9dfb119234485 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -550,3 +550,28 @@ Legacy definitions :apm-overview-ref-m: https://www.elastic.co/guide/en/apm/get-started/master :infra-guide: https://www.elastic.co/guide/en/infrastructure/guide/{branch} :a-data-source: a data view + +////////// +8.x links +The if directives below are required for 8.x docs that are not yet available. +Without these if directives, the links fail and break the build. +////////// + +ifdef::8x-missing-links[] +:kibana-ref: https://www.elastic.co/guide/en/kibana/master +:enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master +:observability-guide: https://www.elastic.co/guide/en/observability/master +:stack-ref: https://www.elastic.co/guide/en/elastic-stack/master +:security-guide: https://www.elastic.co/guide/en/security/master +:fleet-guide: https://www.elastic.co/guide/en/fleet/master +:apm-guide-ref: https://www.elastic.co/guide/en/apm/guide/master +:es-dotnet-client: https://www.elastic.co/guide/en/elasticsearch/client/net-api/master +:es-php-client: https://www.elastic.co/guide/en/elasticsearch/client/php-api/master +:jsclient: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/master +:es-python-client: https://www.elastic.co/guide/en/elasticsearch/client/python-api/master +:es-ruby-client: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/master +:enterprise-search-node-ref: https://www.elastic.co/guide/en/enterprise-search-clients/enterprise-search-node/master +:enterprise-search-php-ref: https://www.elastic.co/guide/en/enterprise-search-clients/php/master +:enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master +:enterprise-search-ruby-ref: https://www.elastic.co/guide/en/enterprise-search-clients/ruby/master +endif::[] \ No newline at end of file diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index ab724d4701acf..7713d3c79a30c 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -7,7 +7,8 @@ bare_version never includes -alpha or -beta :elasticsearch_version: 8.16.0 :kibana_version: 8.16.0 :apm_server_version: 8.16.0 -:branch: 8.x +// branch is 8.16 instead of 8.x for long-term linking purposes +:branch: 8.16 :minor-version: 8.16 :major-version: 8.x :prev-major-version: 7.x @@ -71,4 +72,9 @@ Synthetics //// API URLs //// -:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 \ No newline at end of file +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 + +////////// +8x-missing-links can be: true | false +////////// +:8x-missing-links: true \ No newline at end of file From b94ca28999858c8a0ce3497b668c28c993c8dac7 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 13 Sep 2024 10:34:41 -0700 Subject: [PATCH 0883/1049] Add 8.x observability-docs (#3069) --- conf.yaml | 6 +++--- shared/attributes.asciidoc | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index aa70a3a1e149a..6b5c638adc0c7 100644 --- a/conf.yaml +++ b/conf.yaml @@ -406,7 +406,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -450,7 +450,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -1485,7 +1485,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 9dfb119234485..c8116e08fa84f 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -560,11 +560,8 @@ Without these if directives, the links fail and break the build. ifdef::8x-missing-links[] :kibana-ref: https://www.elastic.co/guide/en/kibana/master :enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master -:observability-guide: https://www.elastic.co/guide/en/observability/master :stack-ref: https://www.elastic.co/guide/en/elastic-stack/master :security-guide: https://www.elastic.co/guide/en/security/master -:fleet-guide: https://www.elastic.co/guide/en/fleet/master -:apm-guide-ref: https://www.elastic.co/guide/en/apm/guide/master :es-dotnet-client: https://www.elastic.co/guide/en/elasticsearch/client/net-api/master :es-php-client: https://www.elastic.co/guide/en/elasticsearch/client/php-api/master :jsclient: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/master From afa5f86b1aad5bebf87a6863365b44f70f7fe8c3 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Mon, 16 Sep 2024 14:55:00 -0700 Subject: [PATCH 0884/1049] Add 8.x for security-docs (#3070) --- conf.yaml | 2 +- shared/attributes.asciidoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 6b5c638adc0c7..683a2affe683a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -923,7 +923,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index c8116e08fa84f..cc4f68bde8394 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -559,9 +559,9 @@ Without these if directives, the links fail and break the build. ifdef::8x-missing-links[] :kibana-ref: https://www.elastic.co/guide/en/kibana/master +:apm-app-ref: https://www.elastic.co/guide/en/kibana/master :enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master :stack-ref: https://www.elastic.co/guide/en/elastic-stack/master -:security-guide: https://www.elastic.co/guide/en/security/master :es-dotnet-client: https://www.elastic.co/guide/en/elasticsearch/client/net-api/master :es-php-client: https://www.elastic.co/guide/en/elasticsearch/client/php-api/master :jsclient: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/master From 842c31fc8bd65b1e1675a2bc3035784c12a29867 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 17 Sep 2024 09:05:23 -0700 Subject: [PATCH 0885/1049] Add 8.x for clients (#3072) --- conf.yaml | 22 +++++++++++----------- shared/attributes.asciidoc | 10 ---------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/conf.yaml b/conf.yaml index 683a2affe683a..f0627754a19b9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -327,7 +327,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -342,7 +342,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -357,7 +357,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -372,7 +372,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -1014,7 +1014,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x ] + branches: [ {main: master}, {8.x: 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1027,7 +1027,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1040,7 +1040,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1053,7 +1053,7 @@ contents: - title: .NET Clients prefix: net-api current: 8.9 - branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, {8.x: 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, 6.x, 5.x, 2.x, 1.x ] live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] index: docs/index.asciidoc tags: Clients/.Net @@ -1069,7 +1069,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, {8.x: 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1098,7 +1098,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1124,7 +1124,7 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: [ main, 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 ] index: docs/index.asciidoc chunk: 1 diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index cc4f68bde8394..8c95efdd001dd 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -560,15 +560,5 @@ Without these if directives, the links fail and break the build. ifdef::8x-missing-links[] :kibana-ref: https://www.elastic.co/guide/en/kibana/master :apm-app-ref: https://www.elastic.co/guide/en/kibana/master -:enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master :stack-ref: https://www.elastic.co/guide/en/elastic-stack/master -:es-dotnet-client: https://www.elastic.co/guide/en/elasticsearch/client/net-api/master -:es-php-client: https://www.elastic.co/guide/en/elasticsearch/client/php-api/master -:jsclient: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/master -:es-python-client: https://www.elastic.co/guide/en/elasticsearch/client/python-api/master -:es-ruby-client: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/master -:enterprise-search-node-ref: https://www.elastic.co/guide/en/enterprise-search-clients/enterprise-search-node/master -:enterprise-search-php-ref: https://www.elastic.co/guide/en/enterprise-search-clients/php/master -:enterprise-search-python-ref: https://www.elastic.co/guide/en/enterprise-search-clients/python/master -:enterprise-search-ruby-ref: https://www.elastic.co/guide/en/enterprise-search-clients/ruby/master endif::[] \ No newline at end of file From 5ba8c35b22bd983ddbb1d37391fd64bf7a76601b Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 17 Sep 2024 12:50:05 -0700 Subject: [PATCH 0886/1049] Add 8.x branches for Kibana (#3068) --- build_docs.pl | 13 ++++++++++++- conf.yaml | 26 +++++++++++++------------- shared/attributes.asciidoc | 12 ------------ shared/versions/stack/8.x.asciidoc | 5 ----- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/build_docs.pl b/build_docs.pl index 695537334b70a..8d91d018aef38 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -408,7 +408,18 @@ sub check_kibana_links { # # TODO: remove as part of # https://github.com/elastic/docs/issues/2264 - $branch = $version eq "master" ? "main" : $version; + if ($version eq "master") { + $branch = "main"; + } + else { + # Temporary work-around for 8.x branch masquerading as 8.16 + if ($version eq "8.16") { + $branch = "8.x"; + } + else { + $branch = $version; + } + } say " Branch: $branch, Version: $version"; my $links_file; my $source = eval { diff --git a/conf.yaml b/conf.yaml index f0627754a19b9..0c16000fca98f 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1271,7 +1271,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, {8.x: 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1283,11 +1283,11 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 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 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 ] + exclude_branches: [ main, 8.x, 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 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 ] - repo: beats path: libbeat/docs @@ -1298,15 +1298,15 @@ contents: - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ @@ -1314,7 +1314,7 @@ contents: - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1327,11 +1327,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] + exclude_branches: [ 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, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, {8.x: 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1346,7 +1346,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1358,11 +1358,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1508,7 +1508,7 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 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.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 ] + exclude_branches: [ main, 8.x, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 8c95efdd001dd..cd67a2f103586 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -550,15 +550,3 @@ Legacy definitions :apm-overview-ref-m: https://www.elastic.co/guide/en/apm/get-started/master :infra-guide: https://www.elastic.co/guide/en/infrastructure/guide/{branch} :a-data-source: a data view - -////////// -8.x links -The if directives below are required for 8.x docs that are not yet available. -Without these if directives, the links fail and break the build. -////////// - -ifdef::8x-missing-links[] -:kibana-ref: https://www.elastic.co/guide/en/kibana/master -:apm-app-ref: https://www.elastic.co/guide/en/kibana/master -:stack-ref: https://www.elastic.co/guide/en/elastic-stack/master -endif::[] \ No newline at end of file diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index 7713d3c79a30c..1ca51a44e1aef 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -73,8 +73,3 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 - -////////// -8x-missing-links can be: true | false -////////// -:8x-missing-links: true \ No newline at end of file From 9988e3a9315d3df8dec5eb13fb1f3a6007d2bd51 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 18 Sep 2024 08:49:40 -0700 Subject: [PATCH 0887/1049] Update master to 9.0 (#3055) --- shared/versions/stack/master.asciidoc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index d363828306003..c4815f808e024 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -1,18 +1,18 @@ -:version: 8.16.0 +:version: 9.0.0-beta1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.0 -:logstash_version: 8.16.0 -:elasticsearch_version: 8.16.0 -:kibana_version: 8.16.0 -:apm_server_version: 8.16.0 +:bare_version: 9.0.0 +:logstash_version: 9.0.0 +:elasticsearch_version: 9.0.0 +:kibana_version: 9.0.0 +:apm_server_version: 9.0.0 :branch: master -:minor-version: 8.16 -:major-version: 8.x -:prev-major-version: 7.x -:prev-major-last: 7.17 -:major-version-only: 8 +:minor-version: 9.0 +:major-version: 9.x +:prev-major-version: 8.x +:prev-major-last: 8.16 +:major-version-only: 9 :ecs_version: 8.11 :esf_version: master :ece-version-link: current From 5dabd7cec26fa1848bd89be7bc759f9a50cc7466 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 20 Sep 2024 16:50:55 +0200 Subject: [PATCH 0888/1049] support elastic-observability-automation in pull-requests.org-wide.json (#3075) --- .buildkite/pull-requests.org-wide.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 6f031eb93fa6a..e495db7c592ca 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -9,7 +9,7 @@ "admin", "write" ], - "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]", "dependabot[bot]", "elastic-renovate-prod[bot]"], + "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]", "dependabot[bot]", "elastic-renovate-prod[bot]", "elastic-observability-automation[bot]"], "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "run docs-build ?(?rebuild)? ?(?warnlinkcheck)? ?(?skiplinkcheck)?", From 37a5242c157baa229f1416080d9861c078da7822 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:20:36 -0400 Subject: [PATCH 0889/1049] ESS - Change current to ms-113 (#3057) * ESS - Change current to ms-113 * Rebuild --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 0c16000fca98f..31d5056a4b344 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.15 stacklive: &stacklive [ 8.15, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-112 + cloudSaasCurrent: &cloudSaasCurrent ms-113 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 79a7b6c9f6f97534018ace6c253974276351c6c9 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 26 Sep 2024 01:54:53 -0700 Subject: [PATCH 0890/1049] Update 8.15.asciidoc (#3074) --- shared/versions/stack/8.15.asciidoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 42c30cd9d8be5..3bbcc036cc4cb 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -1,12 +1,12 @@ -:version: 8.15.1 +:version: 8.15.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.1 -:logstash_version: 8.15.1 -:elasticsearch_version: 8.15.1 -:kibana_version: 8.15.1 -:apm_server_version: 8.15.1 +:bare_version: 8.15.2 +:logstash_version: 8.15.2 +:elasticsearch_version: 8.15.2 +:kibana_version: 8.15.2 +:apm_server_version: 8.15.2 :branch: 8.15 :minor-version: 8.15 :major-version: 8.x @@ -71,4 +71,4 @@ Synthetics //// API URLs //// -:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 \ No newline at end of file +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 From 81100f2220628d14451e79e10ec316ba6887ed3c Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Thu, 26 Sep 2024 19:11:43 +0200 Subject: [PATCH 0891/1049] bump master version for ECE to 3.8 (#3077) * bump master version for ECE to 3.8 * Update shared/versions/ece/master.asciidoc Co-authored-by: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> --------- Co-authored-by: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> --- shared/versions/ece/master.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/versions/ece/master.asciidoc b/shared/versions/ece/master.asciidoc index a814c8ae43ca3..2d9e14f069608 100644 --- a/shared/versions/ece/master.asciidoc +++ b/shared/versions/ece/master.asciidoc @@ -1,3 +1,3 @@ -:ece-version: 3.7.1 -:ece-version-short: 3.7 -:ece-version-link: 3.7 \ No newline at end of file +:ece-version: 3.8.1 +:ece-version-short: 3.8 +:ece-version-link: 3.8 \ No newline at end of file From c3e9625ebd8909c06bcd97446c9b39817324616d Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 26 Sep 2024 12:13:27 -0700 Subject: [PATCH 0892/1049] Add variable for TheHive connector (#3076) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index cd67a2f103586..583d9b8b263c2 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -338,6 +338,7 @@ Do not use `endpoint-cloud-sec` in versions 8.5.0 and newer :opsgenie: Opsgenie :bedrock: Amazon Bedrock :gemini: Google Gemini +:hive: TheHive :monitoring: X-Pack monitoring :monitor-features: monitoring features :stack-monitor-features: {stack} {monitor-features} From 873ec2c47f905b5e18f5606fde0858a1f127a244 Mon Sep 17 00:00:00 2001 From: Dominik Giger Date: Tue, 1 Oct 2024 09:25:32 +0200 Subject: [PATCH 0893/1049] Update ecctl version (#3081) --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 31d5056a4b344..6708903d5b652 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2168,8 +2168,8 @@ contents: prefix: en/ecctl tags: CloudControl/Reference subject: ECCTL - current: 1.13 - branches: [ master, 1.13, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + current: 1.14 + branches: [ master, 1.14, 1.13, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] index: docs/index.asciidoc chunk: 1 sources: From e0602f14432f86462205cf1a31e960d65aed11c0 Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Fri, 11 Oct 2024 17:53:08 +0200 Subject: [PATCH 0894/1049] ESS - Change current to ms-114 (#3082) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 6708903d5b652..8c843c071db9d 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.15 stacklive: &stacklive [ 8.15, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-113 + cloudSaasCurrent: &cloudSaasCurrent ms-114 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From bb5e894f0435ad3a0fa456993951fe56de27f8db Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Thu, 17 Oct 2024 04:12:02 -0500 Subject: [PATCH 0895/1049] Bumps the docs version to 8.15.3 (#3086) --- shared/versions/stack/8.15.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 3bbcc036cc4cb..56b91f86a2d42 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -1,12 +1,12 @@ -:version: 8.15.2 +:version: 8.15.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.2 -:logstash_version: 8.15.2 -:elasticsearch_version: 8.15.2 -:kibana_version: 8.15.2 -:apm_server_version: 8.15.2 +:bare_version: 8.15.3 +:logstash_version: 8.15.3 +:elasticsearch_version: 8.15.3 +:kibana_version: 8.15.3 +:apm_server_version: 8.15.3 :branch: 8.15 :minor-version: 8.15 :major-version: 8.x From 00ffd082bd7c11a8613f50cb5aff8263b268cda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Thu, 17 Oct 2024 14:19:52 +0200 Subject: [PATCH 0896/1049] Changes current and live for .NET client book. (#3090) --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 8c843c071db9d..3c2216d59430b 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1052,9 +1052,9 @@ contents: path: .doc/ - title: .NET Clients prefix: net-api - current: 8.9 + current: *stackcurrent branches: [ {main: master}, {8.x: 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, 6.x, 5.x, 2.x, 1.x ] - live: [ main, 8.9, 8.1, 8.0, 7.17, 7.16, 6.x, 5.x, 2.x, 1.x ] + live: *stacklive index: docs/index.asciidoc tags: Clients/.Net subject: Clients From a48faa32e61c005b18af6d2e5660c567e39dc7d8 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 17 Oct 2024 12:48:53 -0700 Subject: [PATCH 0897/1049] Add 8.16 version attributes (#3091) --- shared/versions/stack/8.16.asciidoc | 75 +++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 shared/versions/stack/8.16.asciidoc diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc new file mode 100644 index 0000000000000..1ca51a44e1aef --- /dev/null +++ b/shared/versions/stack/8.16.asciidoc @@ -0,0 +1,75 @@ +:version: 8.16.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.16.0 +:logstash_version: 8.16.0 +:elasticsearch_version: 8.16.0 +:kibana_version: 8.16.0 +:apm_server_version: 8.16.0 +// branch is 8.16 instead of 8.x for long-term linking purposes +:branch: 8.16 +:minor-version: 8.16 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.11 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 From ad6c9e376bfb7b0e85cf87bcd3612bc29b6d9e2d Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 18 Oct 2024 14:10:30 -0700 Subject: [PATCH 0898/1049] Publish 8.16 docs from 8.16 branch (#3092) --- conf.yaml | 118 +++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/conf.yaml b/conf.yaml index 3c2216d59430b..54a1c4b5edf7e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,7 +129,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -144,13 +144,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -166,7 +166,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -180,12 +180,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -199,22 +199,22 @@ contents: alternatives: { source_lang: console, alternative_lang: php } repo: elasticsearch-php path: docs/examples - exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: python } repo: elasticsearch-py path: docs/examples - exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: ruby } repo: elasticsearch-ruby path: docs/examples/guide - exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: go } repo: go-elasticsearch path: .doc/examples/doc/ - exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -226,12 +226,12 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js path: docs/doc_examples - exclude_branches: [ 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: server/src/main/resources/org/elasticsearch/common @@ -241,7 +241,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -258,7 +258,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -275,7 +275,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -295,7 +295,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -312,7 +312,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -389,7 +389,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -406,7 +406,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -450,7 +450,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -923,7 +923,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -948,7 +948,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, {8.x: 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, 7.17 ] + branches: [ {main: master}, 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -992,7 +992,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1224,7 +1224,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1238,7 +1238,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1271,7 +1271,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1283,38 +1283,38 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 8.x, 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 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 ] + exclude_branches: [ main, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.x, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1331,7 +1331,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1346,7 +1346,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1358,11 +1358,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1380,7 +1380,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1404,7 +1404,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, {8.x: 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1430,7 +1430,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, {8.x: 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1446,7 +1446,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1470,7 +1470,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1485,7 +1485,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1508,11 +1508,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 8.x, 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.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 ] + exclude_branches: [ main, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1528,7 +1528,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1543,11 +1543,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1569,7 +1569,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1635,7 +1635,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1692,7 +1692,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1723,7 +1723,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1748,7 +1748,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1803,7 +1803,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1850,7 +1850,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1907,7 +1907,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -1950,7 +1950,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2279,7 +2279,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true From 05da2baaaa4701a31253d52fbd403821b6b63d5a Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 21 Oct 2024 23:55:28 +0200 Subject: [PATCH 0899/1049] feat(all): only build docs if there's a doc change (#3067) * feat(all): only build docs if there's a doc change extend the check to all remaining repositories * Update build_pr.sh --------- Co-authored-by: Brandon Morelli --- .buildkite/scripts/build_pr.sh | 97 +++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 70fa3c9cd8ce7..55340a499e7f9 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -66,7 +66,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then ;; # repositories with a docs dir - "apm-k8s-attacher") + "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) ;; @@ -77,6 +77,101 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) ;; + "beats") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module) + ;; + + "clients-team") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/examples/elastic-cloud) + ;; + + "curator") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/asciidoc) + ;; + + "eland" | "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide) + ;; + + "elasticsearch") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client ./docs ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql) + ;; + + "elasticsearch-hadoop") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/src/reference/asciidoc) + ;; + + "elasticsearch-java") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./java-client/src/test/java/co/elastic/clients/documentation) + ;; + + "elasticsearch-net") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./tests/Tests/Documentation) + ;; + + "elasticsearch-py") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide ./docs/examples) + ;; + + "go-elasticsearch") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./.doc) + ;; + + "enterprise-search-pubs") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./enterprise-search-docs ./workplace-search-docs ./app-search-docs ./esre-docs ./client-docs/app-search-javascript ./client-docs/app-search-node ./client-docs/workplace-search-node) + ;; + + "enterprise-search-js") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./packages/enterprise-search/docs) + ;; + + "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en) + ;; + + "packagespec") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./versions ./spec) + ;; + + "tech-content") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./welcome-to-elastic) + ;; + + "terraform-provider-ec") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs-elastic) + ;; + + "x-pack") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/public/graph ./docs/public/marvel ./docs/public/reporting ./docs/public/shield ./docs/public/watcher ./docs/en ./docs/kr ./docs/jp) + ;; + + "x-pack-elasticsearch") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp ./qa/sql) + ;; + + "x-pack-kibana") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp) + ;; + # All other repos will always build *) docs_diff="always build" From 3e3b8bc558e633e262d4da5a0b4393b180f6680f Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 22 Oct 2024 00:05:07 -0700 Subject: [PATCH 0900/1049] Update ECE version to 3.7.3 (#3083) --- shared/versions/ece/ms-105.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/ece/ms-105.asciidoc b/shared/versions/ece/ms-105.asciidoc index b1f3f94c9e9d4..2bfc1db85ccf6 100644 --- a/shared/versions/ece/ms-105.asciidoc +++ b/shared/versions/ece/ms-105.asciidoc @@ -1,3 +1,3 @@ -:ece-version: 3.7.2 +:ece-version: 3.7.3 :ece-version-short: 3.7 :ece-version-link: 3.7 \ No newline at end of file From dcace5fa2d934100bce407042dd8d11f05a230e5 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 22 Oct 2024 03:06:25 -0500 Subject: [PATCH 0901/1049] Bumps the docs version 7.17.25 (#3087) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index e90ae2b75bff9..6e7f6e561fd2b 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.24 +:version: 7.17.25 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.24 -:logstash_version: 7.17.24 -:elasticsearch_version: 7.17.24 -:kibana_version: 7.17.24 -:apm_server_version: 7.17.24 +:bare_version: 7.17.25 +:logstash_version: 7.17.25 +:elasticsearch_version: 7.17.25 +:kibana_version: 7.17.25 +:apm_server_version: 7.17.25 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 88d54f34a0631de8a48d689b461d1e542d10caa7 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 22 Oct 2024 08:31:35 -0700 Subject: [PATCH 0902/1049] Update doc builds for 8.x (#3093) --- build_docs.pl | 13 +-- conf.yaml | 140 ++++++++++++++--------------- shared/versions/stack/8.x.asciidoc | 17 ++-- 3 files changed, 79 insertions(+), 91 deletions(-) diff --git a/build_docs.pl b/build_docs.pl index 8d91d018aef38..695537334b70a 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -408,18 +408,7 @@ sub check_kibana_links { # # TODO: remove as part of # https://github.com/elastic/docs/issues/2264 - if ($version eq "master") { - $branch = "main"; - } - else { - # Temporary work-around for 8.x branch masquerading as 8.16 - if ($version eq "8.16") { - $branch = "8.x"; - } - else { - $branch = $version; - } - } + $branch = $version eq "master" ? "main" : $version; say " Branch: $branch, Version: $version"; my $links_file; my $source = eval { diff --git a/conf.yaml b/conf.yaml index 54a1c4b5edf7e..83ed6fb139e7a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,7 +129,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -144,13 +144,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -166,7 +166,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -180,12 +180,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -199,22 +199,22 @@ contents: alternatives: { source_lang: console, alternative_lang: php } repo: elasticsearch-php path: docs/examples - exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: python } repo: elasticsearch-py path: docs/examples - exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: ruby } repo: elasticsearch-ruby path: docs/examples/guide - exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: go } repo: go-elasticsearch path: .doc/examples/doc/ - exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -226,12 +226,12 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js path: docs/doc_examples - exclude_branches: [ 8.16, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: server/src/main/resources/org/elasticsearch/common @@ -241,7 +241,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -258,7 +258,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -275,7 +275,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -295,7 +295,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -312,7 +312,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -327,7 +327,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, {8.x: 8.16}, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -342,7 +342,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -357,7 +357,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -372,7 +372,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -389,7 +389,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -406,7 +406,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -450,7 +450,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -923,7 +923,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -948,7 +948,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 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, 7.17 ] + branches: [ {main: master}, 8.x, 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -992,7 +992,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1014,7 +1014,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 6.x, 5.x ] + branches: [ {main: master}, 8.x, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1027,7 +1027,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1040,7 +1040,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1053,7 +1053,7 @@ contents: - title: .NET Clients prefix: net-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 8.x, 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, 6.x, 5.x, 2.x, 1.x ] live: *stacklive index: docs/index.asciidoc tags: Clients/.Net @@ -1069,7 +1069,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 8.x, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1098,7 +1098,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1124,7 +1124,7 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, {8.x: 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 ] + branches: [ {main: master}, 8.x, 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 ] live: [ main, 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 ] index: docs/index.asciidoc chunk: 1 @@ -1224,7 +1224,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1238,7 +1238,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1271,7 +1271,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1283,38 +1283,38 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 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 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 ] + exclude_branches: [ main, 8.x, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1331,7 +1331,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1346,7 +1346,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1358,11 +1358,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1380,7 +1380,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1404,7 +1404,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + branches: [ {main: master}, 8.x, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1430,7 +1430,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + branches: [ {main: master}, 8.x, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1446,7 +1446,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1470,7 +1470,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1485,7 +1485,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1508,11 +1508,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 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.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 ] + exclude_branches: [ main, 8.x, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + branches: [ {main: master}, 8.x, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1528,7 +1528,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1543,11 +1543,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + exclude_branches: [ main, 8.x, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1569,7 +1569,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1635,7 +1635,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1692,7 +1692,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1723,7 +1723,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1748,7 +1748,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1803,7 +1803,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1850,7 +1850,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1907,7 +1907,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -1950,7 +1950,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2279,7 +2279,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + branches: [ {main: master}, 8.x, 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 ] chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index 1ca51a44e1aef..d39ba140b158e 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -1,15 +1,14 @@ -:version: 8.16.0 +:version: 8.17.0 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.0 -:logstash_version: 8.16.0 -:elasticsearch_version: 8.16.0 -:kibana_version: 8.16.0 -:apm_server_version: 8.16.0 -// branch is 8.16 instead of 8.x for long-term linking purposes -:branch: 8.16 -:minor-version: 8.16 +:bare_version: 8.17.0 +:logstash_version: 8.17.0 +:elasticsearch_version: 8.17.0 +:kibana_version: 8.17.0 +:apm_server_version: 8.17.0 +:branch: 8.x +:minor-version: 8.17 :major-version: 8.x :prev-major-version: 7.x :prev-major-last: 7.17 From 3de8dadcacaba6e3b9973e6b5c34a8d52be86f82 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:28:27 +0100 Subject: [PATCH 0903/1049] feat: reduce clone/fetch size when building docs PRs (#3094) do not fetch tags use a treeless clone of the target branch instead of cloning the default branch --- .buildkite/scripts/build_pr.sh | 47 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 55340a499e7f9..a1625121f303d 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -48,10 +48,11 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then echo "Cloning the ${GITHUB_PR_BASE_REPO} PR locally" git clone --reference /opt/git-mirrors/elastic-$GITHUB_PR_BASE_REPO \ + --filter=tree:0 --no-checkout --no-tags --depth 1 -v --branch "$GITHUB_PR_TARGET_BRANCH" \ git@github.com:elastic/$GITHUB_PR_BASE_REPO.git ./product-repo cd ./product-repo && - git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && + git fetch --no-tags origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && git switch pr_$GITHUB_PR_NUMBER # Some repositories allow the documentation build to exit early if there are no doc-related changes @@ -61,114 +62,114 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then # repositories with a docs dir and changelog "apm-aws-lambda" | "apm-agent-android" | "apm-agent-nodejs" | "apm-agent-python" | "apm-agent-ruby" | "apm-agent-rum-js" | "apm-agent-go" | "apm-agent-java" | "apm-agent-dotnet" | "apm-agent-php" | "apm-agent-ios") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) ;; # repositories with a docs dir "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) ;; # repositories with a docs dir, changelogs dir, and changelog "apm-server") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) ;; "beats") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module) ;; "clients-team") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/examples/elastic-cloud) ;; "curator") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/asciidoc) ;; "eland" | "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide) ;; "elasticsearch") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client ./docs ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql) ;; "elasticsearch-hadoop") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/src/reference/asciidoc) ;; "elasticsearch-java") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./java-client/src/test/java/co/elastic/clients/documentation) ;; "elasticsearch-net") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./tests/Tests/Documentation) ;; "elasticsearch-py") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide ./docs/examples) ;; "go-elasticsearch") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./.doc) ;; "enterprise-search-pubs") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./enterprise-search-docs ./workplace-search-docs ./app-search-docs ./esre-docs ./client-docs/app-search-javascript ./client-docs/app-search-node ./client-docs/workplace-search-node) ;; "enterprise-search-js") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./packages/enterprise-search/docs) ;; "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en) ;; "packagespec") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./versions ./spec) ;; "tech-content") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./welcome-to-elastic) ;; "terraform-provider-ec") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs-elastic) ;; "x-pack") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/public/graph ./docs/public/marvel ./docs/public/reporting ./docs/public/shield ./docs/public/watcher ./docs/en ./docs/kr ./docs/jp) ;; "x-pack-elasticsearch") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp ./qa/sql) ;; "x-pack-kibana") - git fetch origin "$GITHUB_PR_TARGET_BRANCH" + git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp) ;; From 66006d47a7db6d81b544cef5cbd1f6c02f314412 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 30 Oct 2024 10:03:17 -0700 Subject: [PATCH 0904/1049] Revert "feat: reduce clone/fetch size when building docs PRs (#3094)" (#3098) This reverts commit 3de8dadcacaba6e3b9973e6b5c34a8d52be86f82. --- .buildkite/scripts/build_pr.sh | 47 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index a1625121f303d..55340a499e7f9 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -48,11 +48,10 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then echo "Cloning the ${GITHUB_PR_BASE_REPO} PR locally" git clone --reference /opt/git-mirrors/elastic-$GITHUB_PR_BASE_REPO \ - --filter=tree:0 --no-checkout --no-tags --depth 1 -v --branch "$GITHUB_PR_TARGET_BRANCH" \ git@github.com:elastic/$GITHUB_PR_BASE_REPO.git ./product-repo cd ./product-repo && - git fetch --no-tags origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && + git fetch origin pull/$GITHUB_PR_NUMBER/head:pr_$GITHUB_PR_NUMBER && git switch pr_$GITHUB_PR_NUMBER # Some repositories allow the documentation build to exit early if there are no doc-related changes @@ -62,114 +61,114 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then # repositories with a docs dir and changelog "apm-aws-lambda" | "apm-agent-android" | "apm-agent-nodejs" | "apm-agent-python" | "apm-agent-ruby" | "apm-agent-rum-js" | "apm-agent-go" | "apm-agent-java" | "apm-agent-dotnet" | "apm-agent-php" | "apm-agent-ios") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) ;; # repositories with a docs dir "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) ;; # repositories with a docs dir, changelogs dir, and changelog "apm-server") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) ;; "beats") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module) ;; "clients-team") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/examples/elastic-cloud) ;; "curator") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/asciidoc) ;; "eland" | "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide) ;; "elasticsearch") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client ./docs ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql) ;; "elasticsearch-hadoop") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/src/reference/asciidoc) ;; "elasticsearch-java") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./java-client/src/test/java/co/elastic/clients/documentation) ;; "elasticsearch-net") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./tests/Tests/Documentation) ;; "elasticsearch-py") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide ./docs/examples) ;; "go-elasticsearch") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./.doc) ;; "enterprise-search-pubs") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./enterprise-search-docs ./workplace-search-docs ./app-search-docs ./esre-docs ./client-docs/app-search-javascript ./client-docs/app-search-node ./client-docs/workplace-search-node) ;; "enterprise-search-js") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./packages/enterprise-search/docs) ;; "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en) ;; "packagespec") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./versions ./spec) ;; "tech-content") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./welcome-to-elastic) ;; "terraform-provider-ec") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs-elastic) ;; "x-pack") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/public/graph ./docs/public/marvel ./docs/public/reporting ./docs/public/shield ./docs/public/watcher ./docs/en ./docs/kr ./docs/jp) ;; "x-pack-elasticsearch") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp ./qa/sql) ;; "x-pack-kibana") - git fetch --no-tags --unshallow origin "$GITHUB_PR_TARGET_BRANCH" + git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en ./docs/kr ./docs/jp) ;; From 6a83930d88594a79816acef1fb43dcb94d069d35 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 30 Oct 2024 14:10:14 -0700 Subject: [PATCH 0905/1049] Add api-ece variable (#3095) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 583d9b8b263c2..8753c2d9eda5f 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -203,6 +203,7 @@ Elastic Cloud :ess-setting-change: {ess-icon} indicates a change to a supported {cloud}/ec-add-user-settings.html[user setting] for {ess}. :ess-skip-section: If you use {ess}, skip this section. {ess} handles these changes for you. :api-cloud: https://www.elastic.co/docs/api/doc/cloud +:api-ece: https://www.elastic.co/docs/api/doc/cloud-enterprise ////////// Elasticsearch ////////// From 71687f31c80ff041a4c939d49175a4049984287b Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 1 Nov 2024 11:44:36 -0700 Subject: [PATCH 0906/1049] Update Cloud current to ms-115 (#3099) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 83ed6fb139e7a..ed151d1849664 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,7 +80,7 @@ variables: stackcurrent: &stackcurrent 8.15 stacklive: &stacklive [ 8.15, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-114 + cloudSaasCurrent: &cloudSaasCurrent ms-115 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 836da1e4f9a6e689d08b4786f953ec6e101442c7 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 4 Nov 2024 14:48:00 -0800 Subject: [PATCH 0907/1049] add docs-content (#3105) --- .buildkite/pull-requests.org-wide.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index e495db7c592ca..7443a2ea16e56 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -37,6 +37,7 @@ "elastic/cloud", "elastic/cloud-on-k8s", "elastic/curator", + "elastic/docs-content", "elastic/ecctl", "elastic/ecs", "elastic/ecs-dotnet", From d5a8502782668925ffdb428469aba8b69db0e301 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 5 Nov 2024 12:51:34 -0600 Subject: [PATCH 0908/1049] Add AsciiDoc serverless docs (#3096) * add serverless book * add docs-content repo to repo list * fix docs-content path * add serverless book * add docs-content repo to repo list * fix docs-content path * change style of admon titles * Revert "change style of admon titles" This reverts commit 284484eb0b2e35bdee39782ae5beb100b4bf0616. * update to main --- conf.yaml | 23 +++++++++++++++++++++++ doc_build_aliases.sh | 3 +++ 2 files changed, 26 insertions(+) diff --git a/conf.yaml b/conf.yaml index ed151d1849664..b79046d85e321 100644 --- a/conf.yaml +++ b/conf.yaml @@ -19,6 +19,7 @@ repos: cloud-assets: https://github.com/elastic/cloud-assets.git cloud-on-k8s: https://github.com/elastic/cloud-on-k8s.git curator: https://github.com/elastic/curator.git + docs-content: https://github.com/elastic/docs-content.git ecctl: https://github.com/elastic/ecctl.git ecs: https://github.com/elastic/ecs.git ecs-dotnet: https://github.com/elastic/ecs-dotnet.git @@ -124,6 +125,28 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Serverless + sections: + - title: Serverless + prefix: en/serverless + current: main + branches: [ main ] + live: [ main ] + index: serverless/index.asciidoc + chunk: 5 + tags: Serverless/Guide + subject: Serverless + sources: + - + repo: docs-content + path: serverless + - + repo: observability-docs + path: docs/en/serverless + - + repo: security-docs + path: docs/serverless + - title: Search sections: - title: Elasticsearch Guide diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 698c298018e49..0d201e7a7f38d 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -9,6 +9,9 @@ # source $GIT_HOME/docs/doc_build_aliases.sh # +# Serverless +alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --open --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From 567b1259105e8e37e4e8f0534fdff3ab205e417e Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:37:47 -0500 Subject: [PATCH 0909/1049] Freeze Functionbeat docs at 8.15 (#2895) * Freeze Functionbeat docs at 8.11 * Update conf.yaml Co-authored-by: Brandon Morelli * Update conf.yaml Set Functionbeat 'branches' to stop at 8.15 * Update conf.yaml * Update conf.yaml * Remove 8.x and 8.16 * Update conf.yaml * Update conf.yaml * Update conf.yaml * Update conf.yaml * Update conf.yaml --------- Co-authored-by: Brandon Morelli Co-authored-by: Anderson Queiroz --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index b79046d85e321..0cfe0e1a81fad 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2302,7 +2302,7 @@ contents: prefix: en/beats/functionbeat current: *stackcurrent index: x-pack/functionbeat/docs/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ 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 ] chunk: 1 tags: Functionbeat/Reference respect_edit_url_overrides: true From 4658579f43491a771cb2e75ea89496453fa3b2a9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 7 Nov 2024 14:33:57 -0600 Subject: [PATCH 0910/1049] Change admonition title style/syntax (#3107) * change style of admon titles * fix tests --- .../lib/docbook_compat/convert_admonition.rb | 4 ++-- resources/asciidoctor/spec/change_admonition_spec.rb | 4 ++-- resources/asciidoctor/spec/docbook_compat_spec.rb | 4 ++-- resources/web/style/admonishment.pcss | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb b/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb index 188bf75c56467..7b4fb4a6ed55e 100644 --- a/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb +++ b/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb @@ -20,10 +20,10 @@ def convert_admonition_title_id(node) return node.id ? %() : nil unless node.title [ - '

          ', + '

          ', node.title, node.id ? %() : nil, - '

          ', + '

          ', ].compact.join end diff --git a/resources/asciidoctor/spec/change_admonition_spec.rb b/resources/asciidoctor/spec/change_admonition_spec.rb index 6d06b0930cc68..db13a31db1cd2 100644 --- a/resources/asciidoctor/spec/change_admonition_spec.rb +++ b/resources/asciidoctor/spec/change_admonition_spec.rb @@ -35,7 +35,7 @@ def expect_block_admonition(body) end it "renders with Elastic's custom template" do expect_block_admonition <<~HTML.strip -

          #{message} in 7.0.0-beta1.

          +

          #{message} in 7.0.0-beta1.

          words

          HTML end @@ -58,7 +58,7 @@ def expect_block_admonition(body) end it "renders with Elastic's custom template" do expect_block_admonition <<~HTML.strip -

          #{message} in 7.0.0-beta1.

          +

          #{message} in 7.0.0-beta1.

          Like 27

          HTML end diff --git a/resources/asciidoctor/spec/docbook_compat_spec.rb b/resources/asciidoctor/spec/docbook_compat_spec.rb index 0fb4f34222eb1..2790fced2f6a9 100644 --- a/resources/asciidoctor/spec/docbook_compat_spec.rb +++ b/resources/asciidoctor/spec/docbook_compat_spec.rb @@ -1915,7 +1915,7 @@ def expect_block_admonition(body)
          -

          Title

          +

          Title

          words

          @@ -1938,7 +1938,7 @@ def expect_block_admonition(body)
          -

          Title

          +

          Title

          words

          diff --git a/resources/web/style/admonishment.pcss b/resources/web/style/admonishment.pcss index 8fa20318458da..9ad227cd23838 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -84,14 +84,14 @@ } .admon_content { - margin-left: 80px; + margin-left: 100px; /* On page load, the heading level may be changed, but we always what to style it the same way */ - h2, h3, h4, h5, h6 { - margin: 3px 0; - font-size: 22px; - font-weight: 600; - a { font-weight: 600; } + .admon_title { + font-size: 16px; + margin-bottom: 4px; + font-weight: 700; + a { font-weight: 700; } } p:last-of-type { margin-bottom: 0em; From 6aef2b9d71ada44d721948855478e11dd2aea75d Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 7 Nov 2024 16:59:07 -0800 Subject: [PATCH 0911/1049] Add serverless shared attributes (#3109) Co-authored-by: Colleen McGinnis --- shared/attributes.asciidoc | 25 +++++++++++++++++++++---- shared/versions/stack/master.asciidoc | 8 +++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 8753c2d9eda5f..f3b1925adb825 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -181,10 +181,13 @@ Elastic Cloud :ess: Elasticsearch Service :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes -:serverless-full: Elastic Cloud serverless -:es-serverless: Elasticsearch on serverless -:serverless-short: serverless -:serverless-docs: https://docs.elastic.co/serverless +:serverless-full: Elastic Cloud Serverless +:serverless-short: Serverless +:es-serverless: Elasticsearch Serverless +:es3: {es-serverless} +:obs-serverless: Elastic Observability Serverless +:sec-serverless: Elastic Security Serverless +:serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body :ess-baymax: {ess-utm-params} @@ -259,6 +262,20 @@ Kibana app and UI names :data-sources-caps: Data Views :data-source-cap: Data view :data-sources-cap: Data views +:project-settings: Project settings +:manage-app: Management +:index-manage-app: Index Management +:data-views-app: Data Views +:rules-app: Rules +:saved-objects-app: Saved Objects +:tags-app: Tags +:api-keys-app: API keys +:transforms-app: Transforms +:connectors-app: Connectors +:files-app: Files +:reports-app: Reports +:maps-app: Maps +:alerts-app: Alerts // Use data-source-cap instead of Data-source // Use data-sources-cap instead of Data-sources // Use data-sources-caps instead of Data-Sources diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index c4815f808e024..a55cf5eb69ff8 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -71,4 +71,10 @@ Synthetics //// API URLs //// -:api-kibana: https://www.elastic.co/docs/api/doc/kibana \ No newline at end of file +:api-kibana: https://www.elastic.co/docs/api/doc/kibana + +//// +Feature flags +//// + +:serverlessCustomRoles: true \ No newline at end of file From 6361051546d27ed12ae16279818efd291704ecc9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 8 Nov 2024 17:08:16 +0100 Subject: [PATCH 0912/1049] buildkite: skip clone for GitHub check notifications (#3106) * buildkite: skip clone for GitHub check notifications * fix * fix * use dollar to support bash commands or env variables at runtime * try something else * test * remove test --- .buildkite/build_pr_pipeline.yml | 28 ++++++++++++++--- .buildkite/scripts/build_pr_commit_status.sh | 33 -------------------- 2 files changed, 23 insertions(+), 38 deletions(-) delete mode 100755 .buildkite/scripts/build_pr_commit_status.sh diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index bcca81c0c65e8..3df10f379e55e 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -6,7 +6,16 @@ steps: command: ".buildkite/scripts/cancel_running_pr.sh || true" - key: "build-pr-setup" label: "setup" - command: ".buildkite/scripts/build_pr_commit_status.sh pending" + command: | + curl -s -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $${VAULT_GITHUB_TOKEN}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/${GITHUB_PR_BASE_OWNER}/${GITHUB_PR_BASE_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" \ + -d '{"state":"pending","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build started","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' + plugins: + - 'uber-workflow/run-without-clone': - key: "build-pr" label: ":hammer: Build docs PR" command: ".buildkite/scripts/build_pr.sh" @@ -21,11 +30,20 @@ steps: - key: "teardown" label: "teardown" command: | - if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then - .buildkite/scripts/build_pr_commit_status.sh success - else - .buildkite/scripts/build_pr_commit_status.sh failure + status_state=failure + if [ $$(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then + status_state=success fi + export status_state + curl -s -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $${VAULT_GITHUB_TOKEN}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/${GITHUB_PR_BASE_OWNER}/${GITHUB_PR_BASE_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" \ + -d '{"state":"'$$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"Build finished","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' depends_on: - step: "build-pr" allow_failure: true + plugins: + - 'uber-workflow/run-without-clone': diff --git a/.buildkite/scripts/build_pr_commit_status.sh b/.buildkite/scripts/build_pr_commit_status.sh deleted file mode 100755 index 3bc5d422dd551..0000000000000 --- a/.buildkite/scripts/build_pr_commit_status.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# This hook should only be invoked for builds triggered by the Buildkite PR bot -if [ -z ${GITHUB_PR_BASE_OWNER+set} ] || [ -z ${GITHUB_PR_BASE_REPO+set} ] || [ -z ${GITHUB_PR_TRIGGERED_SHA+set} ];then - exit 0 -fi - -status_state=$1 -description='' - -case $status_state in - pending) - description='Build started';; - success|failure|error) - description='Build finished';; - *) - echo "Invalid state $status_state" - exit 1;; -esac - -githubPublishStatus="https://api.github.com/repos/${GITHUB_PR_BASE_OWNER}/${GITHUB_PR_BASE_REPO}/statuses/${GITHUB_PR_TRIGGERED_SHA}" -data='{"state":"'$status_state'","target_url":"'$BUILDKITE_BUILD_URL'","description":"'$description'","context":"buildkite/'$BUILDKITE_PIPELINE_SLUG'"}' - -echo "Setting commit status: buildkite/${BUILDKITE_PIPELINE_SLUG} - ${status_state}" -curl -s -L \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${VAULT_GITHUB_TOKEN}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "${githubPublishStatus}" \ - -d "${data}" From 1eae73f77e42c310a02483c108faeb978839ef86 Mon Sep 17 00:00:00 2001 From: Istvan Nagy Date: Mon, 11 Nov 2024 23:57:52 +0100 Subject: [PATCH 0913/1049] Add ECK 2.15 (#3100) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 0cfe0e1a81fad..cdcc97f0c6c0b 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2173,7 +2173,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.14 - branches: [ {main: master}, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ {main: master}, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From e063050610b37f99f13b406cebced55f9f68edc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:30:29 +0100 Subject: [PATCH 0914/1049] version bumped to 8.15.4 (#3097) --- shared/versions/stack/8.15.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 56b91f86a2d42..572d6884d6db8 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -1,12 +1,12 @@ -:version: 8.15.3 +:version: 8.15.4 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.3 -:logstash_version: 8.15.3 -:elasticsearch_version: 8.15.3 -:kibana_version: 8.15.3 -:apm_server_version: 8.15.3 +:bare_version: 8.15.4 +:logstash_version: 8.15.4 +:elasticsearch_version: 8.15.4 +:kibana_version: 8.15.4 +:apm_server_version: 8.15.4 :branch: 8.15 :minor-version: 8.15 :major-version: 8.x From 0b78cccc811cf3b6699abff7bda798cd4d4a9243 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 12 Nov 2024 03:45:29 -0800 Subject: [PATCH 0915/1049] Bump current to 8.16 (#3104) * Update shared version attributes * Update stackcurrent in conf.yaml --- conf.yaml | 4 ++-- shared/versions/stack/8.15.asciidoc | 2 +- shared/versions/stack/8.16.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index cdcc97f0c6c0b..3e0ae0f9c852f 100644 --- a/conf.yaml +++ b/conf.yaml @@ -78,8 +78,8 @@ contents_title: Elastic documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.15 - stacklive: &stacklive [ 8.15, 7.17 ] + stackcurrent: &stackcurrent 8.16 + stacklive: &stacklive [ 8.16, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-115 diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index 572d6884d6db8..d3f8cafc5eb28 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -28,7 +28,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 1ca51a44e1aef..6d3780c5fef21 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -24,12 +24,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index ad2a1e325db81..d3fc2ae4b03b1 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.15.asciidoc[] +include::8.16.asciidoc[] From bc554b70c9e87b342d4cdcb9eb7cf725c44a6014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:27:29 +0100 Subject: [PATCH 0916/1049] functionbeat current changed in conf.yaml (#3113) * functionbeat branches added to conf.yaml * current changed for functionbeat --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 3e0ae0f9c852f..72dfc0e8ce1c5 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2300,7 +2300,7 @@ contents: - title: Functionbeat Reference noindex: 1 prefix: en/beats/functionbeat - current: *stackcurrent + current: 8.15 index: x-pack/functionbeat/docs/index.asciidoc branches: [ 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 ] chunk: 1 From 5feb472369ee3143f2eeff046872e4473570d185 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Tue, 12 Nov 2024 15:50:47 -0800 Subject: [PATCH 0917/1049] Remove open flag (#3114) To be consistent with other build aliases, we should remove the --open tag. Might be worth adding it to all the other aliases at some point. --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 0d201e7a7f38d..5cce015244e50 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -10,7 +10,7 @@ # # Serverless -alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --open --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' +alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From 0d32291203fd6927c164bb6821aac72725d6d57f Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 12 Nov 2024 18:10:53 -0800 Subject: [PATCH 0918/1049] Check SERVERLESS_DOCS links in Kibana (#3110) --- build_docs.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_docs.pl b/build_docs.pl index 695537334b70a..b833cc2530198 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -354,7 +354,7 @@ sub check_kibana_links { my $extractor = sub { my $contents = shift; return sub { - while ( $contents =~ m!`(\$\{(?:baseUrl|ELASTIC.+|KIBANA_DOCS|PLUGIN_DOCS|FLEET_DOCS|APM_DOCS|STACK_DOCS|SECURITY_SOLUTION_DOCS|STACK_GETTING_STARTED|APP_SEARCH_DOCS|ENTERPRISE_SEARCH_DOCS|INTEGRATIONS_DEV_DOCS|WORKPLACE_SEARCH_DOCS)\}[^`]+)`!g ) { + while ( $contents =~ m!`(\$\{(?:baseUrl|ELASTIC.+|KIBANA_DOCS|PLUGIN_DOCS|FLEET_DOCS|APM_DOCS|STACK_DOCS|SECURITY_SOLUTION_DOCS|STACK_GETTING_STARTED|APP_SEARCH_DOCS|ENTERPRISE_SEARCH_DOCS|INTEGRATIONS_DEV_DOCS|WORKPLACE_SEARCH_DOCS|SERVERLESS_DOCS)\}[^`]+)`!g ) { my $path = $1; $path =~ s/\$\{(?:DOC_LINK_VERSION|urlVersion)\}/$version/; $path =~ s/\$\{(?:ECS_VERSION)\}/current/; @@ -376,6 +376,7 @@ sub check_kibana_links { $path =~ s!\$\{WORKPLACE_SEARCH_DOCS\}!en/workplace-search/$version/!; $path =~ s!\$\{MACHINE_LEARNING_DOCS\}!en/machine-learning/$version/!; $path =~ s!\$\{INTEGRATIONS_DEV_DOCS}!en/integrations-developer/current/!; + $path =~ s!\$\{SERVERLESS_DOCS}!/en/serverless/current/!; # Replace the "https://www.elastic.co/guide/" URL prefix so that # it becomes a file path in the built docs. $path =~ s!\$\{(?:baseUrl|ELASTIC_WEBSITE_URL)\}guide/!!; From 7622ad872c2df1c050501a921d0c79b442dea8f4 Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Wed, 13 Nov 2024 13:52:29 -0800 Subject: [PATCH 0919/1049] Update documentation for ECS 8.16.0 release (#3112) * Update documentation for ECS 8.16 release * Don't update current ECS version yet * set live ECS version to 8.16 --- conf.yaml | 8 ++++---- shared/versions/stack/8.16.asciidoc | 2 +- shared/versions/stack/8.x.asciidoc | 2 +- shared/versions/stack/master.asciidoc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf.yaml b/conf.yaml index 72dfc0e8ce1c5..9ed176a2ab48a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -996,10 +996,10 @@ contents: path: docs/asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - # Please do not update current to 8.12 - current: 8.11 - branches: [ {main: master}, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ 8.11, 1.12 ] + # Please do not update current to 8.17 + current: 8.16 + branches: [ {main: master}, 8.16, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ 8.16, 1.12 ] index: docs/index.asciidoc chunk: 2 tags: Elastic Common Schema (ECS)/Reference diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 6d3780c5fef21..3f85e2e07a332 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -14,7 +14,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.11 +:ecs_version: 8.16 :esf_version: master :ece-version-link: current ////////// diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index d39ba140b158e..8cd7f69e51c25 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.11 +:ecs_version: 8.16 :esf_version: master :ece-version-link: current ////////// diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index a55cf5eb69ff8..f4f646ca0b857 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 8.x :prev-major-last: 8.16 :major-version-only: 9 -:ecs_version: 8.11 +:ecs_version: 8.16 :esf_version: master :ece-version-link: current ////////// @@ -77,4 +77,4 @@ API URLs Feature flags //// -:serverlessCustomRoles: true \ No newline at end of file +:serverlessCustomRoles: true From a17db3f98e0a351d2584f23ca175967655151694 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Wed, 13 Nov 2024 15:42:39 -0800 Subject: [PATCH 0920/1049] Remove --open flag from apm doc build (#3115) Removing flag to be consistent with other build aliases. --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 5cce015244e50..36514b7b3fe15 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -180,7 +180,7 @@ alias docbldim='$GIT_HOME/docs/build_docs --doc $GIT_HOME/ingest-docs/docs/en/in alias docbldidg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/integrations/index.asciidoc --resource=$GIT_HOME/package-spec/versions --chunk 1' # APM Guide (7.16-8.11) -alias docbldapm=' $GIT_HOME/docs/build_docs --doc $GIT_HOME/observability/docs/en/apm-server/integrations-index.asciidoc --resource=$GIT_HOME/apm-server/ --resource=$GIT_HOME/ingest-docs/ --chunk 2 --open' +alias docbldapm=' $GIT_HOME/docs/build_docs --doc $GIT_HOME/observability/docs/en/apm-server/integrations-index.asciidoc --resource=$GIT_HOME/apm-server/ --resource=$GIT_HOME/ingest-docs/ --chunk 2' # APM Agents alias docbldama='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-android/docs/index.asciidoc --chunk 1' From 5b233778166e4104adfe884d2e49be48df52fdcd Mon Sep 17 00:00:00 2001 From: Istvan Nagy Date: Thu, 14 Nov 2024 09:27:49 +0100 Subject: [PATCH 0921/1049] make ECK 2.15.0 the current version (#3101) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 9ed176a2ab48a..d452d60351a2e 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2172,7 +2172,7 @@ contents: prefix: en/cloud-on-k8s tags: Kubernetes/Reference subject: ECK - current: 2.14 + current: 2.15 branches: [ {main: master}, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 From 71a99cab5fcbc3fa6cd470cd34b9afbeeae14430 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Thu, 21 Nov 2024 05:21:20 -0800 Subject: [PATCH 0922/1049] Bumps the doc version to 8.16.1 (#3118) * Bumps the doc version to 8.16.1 * Update version attribute --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 3f85e2e07a332..0a31434309b15 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.0 +:version: 8.16.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.0 -:logstash_version: 8.16.0 -:elasticsearch_version: 8.16.0 -:kibana_version: 8.16.0 -:apm_server_version: 8.16.0 +:bare_version: 8.16.1 +:logstash_version: 8.16.1 +:elasticsearch_version: 8.16.1 +:kibana_version: 8.16.1 +:apm_server_version: 8.16.1 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From ca7de98a85cf43a544a5e3551807d2c928028902 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Thu, 21 Nov 2024 12:04:06 -0800 Subject: [PATCH 0923/1049] Revert "Bumps the doc version to 8.16.1 (#3118)" (#3124) This reverts commit 71a99cab5fcbc3fa6cd470cd34b9afbeeae14430. --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 0a31434309b15..3f85e2e07a332 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.1 +:version: 8.16.0 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.1 -:logstash_version: 8.16.1 -:elasticsearch_version: 8.16.1 -:kibana_version: 8.16.1 -:apm_server_version: 8.16.1 +:bare_version: 8.16.0 +:logstash_version: 8.16.0 +:elasticsearch_version: 8.16.0 +:kibana_version: 8.16.0 +:apm_server_version: 8.16.0 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 08e0ccbd25a23fdee436ea60d68147c6c2c642c9 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Fri, 22 Nov 2024 02:27:15 -0800 Subject: [PATCH 0924/1049] Revert "Revert "Bumps the doc version to 8.16.1 (#3118)" (#3124)" (#3125) This reverts commit ca7de98a85cf43a544a5e3551807d2c928028902. --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 3f85e2e07a332..0a31434309b15 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.0 +:version: 8.16.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.0 -:logstash_version: 8.16.0 -:elasticsearch_version: 8.16.0 -:kibana_version: 8.16.0 -:apm_server_version: 8.16.0 +:bare_version: 8.16.1 +:logstash_version: 8.16.1 +:elasticsearch_version: 8.16.1 +:kibana_version: 8.16.1 +:apm_server_version: 8.16.1 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 0b6d2b3fd6fd8732c8a9f86469470175ee9bda13 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Fri, 22 Nov 2024 13:11:49 -0600 Subject: [PATCH 0925/1049] Accommodate sticky marketing nav (#3126) * adjust sticky style * clean up css --- resources/web/style/base_styles.pcss | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index 78735f5f98820..b1ac2ff4b58ce 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -40,20 +40,30 @@ .sticky-top-md { position: -webkit-relative; position: relative; - @media screen and (min-width: 769px) { + @media screen and (min-width: 1200px) { + position: -webkit-sticky; + position: sticky; + top: 72px; + } + @media screen and (min-width: 769px) and (max-width: 1199px) { position: -webkit-sticky; position: sticky; - top: 0; + top: 131px; } } .sticky-top-lg { position: -webkit-relative; position: relative; - @media screen and (min-width: 993px) { + @media screen and (min-width: 1200px) { + position: -webkit-sticky; + position: sticky; + top: 72px; + } + @media screen and (min-width: 769px) and (max-width: 1199px) { position: -webkit-sticky; position: sticky; - top: 0; + top: 131px; } } From 88c00ac26a6faae188bffe9856f828784296764d Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:54:27 -0500 Subject: [PATCH 0926/1049] Update Cloud current to ms-116 (#3116) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index d452d60351a2e..ba91862ab20f7 100644 --- a/conf.yaml +++ b/conf.yaml @@ -81,7 +81,7 @@ variables: stackcurrent: &stackcurrent 8.16 stacklive: &stacklive [ 8.16, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-115 + cloudSaasCurrent: &cloudSaasCurrent ms-116 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 3cba7147346e2a8db6c3edaf901047d77465097c Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:13:08 +0000 Subject: [PATCH 0927/1049] Bump the docs version to 8.15.5 (#3120) --- shared/versions/stack/8.15.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.15.asciidoc b/shared/versions/stack/8.15.asciidoc index d3f8cafc5eb28..12992478a3f75 100644 --- a/shared/versions/stack/8.15.asciidoc +++ b/shared/versions/stack/8.15.asciidoc @@ -1,12 +1,12 @@ -:version: 8.15.4 +:version: 8.15.5 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.15.4 -:logstash_version: 8.15.4 -:elasticsearch_version: 8.15.4 -:kibana_version: 8.15.4 -:apm_server_version: 8.15.4 +:bare_version: 8.15.5 +:logstash_version: 8.15.5 +:elasticsearch_version: 8.15.5 +:kibana_version: 8.15.5 +:apm_server_version: 8.15.5 :branch: 8.15 :minor-version: 8.15 :major-version: 8.x From b9f580d115ff72149be32372fe4a5924b4c08f1a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 26 Nov 2024 16:44:46 +0100 Subject: [PATCH 0928/1049] test: figure out how to enable the merge-queue in elastic/observability-robots-playground (#3128) --- .buildkite/pull-requests.org-wide.json | 1 + .buildkite/scripts/build_pr.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 7443a2ea16e56..3ae4ad86a2161 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -71,6 +71,7 @@ "elastic/logstash", "elastic/logstash-docs", "elastic/observability-docs", + "elastic/observability-robots-playground", "elastic/security-docs", "elastic/stack-docs", "elastic/tech-content", diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 55340a499e7f9..2664e32fd91fa 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -142,6 +142,12 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en) ;; + "observability-robots-playground") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + echo "This project is only for testing purposes" + exit 0 + ;; + "packagespec") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./versions ./spec) From c2b32f41c899a1d1a7d335d7652c29258f17fecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:36:01 +0100 Subject: [PATCH 0929/1049] 7.17.26 version bump (#3131) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 6e7f6e561fd2b..b94e25a95961f 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.25 +:version: 7.17.26 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.25 -:logstash_version: 7.17.25 -:elasticsearch_version: 7.17.25 -:kibana_version: 7.17.25 -:apm_server_version: 7.17.25 +:bare_version: 7.17.26 +:logstash_version: 7.17.26 +:elasticsearch_version: 7.17.26 +:kibana_version: 7.17.26 +:apm_server_version: 7.17.26 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 8dcb1f2fc15c7d951bdf7f1e626cfa0b19cd5706 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 3 Dec 2024 09:18:29 -0600 Subject: [PATCH 0930/1049] more fixes, add notes (#3129) --- resources/web/style/base_styles.pcss | 35 ++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index b1ac2ff4b58ce..0be5cf2f3ff91 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -1,3 +1,18 @@ +html { + /* + NOTE: DEPENDENT ON MARKETING HEADER/FOOTER + When scrolling to a heading, the heading should + go below the sticky marketing header. The value + of the padding depends on the height of the header. + */ + @media screen and (min-width: 1200px) { + scroll-padding-top: 92px; + } + @media screen and (min-width: 769px) and (max-width: 1199px) { + scroll-padding-top: 151px; + } +} + #guide { * { font-family: Inter, sans-serif; @@ -58,24 +73,40 @@ @media screen and (min-width: 1200px) { position: -webkit-sticky; position: sticky; + /* + NOTE: DEPENDENT ON MARKETING HEADER/FOOTER + This is dependent on the height of the header. + */ top: 72px; } @media screen and (min-width: 769px) and (max-width: 1199px) { position: -webkit-sticky; position: sticky; + /* + NOTE: DEPENDENT ON MARKETING HEADER/FOOTER + This is dependent on the height of the header. + */ top: 131px; } } .h-almost-full-md { @media screen and (min-width: 769px) { - height: 95vh; + /* + NOTE: DEPENDENT ON MARKETING HEADER/FOOTER + This is dependent on the height of the header. + */ + height: 90vh; } } .h-almost-full-lg { @media screen and (min-width: 993px) { - height: 95vh; + /* + NOTE: DEPENDENT ON MARKETING HEADER/FOOTER + This is dependent on the height of the header. + */ + height: 90vh; } } From 5acc8f5e4864112e76ad0608fd6c72626eed05c8 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 3 Dec 2024 11:49:54 -0600 Subject: [PATCH 0931/1049] Adds 8.17 branch and new version attributes file (#3134) * Adds 8.17 branch and new version attributes file * Removes 8.17 from ECS * Removes 8.17 from ECS in version files --- conf.yaml | 128 +++++++++++++------------- shared/versions/stack/8.17.asciidoc | 75 +++++++++++++++ shared/versions/stack/master.asciidoc | 2 +- 3 files changed, 140 insertions(+), 65 deletions(-) create mode 100644 shared/versions/stack/8.17.asciidoc diff --git a/conf.yaml b/conf.yaml index ba91862ab20f7..8fa6c6499ece4 100644 --- a/conf.yaml +++ b/conf.yaml @@ -152,7 +152,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -167,13 +167,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -189,7 +189,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -203,12 +203,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -249,7 +249,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -264,7 +264,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -281,7 +281,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -298,7 +298,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -318,7 +318,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -335,7 +335,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -350,7 +350,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -365,7 +365,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -380,7 +380,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -395,7 +395,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -412,7 +412,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -429,7 +429,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -473,7 +473,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -946,7 +946,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -971,7 +971,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.x, 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, 7.17 ] + branches: [ {main: master}, 8.x, 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -1015,7 +1015,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1037,7 +1037,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 6.x, 5.x ] + branches: [ {main: master}, 8.x, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1050,7 +1050,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1063,7 +1063,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1076,7 +1076,7 @@ contents: - title: .NET Clients prefix: net-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 8.x, 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, 6.x, 5.x, 2.x, 1.x ] live: *stacklive index: docs/index.asciidoc tags: Clients/.Net @@ -1092,7 +1092,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 8.x, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1121,7 +1121,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1147,7 +1147,7 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: [ main, 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 ] index: docs/index.asciidoc chunk: 1 @@ -1247,7 +1247,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1261,7 +1261,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1294,7 +1294,7 @@ contents: prefix: en/elastic-stack current: *stackcurrent index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1306,38 +1306,38 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 8.x, 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 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 ] + exclude_branches: [ main, 8.x, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1354,7 +1354,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1369,7 +1369,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1381,11 +1381,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1403,7 +1403,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1427,7 +1427,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 8.x, 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] + branches: [ {main: master}, 8.x, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1453,7 +1453,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 8.x, 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, 1.7 ] + branches: [ {main: master}, 8.x, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1469,7 +1469,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1493,7 +1493,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.x, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1508,7 +1508,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1531,11 +1531,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 8.x, 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.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 ] + exclude_branches: [ main, 8.x, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.5 ] + branches: [ {main: master}, 8.x, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1551,7 +1551,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1566,11 +1566,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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] + exclude_branches: [ main, 8.x, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1592,7 +1592,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1658,7 +1658,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1715,7 +1715,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1746,7 +1746,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1771,7 +1771,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1826,7 +1826,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1873,7 +1873,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 8.x, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1930,7 +1930,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -1973,7 +1973,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc new file mode 100644 index 0000000000000..5604f6fcd0f54 --- /dev/null +++ b/shared/versions/stack/8.17.asciidoc @@ -0,0 +1,75 @@ +:version: 8.17.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.17.0 +:logstash_version: 8.17.0 +:elasticsearch_version: 8.17.0 +:kibana_version: 8.17.0 +:apm_server_version: 8.17.0 +// branch is 8.17 instead of 8.x for long-term linking purposes +:branch: 8.17 +:minor-version: 8.17 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.16 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index f4f646ca0b857..7038d3a95ffd9 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -11,7 +11,7 @@ bare_version never includes -alpha or -beta :minor-version: 9.0 :major-version: 9.x :prev-major-version: 8.x -:prev-major-last: 8.16 +:prev-major-last: 8.17 :major-version-only: 9 :ecs_version: 8.16 :esf_version: master From 3decf4d63093014807c9e76c2b592f18c907ccd0 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Wed, 4 Dec 2024 09:10:05 +0100 Subject: [PATCH 0932/1049] Fix broken references to public `doc_links` (#3133) * Fix broken references to public doc_links * Include new location for `get_doc_links.ts` * Continue to support 7.13 * Use old paths in tests (new ones are too long) * Include future location of doc-links packages * Update old test references --- build_docs.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build_docs.pl b/build_docs.pl index b833cc2530198..d32210bb81be0 100755 --- a/build_docs.pl +++ b/build_docs.pl @@ -413,6 +413,9 @@ sub check_kibana_links { say " Branch: $branch, Version: $version"; my $links_file; my $source = eval { + $links_file = "src/platform/packages/shared/kbn-doc-links/src/get_doc_links.ts"; + $repo->show_file( $link_check_name, $branch, $links_file ); + } || eval { $links_file = "packages/kbn-doc-links/src/get_doc_links.ts"; $repo->show_file( $link_check_name, $branch, $links_file ); } || eval { @@ -427,6 +430,12 @@ sub check_kibana_links { } || eval { $links_file = $legacy_path . ".ts"; $repo->show_file( $link_check_name, $branch, $links_file ); + } || eval { + $links_file = "src/core/packages/doc-links/core-doc-links-browser-internal/src/doc_links_service.ts"; + $repo->show_file( $link_check_name, $branch, $links_file ); + } || eval { + $links_file = "packages/core/doc-links/core-doc-links-browser-internal/src/doc_links_service.ts"; + $repo->show_file( $link_check_name, $branch, $links_file ); } || eval { $links_file = "src/core/public/doc_links/doc_links_service.ts"; $repo->show_file( $link_check_name, $branch, $links_file ); From 00b7be6dc55e91d98cd672d0e12fe60a0d08e979 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 5 Dec 2024 12:09:00 -0600 Subject: [PATCH 0933/1049] Add integration docs (#3117) * update details style * add build alias * update config * add icons * add condensed table style * update conf.yaml * add integration-docs as a source repo * fix some styles * clean up css * prepare to merge! --- conf.yaml | 17 ++++++++++ doc_build_aliases.sh | 3 ++ resources/web/style/base_styles.pcss | 30 +++++++++++++++++ resources/web/style/child_attributes.pcss | 9 ------ resources/web/style/icons.pcss | 14 ++++++++ resources/web/style/img/icons/bug.svg | 3 ++ .../style/img/icons/checkInCircleFilled.svg | 3 ++ .../web/style/img/icons/warningFilled.svg | 3 ++ resources/web/style/table.pcss | 32 ++++++++++++++++--- resources/web/styles-v1.pcss | 2 +- shared/attributes.asciidoc | 7 ++++ 11 files changed, 109 insertions(+), 14 deletions(-) delete mode 100644 resources/web/style/child_attributes.pcss create mode 100644 resources/web/style/icons.pcss create mode 100644 resources/web/style/img/icons/bug.svg create mode 100644 resources/web/style/img/icons/checkInCircleFilled.svg create mode 100644 resources/web/style/img/icons/warningFilled.svg diff --git a/conf.yaml b/conf.yaml index 8fa6c6499ece4..8203396eefec8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -55,6 +55,7 @@ repos: guide: https://github.com/elastic/elasticsearch-definitive-guide.git guide-cn: https://github.com/elasticsearch-cn/elasticsearch-definitive-guide.git ingest-docs: https://github.com/elastic/ingest-docs.git + integration-docs: https://github.com/elastic/integration-docs.git kibana: https://github.com/elastic/kibana.git kibana-cn: https://github.com/elasticsearch-cn/kibana.git logstash: https://github.com/elastic/logstash.git @@ -125,6 +126,22 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Integrations + sections: + - title: Integrations + prefix: en/integrations + current: main + branches: [ main ] + live: [ main ] + index: dist/index.asciidoc + chunk: 2 + private: 1 + tags: Integrations/Reference + subject: Integrations + sources: + - + repo: integration-docs + path: dist - title: Serverless sections: - title: Serverless diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 36514b7b3fe15..a274f411b34ca 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -12,6 +12,9 @@ # Serverless alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' +# Integrations +alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index 0be5cf2f3ff91..25a72887587d4 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -44,6 +44,36 @@ html { details { margin-bottom: 1.15em; + border: 1px #D3DAE6 solid; + border-radius: 3px; + summary { + list-style-type: none; + display: inline-block; + width: 100%; + padding: 10px; + &:before { + content: url('data:image/svg+xml;utf8,'); + display: inline-block; + transform: translate(0px, 3.5px) rotate(0deg); + transition: .1s ease-in-out; + margin-right: 8px; + } + &::-webkit-details-marker { + display: none; + } + } + .content { + padding: 5px 20px 0px 36px; + } + } + + details[open] { + summary { + &:before { + transform: translate(-3.5px, 0px) rotate(90deg); + transition: .1s ease-in-out; + } + } } .container-fluid { diff --git a/resources/web/style/child_attributes.pcss b/resources/web/style/child_attributes.pcss deleted file mode 100644 index 1c00830228434..0000000000000 --- a/resources/web/style/child_attributes.pcss +++ /dev/null @@ -1,9 +0,0 @@ -#guide .child_attributes { - - details > div { - border: 1px solid #A9A9A9; - border-radius: 10px; - padding: 15px 10px 0; - margin: 10px 5px 20px; - } -} diff --git a/resources/web/style/icons.pcss b/resources/web/style/icons.pcss new file mode 100644 index 0000000000000..3426f18767f17 --- /dev/null +++ b/resources/web/style/icons.pcss @@ -0,0 +1,14 @@ +#guide { + .eui-icon { + background-repeat: no-repeat; + background-position: 0 0; + background-size: contain; + display: inline-block; + width: 16px; + height: 16px; + vertical-align: middle; + &.icon-bug { background-image: inline("img/icons/bug.svg"); } + &.icon-checkInCircleFilled { background-image: inline("img/icons/checkInCircleFilled.svg"); } + &.icon-warningFilled { background-image: inline("img/icons/warningFilled.svg"); } + } +} \ No newline at end of file diff --git a/resources/web/style/img/icons/bug.svg b/resources/web/style/img/icons/bug.svg new file mode 100644 index 0000000000000..19ee985ad0744 --- /dev/null +++ b/resources/web/style/img/icons/bug.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/style/img/icons/checkInCircleFilled.svg b/resources/web/style/img/icons/checkInCircleFilled.svg new file mode 100644 index 0000000000000..410cd1cd61b82 --- /dev/null +++ b/resources/web/style/img/icons/checkInCircleFilled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/style/img/icons/warningFilled.svg b/resources/web/style/img/icons/warningFilled.svg new file mode 100644 index 0000000000000..d9952fd2a6408 --- /dev/null +++ b/resources/web/style/img/icons/warningFilled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/style/table.pcss b/resources/web/style/table.pcss index fe4586a25ca86..3d4fed1679100 100644 --- a/resources/web/style/table.pcss +++ b/resources/web/style/table.pcss @@ -45,13 +45,16 @@ padding-left: 0.15em; } } - tr:last-child { - th, td { - border: none; + + tr { + &:last-child { + th, td { + border: none; + } } } - .monospaced { + .monospaced { td p, th { font-family: Consolas, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", monospace; } @@ -93,4 +96,25 @@ vertical-align: middle; } } + + /** Used in integration docs */ + .condensed-table { + table { + tbody { + tr { + border-bottom: 1px solid #e5eae4; + &:first-child { + border-top: 1px solid #e5eae4!important; + } + td { + vertical-align: top; + padding: 0.6em; + } + p { + margin-bottom: 0px!important; + } + } + } + } + } } diff --git a/resources/web/styles-v1.pcss b/resources/web/styles-v1.pcss index 0a1c72bd0f7cc..7d2f62cba72bd 100644 --- a/resources/web/styles-v1.pcss +++ b/resources/web/styles-v1.pcss @@ -8,7 +8,6 @@ @import './style/alternative_picker.pcss'; @import './style/admonishment.pcss'; @import './style/calloutlist.pcss'; -@import './style/child_attributes.pcss'; @import './style/conum.pcss'; @import './style/code.pcss'; @import './style/console_widget.pcss'; @@ -16,6 +15,7 @@ @import './style/example.pcss'; @import './style/feedback.pcss'; @import './style/heading.pcss'; +@import './style/icons.pcss'; @import './style/img.pcss'; @import './style/layout.pcss'; @import './style/link.pcss'; diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index f3b1925adb825..59dcc33974b07 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -569,3 +569,10 @@ Legacy definitions :apm-overview-ref-m: https://www.elastic.co/guide/en/apm/get-started/master :infra-guide: https://www.elastic.co/guide/en/infrastructure/guide/{branch} :a-data-source: a data view + +//// +UI icons and logos from EUI +//// +:icon-bug: pass:[] +:icon-checkInCircleFilled: pass:[] +:icon-warningFilled: pass:[] From 6845db6c5ed38b0a674811f8264a2ba863fde8e5 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 5 Dec 2024 13:33:35 -0600 Subject: [PATCH 0934/1049] add elastic/integration-docs to pull-requests template (#3127) --- .buildkite/pull-requests.org-wide.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 3ae4ad86a2161..38c71e8b3a488 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -67,6 +67,7 @@ "elastic/enterprise-search-ruby", "elastic/go-elasticsearch", "elastic/ingest-docs", + "elastic/integration-docs", "elastic/kibana", "elastic/logstash", "elastic/logstash-docs", From 397a25e77a4e000649d3b303ed7dea6b877d5ed8 Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:32:21 +0000 Subject: [PATCH 0935/1049] Adds api-kibana-serverless variable (#3137) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 59dcc33974b07..a0639596a79bf 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -207,6 +207,7 @@ Elastic Cloud :ess-skip-section: If you use {ess}, skip this section. {ess} handles these changes for you. :api-cloud: https://www.elastic.co/docs/api/doc/cloud :api-ece: https://www.elastic.co/docs/api/doc/cloud-enterprise +:api-kibana-serverless: https://www.elastic.co/docs/api/doc/serverless ////////// Elasticsearch ////////// From ca58278bc463f01c7e02a030a740d18f91938c63 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 10 Dec 2024 09:57:04 -0600 Subject: [PATCH 0936/1049] add search ui to config (#3140) --- conf.yaml | 19 +++++++++++++++++++ doc_build_aliases.sh | 3 +++ 2 files changed, 22 insertions(+) diff --git a/conf.yaml b/conf.yaml index 8203396eefec8..df4856f5da0da 100644 --- a/conf.yaml +++ b/conf.yaml @@ -62,6 +62,7 @@ repos: logstash-docs: https://github.com/elastic/logstash-docs.git observability-docs: https://github.com/elastic/observability-docs.git package-spec: https://github.com/elastic/package-spec.git + search-ui: https://github.com/elastic/search-ui.git security-docs: https://github.com/elastic/security-docs.git sense: https://github.com/elastic/sense.git stack-docs: https://github.com/elastic/stack-docs.git @@ -126,6 +127,24 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Search UI + sections: + - title: Search UI + prefix: en/search-ui + current: main + branches: [ main ] + # Uncomment next line when content is ready + # live: [ main ] + # Remove next line when content is ready + noindex: 1 + index: docs/index.asciidoc + chunk: 3 + tags: Search UI/Guide + subject: Search UI + sources: + - + repo: search-ui + path: docs - title: Integrations sections: - title: Integrations diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index a274f411b34ca..1b98eb0bffb8e 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -15,6 +15,9 @@ alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/s # Integrations alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2' +# Search UI +alias docbldsearchui='$GIT_HOME/docs/build_docs --doc $GIT_HOME/search-ui/docs/index.asciidoc --chunk 3' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From e4ae424f134544be5b1fde9931d776bd5807ffae Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 10 Dec 2024 09:57:23 -0600 Subject: [PATCH 0937/1049] Update pull-requests.org-wide.json (#3141) --- .buildkite/pull-requests.org-wide.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json index 38c71e8b3a488..29fe92e4ed5a7 100644 --- a/.buildkite/pull-requests.org-wide.json +++ b/.buildkite/pull-requests.org-wide.json @@ -73,6 +73,7 @@ "elastic/logstash-docs", "elastic/observability-docs", "elastic/observability-robots-playground", + "elastic/search-ui", "elastic/security-docs", "elastic/stack-docs", "elastic/tech-content", From 43ec0e0cdd73addea5acdf0b889cc806c71e8ae0 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Thu, 12 Dec 2024 08:26:23 -0600 Subject: [PATCH 0938/1049] Bumps current to 8.17 (#3135) --- conf.yaml | 4 ++-- shared/versions/stack/8.16.asciidoc | 2 +- shared/versions/stack/8.17.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index df4856f5da0da..109a509ba1a38 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,8 +80,8 @@ contents_title: Elastic documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.16 - stacklive: &stacklive [ 8.16, 7.17 ] + stackcurrent: &stackcurrent 8.17 + stacklive: &stacklive [ 8.17, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-116 diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 0a31434309b15..e45e05b5372ae 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -29,7 +29,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index 5604f6fcd0f54..ea4e221bd4b08 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -24,12 +24,12 @@ Keep the :esf_version: attribute value as master. ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index d3fc2ae4b03b1..47861155ea01d 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::8.16.asciidoc[] +include::8.17.asciidoc[] From 4399526a6deeaf00c3b924b69c7113dd74b198c9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 12 Dec 2024 13:24:47 -0600 Subject: [PATCH 0939/1049] start indexing search ui book (#3145) --- conf.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index 109a509ba1a38..88b217e1a387d 100644 --- a/conf.yaml +++ b/conf.yaml @@ -133,10 +133,7 @@ contents: prefix: en/search-ui current: main branches: [ main ] - # Uncomment next line when content is ready - # live: [ main ] - # Remove next line when content is ready - noindex: 1 + live: [ main ] index: docs/index.asciidoc chunk: 3 tags: Search UI/Guide From d8ad5a5cf8089fced9af7a87b30920df1037647c Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Mon, 16 Dec 2024 11:04:24 -0500 Subject: [PATCH 0940/1049] ESS - Change current to ms-117 (#3146) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 88b217e1a387d..37a2aec65ae13 100644 --- a/conf.yaml +++ b/conf.yaml @@ -83,7 +83,7 @@ variables: stackcurrent: &stackcurrent 8.17 stacklive: &stacklive [ 8.17, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-116 + cloudSaasCurrent: &cloudSaasCurrent ms-117 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From e81cf9285e88f8b21a40b76d82d88ee086c5bfee Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 17 Dec 2024 03:53:54 -0600 Subject: [PATCH 0941/1049] Bumps the docs version to 8.16.2 (#3142) --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index e45e05b5372ae..4dc863b305108 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.1 +:version: 8.16.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.1 -:logstash_version: 8.16.1 -:elasticsearch_version: 8.16.1 -:kibana_version: 8.16.1 -:apm_server_version: 8.16.1 +:bare_version: 8.16.2 +:logstash_version: 8.16.2 +:elasticsearch_version: 8.16.2 +:kibana_version: 8.16.2 +:apm_server_version: 8.16.2 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 919de74445a6649640a96f9ea439096a9ad60f30 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 17 Dec 2024 11:29:31 -0800 Subject: [PATCH 0942/1049] Add api-es shared attribute (#3147) --- shared/versions/stack/8.16.asciidoc | 1 + shared/versions/stack/8.17.asciidoc | 1 + shared/versions/stack/8.x.asciidoc | 1 + shared/versions/stack/master.asciidoc | 1 + 4 files changed, 4 insertions(+) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 4dc863b305108..608968e5f75f8 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -73,3 +73,4 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 \ No newline at end of file diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index ea4e221bd4b08..f1fe11fea6633 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -73,3 +73,4 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 \ No newline at end of file diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index 8cd7f69e51c25..eb0e3033e5c31 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -72,3 +72,4 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 \ No newline at end of file diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 7038d3a95ffd9..bda2bd7a1a15e 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -72,6 +72,7 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch //// Feature flags From 0ad6e073696d28a7a2551e308c7216c7a397b5ad Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 18 Dec 2024 11:21:48 -0600 Subject: [PATCH 0943/1049] fix collapsible animation (#3148) --- resources/web/style/base_styles.pcss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index 25a72887587d4..772c3121a1f92 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -68,7 +68,7 @@ html { } details[open] { - summary { + > summary { &:before { transform: translate(-3.5px, 0px) rotate(90deg); transition: .1s ease-in-out; From b4e83236a6cf85df8f404ad194f23f2cc7368640 Mon Sep 17 00:00:00 2001 From: Michael Montgomery Date: Wed, 18 Dec 2024 12:45:12 -0600 Subject: [PATCH 0944/1049] Add ECK 2.16 (#3138) Signed-off-by: Michael Montgomery --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 37a2aec65ae13..d2b097e586a23 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2206,7 +2206,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.15 - branches: [ {main: master}, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ {main: master}, 2.16, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: From 84c8b9030a91deb009edf484813cf7975c8e9687 Mon Sep 17 00:00:00 2001 From: Michael Montgomery Date: Thu, 19 Dec 2024 13:06:50 -0600 Subject: [PATCH 0945/1049] Promote ECK 2.16 branch to current (#3149) * Promote ECK 2.16 branch to current --------- Signed-off-by: Michael Montgomery --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index d2b097e586a23..2a37faae3836a 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2205,7 +2205,7 @@ contents: prefix: en/cloud-on-k8s tags: Kubernetes/Reference subject: ECK - current: 2.15 + current: 2.16 branches: [ {main: master}, 2.16, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 From 61a997c26b5bdf444b277f0d41ffb54222a09951 Mon Sep 17 00:00:00 2001 From: George Wallace Date: Mon, 6 Jan 2025 07:32:15 -0700 Subject: [PATCH 0946/1049] adding reference architecture content set (#3151) --- conf.yaml | 15 ++++++++++++++- doc_build_aliases.sh | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 2a37faae3836a..ccf2a786582c6 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1519,7 +1519,20 @@ contents: repo: docs path: shared/attributes.asciidoc exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - + - title: Reference Architectures + prefix: en/reference-architectures + current: main + index: docs/en/reference-architectures/index.asciidoc + branches: [ {main: master} ] + tags: Reference Architectures + subject: Reference Architectures + sources: + - + repo: stack-docs + path: docs/en + - + repo: docs + path: shared/attributes.asciidoc - title: "Ingest: Add your data" sections: - title: Elastic Ingest Reference Architectures diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 1b98eb0bffb8e..a825122612788 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -302,3 +302,6 @@ alias docbldall='$GIT_HOME/docs/build_docs --all --target_repo git@github.com:el # Machine learning alias docbldml='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/stack/ml/index.asciidoc --resource $GIT_HOME/elasticsearch/docs --chunk 1' + +# Reference Architectures +alias docbldrefarch='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/reference-architectures/index.asciidoc --chunk 1' \ No newline at end of file From fcdde84bd766f797b596d252cb7ef6cf4070f527 Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Tue, 7 Jan 2025 17:40:16 +0100 Subject: [PATCH 0947/1049] Update shared cloud sign up instructions to account for serverless GA being the new default experience (#3132) --- shared/attributes.asciidoc | 2 +- shared/cloud/ess-getting-started.asciidoc | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index a0639596a79bf..bf536118e7d3f 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -191,7 +191,7 @@ Elastic Cloud :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body :ess-baymax: {ess-utm-params} -:ess-trial: https://www.elastic.co/cloud/elasticsearch-service/signup{ess-utm-params} +:ess-trial: https://cloud.elastic.co/registration{ess-utm-params} :ess-product: https://www.elastic.co/cloud/elasticsearch-service{ess-utm-params} :ess-console: https://cloud.elastic.co{ess-utm-params} :ess-console-name: {ess} Console diff --git a/shared/cloud/ess-getting-started.asciidoc b/shared/cloud/ess-getting-started.asciidoc index 55078474c06d1..3d18566325d13 100644 --- a/shared/cloud/ess-getting-started.asciidoc +++ b/shared/cloud/ess-getting-started.asciidoc @@ -4,19 +4,13 @@ //[[cloud-ess-getting-started]] //== Get started with {ess} -There's no faster way to get started than with our hosted {ess} on Elastic Cloud: +There's no faster way to get started than with Elastic Cloud: // tag::generic[] -. {ess-trial}[Get a free trial]. +. {ess-trial}[Sign up for a free trial]. -. Log into {ess-console}[Elastic Cloud]. - -. Click *Create deployment*. - -. Give your deployment a name. - -. Click *Create deployment* and download the password for the `elastic` user. +. Follow the on-screen steps to create your first project. // end::generic[] -That’s it! Now that you are up and running, it’s time to get some data into -{kib}. {kib} will open as soon as your deployment is ready. +That’s it! You're ready to get some data into your +project. From f64b2c010a767089573d39acdd628cb7179e86ca Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 9 Jan 2025 16:05:00 -0800 Subject: [PATCH 0948/1049] Add api-ls shared attribute (#3155) --- shared/versions/stack/8.17.asciidoc | 3 ++- shared/versions/stack/8.x.asciidoc | 3 ++- shared/versions/stack/master.asciidoc | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index f1fe11fea6633..f1765c21cc0fa 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -73,4 +73,5 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 -:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 \ No newline at end of file +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 +:api-ls: https://www.elastic.co/docs/api/doc/logstash \ No newline at end of file diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index eb0e3033e5c31..9cda4b96dad9f 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -72,4 +72,5 @@ Synthetics API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 -:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 \ No newline at end of file +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 +:api-ls: https://www.elastic.co/docs/api/doc/logstash diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index bda2bd7a1a15e..69daf0ba7a122 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -73,6 +73,7 @@ API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana :api-es: https://www.elastic.co/docs/api/doc/elasticsearch +:api-ls: https://www.elastic.co/docs/api/doc/logstash //// Feature flags From bab02ad4fc2524e7f4106dfde104484703a6b195 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 14 Jan 2025 08:50:22 -0600 Subject: [PATCH 0949/1049] Bumps the docs version to 7.17.27 (#3152) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index b94e25a95961f..1e9d98623d6ae 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.26 +:version: 7.17.27 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.26 -:logstash_version: 7.17.26 -:elasticsearch_version: 7.17.26 -:kibana_version: 7.17.26 -:apm_server_version: 7.17.26 +:bare_version: 7.17.27 +:logstash_version: 7.17.27 +:elasticsearch_version: 7.17.27 +:kibana_version: 7.17.27 +:apm_server_version: 7.17.27 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From 63533da943ef646cdaf028b413774682204c961f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:57:48 +0100 Subject: [PATCH 0950/1049] docs version bumped to 8.16.3 (#3153) --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 608968e5f75f8..4d399e90593e3 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.2 +:version: 8.16.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.2 -:logstash_version: 8.16.2 -:elasticsearch_version: 8.16.2 -:kibana_version: 8.16.2 -:apm_server_version: 8.16.2 +:bare_version: 8.16.3 +:logstash_version: 8.16.3 +:elasticsearch_version: 8.16.3 +:kibana_version: 8.16.3 +:apm_server_version: 8.16.3 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 06bf0c54b92e665d4686c5084207e1aecf127fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:58:03 +0100 Subject: [PATCH 0951/1049] docs version bumped to 8.17.1 (#3154) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index f1765c21cc0fa..1a7c0ee4f59a3 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.0 +:version: 8.17.1 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.0 -:logstash_version: 8.17.0 -:elasticsearch_version: 8.17.0 -:kibana_version: 8.17.0 -:apm_server_version: 8.17.0 +:bare_version: 8.17.1 +:logstash_version: 8.17.1 +:elasticsearch_version: 8.17.1 +:kibana_version: 8.17.1 +:apm_server_version: 8.17.1 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From 433eb13fd1e501ca5629d3348c5161495941f9a3 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 23 Jan 2025 08:05:11 -0800 Subject: [PATCH 0952/1049] ESS - Change current to ms-119 (#3156) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index ccf2a786582c6..9d608b5c049a9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -83,7 +83,7 @@ variables: stackcurrent: &stackcurrent 8.17 stacklive: &stacklive [ 8.17, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-117 + cloudSaasCurrent: &cloudSaasCurrent ms-119 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 094d732a57da0ec5950317936f24cefcbb49e8be Mon Sep 17 00:00:00 2001 From: Karen Metts <35154725+karenzone@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:04:39 -0500 Subject: [PATCH 0953/1049] Add ingest overview content set (#3159) --- conf.yaml | 14 ++++++++++++++ doc_build_aliases.sh | 3 +++ 2 files changed, 17 insertions(+) diff --git a/conf.yaml b/conf.yaml index 9d608b5c049a9..d703beedda4e5 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1634,6 +1634,20 @@ contents: - repo: docs path: shared/attributes.asciidoc + - title: Elastic Ingest Overview + prefix: en/ingest-overview + current: main + index: docs/en/ingest-guide/index.asciidoc + branches: [ {main: master} ] + tags: Ingest Overview + subject: Ingest Overview + sources: + - + repo: ingest-docs + path: docs/en + - + repo: docs + path: shared/attributes.asciidoc - title: Elastic Logging Plugin for Docker prefix: en/beats/loggingplugin current: *stackcurrent diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index a825122612788..cc8816aea50f5 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -66,6 +66,9 @@ docbldlsvpr() { "$GIT_HOME/docs/build_docs" --doc "$GIT_HOME/logstash-docs/docs/versioned-plugins/index.asciidoc" --chunk 1 "$@" } +# Ingest Overview +alias docbldingest='$GIT_HOME/docs/build_docs --doc $GIT_HOME/ingest-docs/docs/en/ingest-guide/index.asciidoc --chunk 1' + # Installation and Upgrade Guide 7.10 and later alias docbldstk='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/install-upgrade/index.asciidoc --resource=$GIT_HOME/elasticsearch/docs/ --resource=$GIT_HOME/kibana/docs/ --resource=$GIT_HOME/beats/libbeat/docs/ --resource=$GIT_HOME/observability-docs/docs/en/observability --resource=$GIT_HOME/logstash/docs/ --resource=$GIT_HOME/elasticsearch-hadoop/docs/src/reference/asciidoc/ --resource=$GIT_HOME/security-docs/docs/ --chunk 1' From 50b71f500b06cd6f1b870ab888684bbb691012fb Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Wed, 29 Jan 2025 13:57:15 -0800 Subject: [PATCH 0954/1049] Add ECS 8.17 to documentation. (#3157) Update documentation to use the latest ECS version, 8.17.0 --- conf.yaml | 8 ++++---- shared/versions/stack/8.17.asciidoc | 4 ++-- shared/versions/stack/8.x.asciidoc | 2 +- shared/versions/stack/master.asciidoc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf.yaml b/conf.yaml index d703beedda4e5..79058f4db45ec 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1029,10 +1029,10 @@ contents: path: docs/asciidoc - title: Elastic Common Schema (ECS) Reference prefix: en/ecs - # Please do not update current to 8.17 - current: 8.16 - branches: [ {main: master}, 8.16, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] - live: [ 8.16, 1.12 ] + # Please do not update current to 8.18 + current: 8.17 + branches: [ {main: master}, 8.17, 8.16, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + live: [ 8.17, 1.12 ] index: docs/index.asciidoc chunk: 2 tags: Elastic Common Schema (ECS)/Reference diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index 1a7c0ee4f59a3..f3ff48166fff3 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -14,7 +14,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.16 +:ecs_version: 8.17 :esf_version: master :ece-version-link: current ////////// @@ -74,4 +74,4 @@ API URLs //// :api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 :api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 -:api-ls: https://www.elastic.co/docs/api/doc/logstash \ No newline at end of file +:api-ls: https://www.elastic.co/docs/api/doc/logstash diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index 9cda4b96dad9f..e17b36acb31bd 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 7.x :prev-major-last: 7.17 :major-version-only: 8 -:ecs_version: 8.16 +:ecs_version: 8.17 :esf_version: master :ece-version-link: current ////////// diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 69daf0ba7a122..7607f701f6ba9 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -13,7 +13,7 @@ bare_version never includes -alpha or -beta :prev-major-version: 8.x :prev-major-last: 8.17 :major-version-only: 9 -:ecs_version: 8.16 +:ecs_version: 8.17 :esf_version: master :ece-version-link: current ////////// From cce88d5f74586c7243f133c842770fb493a58722 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 31 Jan 2025 07:25:40 -0800 Subject: [PATCH 0955/1049] Add esre-ref attribute (#3162) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index bf536118e7d3f..c4a2798763c93 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -130,6 +130,7 @@ Elastic-level pages :integrations-devguide: https://www.elastic.co/guide/en/integrations-developer/current :time-units: {ref}/api-conventions.html#time-units :byte-units: {ref}/api-conventions.html#byte-units +:esre-ref: https://www.elastic.co/guide/en/esre/{branch} ////////// APM agents From 5bb938f55eb5e6d5388d2c4c59e0eb00d675f99a Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Mon, 3 Feb 2025 11:35:06 -0800 Subject: [PATCH 0956/1049] Add 9.0 Installation and Upgrade Guide (#3164) --- conf.yaml | 23 +++++---- shared/versions/stack/9.0.asciidoc | 82 ++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 shared/versions/stack/9.0.asciidoc diff --git a/conf.yaml b/conf.yaml index 79058f4db45ec..44dafa550007d 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1325,10 +1325,10 @@ contents: path: shared/attributes.asciidoc - title: Installation and Upgrade Guide prefix: en/elastic-stack - current: *stackcurrent + current: 8.17 index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] - live: *stacklive + branches: [ {main: master}, 9.0, 8.x, 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 ] + live: [ 9.0, 8.17, 7.17] chunk: 1 tags: Elastic Stack/Installation and Upgrade subject: Elastic Stack @@ -1339,38 +1339,39 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 8.x, 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 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 ] + exclude_branches: [ main, 9.0, 8.x, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ + exclude_branches: [ main, 9.0 ] - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc diff --git a/shared/versions/stack/9.0.asciidoc b/shared/versions/stack/9.0.asciidoc new file mode 100644 index 0000000000000..565f378e55029 --- /dev/null +++ b/shared/versions/stack/9.0.asciidoc @@ -0,0 +1,82 @@ +:version: 9.0.0-beta1 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 9.0.0 +:logstash_version: 9.0.0 +:elasticsearch_version: 9.0.0 +:kibana_version: 9.0.0 +:apm_server_version: 9.0.0 +:branch: current +:minor-version: 9.0 +:major-version: 9.x +:prev-major-version: 8.x +:prev-major-last: 8.17 +:major-version-only: 9 +:ecs_version: 8.17 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: unreleased + +////////// +is-current-version can be: true | false +////////// +:is-current-version: false + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch +:api-ls: https://www.elastic.co/docs/api/doc/logstash + +//// +Feature flags +//// + +:serverlessCustomRoles: true From 2f246668afd1d46abe6002e5b778190793ae85c2 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 4 Feb 2025 07:33:59 -0800 Subject: [PATCH 0957/1049] Add stack-ref-90 attribute (#3165) --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index c4a2798763c93..a3fad915051e2 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -59,6 +59,7 @@ Elastic-level pages :stack-ref-68: https://www.elastic.co/guide/en/elastic-stack/6.8 :stack-ref-70: https://www.elastic.co/guide/en/elastic-stack/7.0 :stack-ref-80: https://www.elastic.co/guide/en/elastic-stack/8.0 +:stack-ref-90: https://www.elastic.co/guide/en/elastic-stack/9.0 :stack-ov: https://www.elastic.co/guide/en/elastic-stack-overview/{branch} :stack-gs: https://www.elastic.co/guide/en/elastic-stack-get-started/{branch} :stack-gs-current: https://www.elastic.co/guide/en/elastic-stack-get-started/current From 434e0668762edf5c83661d487888306c734a1411 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 4 Feb 2025 15:33:36 -0800 Subject: [PATCH 0958/1049] Update build_pr.sh (#3168) --- .buildkite/scripts/build_pr.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 2664e32fd91fa..b15ea94c0f602 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -77,6 +77,11 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) ;; + "docs-content") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./serverless) + ;; + "beats") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module) From bb883f6b45e1e718f1808515fd92ca3043e8a0bb Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:51:23 +0000 Subject: [PATCH 0959/1049] Bump the docs version to 8.17.2 (#3167) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index f3ff48166fff3..f5aa4755dc95b 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.1 +:version: 8.17.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.1 -:logstash_version: 8.17.1 -:elasticsearch_version: 8.17.1 -:kibana_version: 8.17.1 -:apm_server_version: 8.17.1 +:bare_version: 8.17.2 +:logstash_version: 8.17.2 +:elasticsearch_version: 8.17.2 +:kibana_version: 8.17.2 +:apm_server_version: 8.17.2 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From ac5f90bfcf34e625d6eda1edb110b8766368201f Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:51:36 +0000 Subject: [PATCH 0960/1049] Bump the docs version to 8.16.4 (#3166) --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 4d399e90593e3..3d357a590182b 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.3 +:version: 8.16.4 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.3 -:logstash_version: 8.16.3 -:elasticsearch_version: 8.16.3 -:kibana_version: 8.16.3 -:apm_server_version: 8.16.3 +:bare_version: 8.16.4 +:logstash_version: 8.16.4 +:elasticsearch_version: 8.16.4 +:kibana_version: 8.16.4 +:apm_server_version: 8.16.4 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From c5d6435019ffa25b16edf162868d585a2a0a51e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?= <25320357+eedugon@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:32:52 +0100 Subject: [PATCH 0961/1049] Adding 8.18 and 8.18.0 details, master not bumped as it's on 9.0.0, current still 8.17 (#3161) * adding 8.18 and 8.18.0 details * missing change in conf.yaml * ecs left in 8.17 in the new 8.18.asciidoc file * final changes due to forgetting a previous save * ecs 8.18 removed --- conf.yaml | 128 +++++++++++++------------- shared/versions/stack/8.18.asciidoc | 77 ++++++++++++++++ shared/versions/stack/master.asciidoc | 2 +- 3 files changed, 142 insertions(+), 65 deletions(-) create mode 100644 shared/versions/stack/8.18.asciidoc diff --git a/conf.yaml b/conf.yaml index 44dafa550007d..5e9473a78e324 100644 --- a/conf.yaml +++ b/conf.yaml @@ -185,7 +185,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -200,13 +200,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 8.x, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -222,7 +222,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 8.x, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -236,12 +236,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 8.x, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -282,7 +282,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -297,7 +297,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -314,7 +314,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -331,7 +331,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -351,7 +351,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -368,7 +368,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -383,7 +383,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6 ] + branches: [ {main: master}, 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 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -398,7 +398,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -413,7 +413,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -428,7 +428,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -445,7 +445,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -462,7 +462,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -506,7 +506,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -979,7 +979,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1004,7 +1004,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 8.x, 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, 7.17 ] + branches: [ {main: master}, 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -1048,7 +1048,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1070,7 +1070,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 6.x, 5.x ] + branches: [ {main: master}, 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1083,7 +1083,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1096,7 +1096,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1109,7 +1109,7 @@ contents: - title: .NET Clients prefix: net-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 6.x, 5.x, 2.x, 1.x ] + branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] live: *stacklive index: docs/index.asciidoc tags: Clients/.Net @@ -1125,7 +1125,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1154,7 +1154,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1180,7 +1180,7 @@ contents: - title: Rust Client prefix: rust-api current: main - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: [ main, 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 ] index: docs/index.asciidoc chunk: 1 @@ -1280,7 +1280,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1294,7 +1294,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + branches: [ {main: master}, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1327,7 +1327,7 @@ contents: prefix: en/elastic-stack current: 8.17 index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 9.0, 8.x, 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 ] + branches: [ {main: master}, 9.0, 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 ] live: [ 9.0, 8.17, 7.17] chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1339,15 +1339,15 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8, 8.5, 8.4, 8.3, 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 ] + exclude_branches: [ main, 9.0, 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.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 9.0, 8.x, 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 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 ] + exclude_branches: [ main, 9.0, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ @@ -1355,23 +1355,23 @@ contents: - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 9.0, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1388,7 +1388,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1403,7 +1403,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1415,11 +1415,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1437,7 +1437,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1461,7 +1461,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 8.x, 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] + branches: [ {main: master}, 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1487,7 +1487,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 8.x, 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, 1.7 ] + branches: [ {main: master}, 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1503,7 +1503,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 8.x, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1540,7 +1540,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.x, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ {main: master}, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1555,7 +1555,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1578,11 +1578,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 8.x, 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.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 ] + exclude_branches: [ main, 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.5 ] + branches: [ {main: master}, 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1598,7 +1598,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 8.x, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1613,11 +1613,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 8.x, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 8.x, 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] + exclude_branches: [ main, 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1653,7 +1653,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1719,7 +1719,7 @@ contents: prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1776,7 +1776,7 @@ contents: prefix: en/beats/devguide index: docs/devguide/index.asciidoc current: main - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1807,7 +1807,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1832,7 +1832,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1887,7 +1887,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1934,7 +1934,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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 ] + branches: [ {main: master}, 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1991,7 +1991,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1, 1.0.1] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -2034,7 +2034,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 8.x, 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, 1.3, 1.2, 1.1 ] + branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference diff --git a/shared/versions/stack/8.18.asciidoc b/shared/versions/stack/8.18.asciidoc new file mode 100644 index 0000000000000..ff16a54eb2366 --- /dev/null +++ b/shared/versions/stack/8.18.asciidoc @@ -0,0 +1,77 @@ +:version: 8.18.0 +//// +bare_version never includes -alpha or -beta +//// +:bare_version: 8.18.0 +:logstash_version: 8.18.0 +:elasticsearch_version: 8.18.0 +:kibana_version: 8.18.0 +:apm_server_version: 8.18.0 +// branch is 8.18 instead of 8.x for long-term linking purposes +:branch: 8.18 +:minor-version: 8.18 +:major-version: 8.x +:prev-major-version: 7.x +:prev-major-last: 7.17 +:major-version-only: 8 +:ecs_version: 8.17 +:esf_version: master +:ece-version-link: current +////////// +Keep the :esf_version: attribute value as master. +////////// + +////////// +release-state can be: released | prerelease | unreleased +////////// +:release-state: released + +////////// +is-current-version can be: true | false +////////// +:is-current-version: true + +////////// +hide-xpack-tags defaults to "false" (they are shown unless set to "true") +////////// +:hide-xpack-tags: true + +//// +APM Agent versions +//// +:apm-android-branch: 0.x +:apm-go-branch: 2.x +:apm-ios-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 5.x +:apm-node-branch: 4.x +:apm-php-branch: 1.x +:apm-py-branch: 6.x +:apm-ruby-branch: 4.x +:apm-dotnet-branch: 1.x + +//// +ECS Logging +//// +:ecs-logging: master +:ecs-logging-go-logrus: master +:ecs-logging-go-zap: master +:ecs-logging-go-zerolog: master +:ecs-logging-java: 1.x +:ecs-logging-dotnet: master +:ecs-logging-nodejs: master +:ecs-logging-php: master +:ecs-logging-python: master +:ecs-logging-ruby: master + +//// +Synthetics +//// +:synthetics_version: v1.3.0 + +//// +API URLs +//// +:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8 +:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8 +:api-ls: https://www.elastic.co/docs/api/doc/logstash diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 7607f701f6ba9..b2f64c47e4bc4 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -11,7 +11,7 @@ bare_version never includes -alpha or -beta :minor-version: 9.0 :major-version: 9.x :prev-major-version: 8.x -:prev-major-last: 8.17 +:prev-major-last: 8.18 :major-version-only: 9 :ecs_version: 8.17 :esf_version: master From 8510f29fd6b4c3444fbb89f72db60f72a68703fa Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Thu, 13 Feb 2025 20:25:17 +0100 Subject: [PATCH 0962/1049] ESS - Change current to ms-120 (#3169) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 5e9473a78e324..f8dc6fcfe8a92 100644 --- a/conf.yaml +++ b/conf.yaml @@ -83,7 +83,7 @@ variables: stackcurrent: &stackcurrent 8.17 stacklive: &stacklive [ 8.17, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-119 + cloudSaasCurrent: &cloudSaasCurrent ms-120 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From eb3ebfc136b5fa8d7f515679476f2e395b3b4e20 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 24 Feb 2025 11:30:36 -0800 Subject: [PATCH 0963/1049] Disable link checking to `main` and `master` (#3173) * try something Signed-off-by: bmorelli25 * update Signed-off-by: bmorelli25 * attempt 2: conditionally check links based on path elements Signed-off-by: bmorelli25 * fixes Signed-off-by: bmorelli25 * fix tests Signed-off-by: bmorelli25 * another bug Signed-off-by: bmorelli25 * comment code Signed-off-by: bmorelli25 * fix more bugs Signed-off-by: bmorelli25 * test * revert testing changes * attempt to fix * fix error * add version file * test * fix bug * fix more errors * try to fix tests * look, i tried to make these tests work * i hate tests pls just go away * updates --------- Signed-off-by: bmorelli25 --- conf.yaml | 302 +++++++++--------- .../all_books_broken_link_detection_spec.rb | 60 ---- lib/ES/LinkCheck.pm | 20 +- .../stack/do-not-delete_legacy-docs.asciidoc | 1 + 4 files changed, 167 insertions(+), 216 deletions(-) create mode 100644 shared/versions/stack/do-not-delete_legacy-docs.asciidoc diff --git a/conf.yaml b/conf.yaml index f8dc6fcfe8a92..e7fc6ffed0a4c 100644 --- a/conf.yaml +++ b/conf.yaml @@ -111,14 +111,6 @@ variables: 1.1: main 1.0: main - # Use this when you're building a book that uses a "main" branch, but it has a dependency on a repo with a "master" branch - mapMainToMaster: &mapMainToMaster - main: master - - # Use this when you're building a book that uses a "master" branch, but it has a dependency on a repo with a "main" branch - mapMasterToMain: &mapMasterToMain - master: main - beatsSharedExclude: &beatsSharedExclude [ 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 ] beatsXpackLibbeatExclude: &beatsXpackLibbeatExclude [ 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 ] beatsProcessorExclude: &beatsProcessorExclude [ 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 ] @@ -146,9 +138,9 @@ contents: sections: - title: Integrations prefix: en/integrations - current: main - branches: [ main ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: main}] + live: [ do-not-delete_legacy-docs ] index: dist/index.asciidoc chunk: 2 private: 1 @@ -162,9 +154,9 @@ contents: sections: - title: Serverless prefix: en/serverless - current: main - branches: [ main ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: main}] + live: [ do-not-delete_legacy-docs ] index: serverless/index.asciidoc chunk: 5 tags: Serverless/Guide @@ -185,7 +177,7 @@ contents: - title: Elasticsearch Guide prefix: en/elasticsearch/reference current: *stackcurrent - branches: [ {main: master}, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] live: *stacklive index: docs/reference/index.x.asciidoc chunk: 1 @@ -200,13 +192,13 @@ contents: prefix: elasticsearch-extra/x-pack-elasticsearch path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: x-pack-elasticsearch prefix: elasticsearch-extra/x-pack-elasticsearch path: qa/sql private: true - exclude_branches: [ main, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: docs/Versions.asciidoc @@ -222,7 +214,7 @@ contents: - repo: elasticsearch path: buildSrc/ - exclude_branches: [ main, 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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.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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/ @@ -236,12 +228,12 @@ contents: path: x-pack/docs private: true # only exists from 6.2 to 8.9 - exclude_branches: [ main, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + exclude_branches: [ 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/qa/sql # only exists from 6.3 to 6.5 - exclude_branches: [ main, 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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.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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: x-pack/plugin/esql/qa/testFixtures/src/main/resources @@ -282,7 +274,7 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - alternatives: { source_lang: console, alternative_lang: js } repo: elasticsearch-js @@ -297,7 +289,7 @@ contents: index: enterprise-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Enterprise Search/Guide @@ -314,7 +306,7 @@ contents: index: workplace-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Workplace Search/Guide @@ -331,7 +323,7 @@ contents: index: app-search-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: App Search/Guide @@ -351,7 +343,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: client-docs/app-search-javascript/index.asciidoc tags: App Search Clients/JavaScript @@ -368,7 +360,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: client-docs/app-search-node/index.asciidoc tags: App Search Clients/Node.js @@ -383,7 +375,7 @@ contents: - title: Enterprise Search Node.js client prefix: enterprise-search-node current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: [ *stackcurrent ] index: packages/enterprise-search/docs/index.asciidoc tags: Enterprise Search Clients/Node.js @@ -398,7 +390,7 @@ contents: - title: Enterprise Search PHP client prefix: php current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/PHP @@ -413,7 +405,7 @@ contents: - title: Enterprise Search Python client prefix: python current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Python @@ -428,7 +420,7 @@ contents: - title: Enterprise Search Ruby client prefix: ruby current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/guide/index.asciidoc tags: Enterprise Search Clients/Ruby @@ -445,7 +437,7 @@ contents: private: 1 single: 1 current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: client-docs/workplace-search-node/index.asciidoc tags: Workplace Search Clients/Node.js @@ -462,7 +454,7 @@ contents: - title: Observability prefix: en/observability current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/en/observability/index.asciidoc chunk: 4 @@ -506,7 +498,7 @@ contents: toc_extra: extra/apm_guide_landing.html index: docs/en/apm-server/integrations-index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 2 tags: APM Guide @@ -516,7 +508,6 @@ contents: repo: observability-docs path: docs/en exclude_branches: [ 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 ] - map_branches: *mapMasterToMain - repo: apm-server path: changelogs @@ -540,7 +531,7 @@ contents: - title: APM Android Agent prefix: android current: 0.x - branches: [ {main: master}, 0.x ] + branches: [ 0.x ] live: [ 0.x ] index: docs/index.asciidoc tags: APM Android Agent/Reference @@ -556,7 +547,7 @@ contents: - title: APM Go Agent prefix: go current: 2.x - branches: [ {main: master}, 2.x, 1.x, 0.5 ] + branches: [ 2.x, 1.x, 0.5 ] live: [ 2.x, 1.x ] index: docs/index.asciidoc tags: APM Go Agent/Reference @@ -573,7 +564,7 @@ contents: - title: APM iOS Agent prefix: swift current: 1.x - branches: [ main, 1.x, 0.x ] + branches: [ 1.x, 0.x ] live: [ 1.x ] index: docs/index.asciidoc tags: APM iOS Agent/Reference @@ -589,7 +580,7 @@ contents: - title: APM Java Agent prefix: java current: 1.x - branches: [ {main: master}, 1.x, 0.7, 0.6 ] + branches: [ 1.x, 0.7, 0.6 ] live: [ 1.x ] index: docs/index.asciidoc tags: APM Java Agent/Reference @@ -608,11 +599,11 @@ contents: path: docs exclude_branches: [ 0.7, 0.6 ] map_branches: - 1.x: main + 1.x: do-not-delete_legacy-docs - title: APM .NET Agent prefix: dotnet current: 1.x - branches: [ {main: master}, 1.x, 1.8 ] + branches: [ 1.x, 1.8 ] live: [ 1.x ] index: docs/index.asciidoc tags: APM .NET Agent/Reference @@ -628,7 +619,7 @@ contents: - title: APM Node.js Agent prefix: nodejs current: 4.x - branches: [ {main: master}, 4.x, 3.x, 2.x, 1.x ] + branches: [ 4.x, 3.x, 2.x, 1.x ] live: [ 4.x ] index: docs/index.asciidoc tags: APM Node.js Agent/Reference @@ -647,12 +638,12 @@ contents: path: docs exclude_branches: [ 2.x, 1.x, 0.x ] map_branches: - 3.x: main - 4.x: main + 3.x: do-not-delete_legacy-docs + 4.x: do-not-delete_legacy-docs - title: APM PHP Agent prefix: php current: 1.x - branches: [ {main: master}, 1.x ] + branches: [ 1.x ] live: [ 1.x ] index: docs/index.asciidoc tags: APM PHP Agent/Reference @@ -668,7 +659,7 @@ contents: - title: APM Python Agent prefix: python current: 6.x - branches: [ {main: master}, 6.x, 5.x, 4.x, 3.x, 2.x, 1.x ] + branches: [ 6.x, 5.x, 4.x, 3.x, 2.x, 1.x ] live: [ 6.x, 5.x ] index: docs/index.asciidoc tags: APM Python Agent/Reference @@ -687,11 +678,11 @@ contents: path: docs exclude_branches: [ 5.x, 4.x, 3.x, 2.x, 1.x ] map_branches: - 6.x: main + 6.x: do-not-delete_legacy-docs - title: APM Ruby Agent prefix: ruby current: 4.x - branches: [ {main: master}, 4.x, 3.x, 2.x, 1.x ] + branches: [ 4.x, 3.x, 2.x, 1.x ] live: [ 4.x ] index: docs/index.asciidoc tags: APM Ruby Agent/Reference @@ -708,7 +699,7 @@ contents: - title: APM Real User Monitoring JavaScript Agent prefix: rum-js current: 5.x - branches: [ {main: master}, 5.x, 4.x, 3.x, 2.x, 1.x, 0.x ] + branches: [ 5.x, 4.x, 3.x, 2.x, 1.x, 0.x ] live: [ 5.x, 4.x] index: docs/index.asciidoc tags: APM Real User Monitoring JavaScript Agent/Reference @@ -724,9 +715,9 @@ contents: exclude_branches: [ 3.x, 2.x, 1.x, 0.x ] - title: APM AWS Lambda Extension prefix: lambda - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM AWS Lambda extension/Reference subject: APM @@ -740,9 +731,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Attacher prefix: attacher - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Attacher/Reference subject: APM @@ -756,9 +747,9 @@ contents: sections: - title: ECS Logging Overview prefix: overview - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/Guide @@ -775,9 +766,9 @@ contents: path: shared/attributes.asciidoc - title: ECS Logging Go (Logrus) Reference prefix: go-logrus - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/go-logrus/Guide @@ -797,9 +788,9 @@ contents: path: docs - title: ECS Logging Go (Zap) Reference prefix: go-zap - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/go-zap/Guide @@ -819,9 +810,9 @@ contents: path: docs - title: ECS Logging Go (zerolog) Reference prefix: go-zerolog - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/go-zerolog/Guide @@ -842,7 +833,7 @@ contents: - title: ECS Logging Java Reference prefix: java current: 1.x - branches: [ {main: master}, 1.x, 0.x ] + branches: [ 1.x, 0.x ] live: [ 1.x ] index: docs/index.asciidoc chunk: 1 @@ -862,13 +853,13 @@ contents: repo: ecs-logging path: docs map_branches: - 1.x: main - 0.x: main + 1.x: do-not-delete_legacy-docs + 0.x: do-not-delete_legacy-docs - title: ECS Logging .NET Reference prefix: dotnet - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/.NET/Guide @@ -888,9 +879,9 @@ contents: path: docs - title: ECS Logging Node.js Reference prefix: nodejs - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/nodejs/Guide @@ -910,9 +901,9 @@ contents: path: docs - title: ECS Logging Ruby Reference prefix: ruby - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/ruby/Guide @@ -932,9 +923,9 @@ contents: path: docs - title: ECS Logging PHP Reference prefix: php - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/php/Guide @@ -954,9 +945,9 @@ contents: path: docs - title: ECS Logging Python Reference prefix: python - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: master}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 1 tags: ECS-logging/python/Guide @@ -979,7 +970,7 @@ contents: - title: Elastic Security prefix: en/security current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1004,7 +995,7 @@ contents: prefix: en/starting-with-the-elasticsearch-platform-and-its-solutions current: *stackcurrent index: welcome-to-elastic/index.asciidoc - branches: [ {main: master}, 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, 7.17 ] + 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, 7.17 ] live: [ *stackcurrent ] chunk: 1 tags: Elastic/Starting with the Elasticsearch Platform and its Solutions @@ -1031,7 +1022,7 @@ contents: prefix: en/ecs # Please do not update current to 8.18 current: 8.17 - branches: [ {main: master}, 8.17, 8.16, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + branches: [ 8.17, 8.16, 8.11, 8.10, 8.9, 8.8, 8.7, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] live: [ 8.17, 1.12 ] index: docs/index.asciidoc chunk: 2 @@ -1048,7 +1039,7 @@ contents: - title: Java Client prefix: java-api-client current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1070,7 +1061,7 @@ contents: - title: JavaScript Client prefix: javascript-api current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x ] + 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, 6.x, 5.x ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1083,7 +1074,7 @@ contents: - title: Ruby Client prefix: ruby-api current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1096,7 +1087,7 @@ contents: - title: Go Client prefix: go-api current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: .doc/index.asciidoc chunk: 1 @@ -1109,7 +1100,7 @@ contents: - title: .NET Clients prefix: net-api current: *stackcurrent - branches: [ {main: master}, 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, 6.x, 5.x, 2.x, 1.x ] + 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, 6.x, 5.x, 2.x, 1.x ] live: *stacklive index: docs/index.asciidoc tags: Clients/.Net @@ -1125,7 +1116,7 @@ contents: - title: PHP Client prefix: php-api current: *stackcurrent - branches: [ {main: master}, 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] + 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.x, 6.x, 5.x, 2.x, 1.x, 0.4 ] live: *stacklive index: docs/index.asciidoc chunk: 1 @@ -1154,7 +1145,7 @@ contents: - title: Python Client prefix: python-api current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/guide/index.asciidoc chunk: 1 @@ -1166,9 +1157,9 @@ contents: path: docs/guide/ - title: eland prefix: eland - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [ {do-not-delete_legacy-docs: master} ] + live: [ do-not-delete_legacy-docs ] index: docs/guide/index.asciidoc chunk: 1 tags: Clients/eland @@ -1179,9 +1170,9 @@ contents: path: docs/guide - title: Rust Client prefix: rust-api - current: main - branches: [ {main: master}, 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 ] - live: [ main, 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 ] + current: 8.18 + 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 ] + live: [ 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 ] index: docs/index.asciidoc chunk: 1 tags: Clients/Rust @@ -1267,8 +1258,8 @@ contents: - title: Community Contributed Clients prefix: community - branches: [{main: master}] - current: main + branches: [{do-not-delete_legacy-docs: master}] + current: do-not-delete_legacy-docs index: docs/community-clients/index.asciidoc single: 1 tags: Clients/Community @@ -1280,7 +1271,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -1294,7 +1285,7 @@ contents: index: esre-docs/index.asciidoc private: 1 current: *stackcurrent - branches: [ {main: master}, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 8.8 ] + 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 ] live: [ 8.10 ] chunk: 1 tags: ESRE/Guide @@ -1308,9 +1299,9 @@ contents: path: shared/versions/stack/{version}.asciidoc - title: Glossary prefix: en/elastic-stack-glossary - current: main + current: do-not-delete_legacy-docs index: docs/en/glossary/index.asciidoc - branches: [ {main: master} ] + branches: [ {do-not-delete_legacy-docs: master} ] tags: Elastic Stack/Glossary subject: Elastic Stack sources: @@ -1327,7 +1318,7 @@ contents: prefix: en/elastic-stack current: 8.17 index: docs/en/install-upgrade/index.asciidoc - branches: [ {main: master}, 9.0, 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 ] + branches: [ 9.0, 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 ] live: [ 9.0, 8.17, 7.17] chunk: 1 tags: Elastic Stack/Installation and Upgrade @@ -1339,44 +1330,43 @@ contents: - repo: apm-server path: changelogs - exclude_branches: [ main, 9.0, 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.5, 8.4, 8.3, 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 ] + exclude_branches: [ 9.0, 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.5, 8.4, 8.3, 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 ] - repo: apm-server path: docs/ - exclude_branches: [ main, 9.0, 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 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 ] + exclude_branches: [ 9.0, 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 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 ] - repo: beats path: libbeat/docs - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: elasticsearch path: docs/ - exclude_branches: [ main, 9.0 ] + exclude_branches: [ 9.0 ] - repo: elasticsearch-hadoop path: docs/src/reference/asciidoc - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: security-docs path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: kibana path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: logstash path: docs/ - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: observability-docs path: docs/en/observability - exclude_branches: [ main, 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] + exclude_branches: [ 9.0, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9, 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 ] - repo: docs path: shared/versions/stack/{version}.asciidoc exclude_branches: [ 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/attributes.asciidoc @@ -1388,7 +1378,7 @@ contents: - title: Kibana Guide prefix: en/kibana current: *stackcurrent - branches: [ {main: master}, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + 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, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1403,7 +1393,7 @@ contents: repo: x-pack-kibana prefix: kibana-extra/x-pack-kibana path: docs/en - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + 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, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/versions/stack/{version}.asciidoc @@ -1415,11 +1405,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] + 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, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] + 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, 4.6, 4.5, 4.4, 4.3, 4.2, 3.0 ] - repo: kibana # git-archive requires `:(glob)` for ** to match no directory (in order to include `examples/README.asciidoc`) @@ -1437,7 +1427,7 @@ contents: prefix: en/machine-learning current: *stackcurrent index: docs/en/stack/ml/index.asciidoc - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Elastic Stack/Machine Learning @@ -1461,7 +1451,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless current: *stackcurrent - branches: [ {main: master}, 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] + 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] live: *stacklive index: docs/painless/index.asciidoc chunk: 1 @@ -1487,7 +1477,7 @@ contents: repo: elasticsearch current: *stackcurrent index: docs/plugins/index.asciidoc - branches: [ {main: master}, 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, 1.7 ] + 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, 1.7 ] live: *stacklive chunk: 2 tags: Elasticsearch/Plugins @@ -1503,7 +1493,7 @@ contents: - repo: elasticsearch path: buildSrc/src/main/resources/ - exclude_branches: [ main, 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + 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, 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - repo: elasticsearch path: build-tools-internal/src/main/resources/ @@ -1522,9 +1512,9 @@ contents: exclude_branches: [ 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, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - title: Reference Architectures prefix: en/reference-architectures - current: main + current: do-not-delete_legacy-docs index: docs/en/reference-architectures/index.asciidoc - branches: [ {main: master} ] + branches: [ {do-not-delete_legacy-docs: master} ] tags: Reference Architectures subject: Reference Architectures sources: @@ -1540,7 +1530,7 @@ contents: prefix: en/ingest current: *stackcurrent index: docs/en/ingest-arch/index.asciidoc - branches: [ {main: master}, 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] + branches: [ 8.x, 8.18, 8.17, 8.16, 8.15, 8.14, 8.13, 8.12, 8.11, 8.10, 8.9 ] live: [ *stackcurrent ] chunk: 1 tags: Ingest/Reference @@ -1555,7 +1545,7 @@ contents: - title: Fleet and Elastic Agent Guide prefix: en/fleet current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive index: docs/en/ingest-management/index.asciidoc chunk: 2 @@ -1578,11 +1568,11 @@ contents: # Required only for versions 7.12-7.15 repo: apm-server path: docs - exclude_branches: [ main, 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.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 ] + 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.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 ] - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ {main: master}, 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, 1.5 ] + 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, 1.5 ] live: *stacklive index: docs/index.x.asciidoc chunk: 1 @@ -1598,7 +1588,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ main, 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + 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, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ @@ -1613,11 +1603,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ main, 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + 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, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ main, 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] + 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 Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs @@ -1637,9 +1627,9 @@ contents: path: shared/attributes.asciidoc - title: Elastic Ingest Overview prefix: en/ingest-overview - current: main + current: do-not-delete_legacy-docs index: docs/en/ingest-guide/index.asciidoc - branches: [ {main: master} ] + branches: [ {do-not-delete_legacy-docs: master} ] tags: Ingest Overview subject: Ingest Overview sources: @@ -1653,7 +1643,7 @@ contents: prefix: en/beats/loggingplugin current: *stackcurrent index: x-pack/dockerlogbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + 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 ] chunk: 1 tags: Elastic Logging Plugin/Reference respect_edit_url_overrides: true @@ -1674,9 +1664,9 @@ contents: - title: Elastic Serverless Forwarder Guide prefix: en/esf index: docs/en/index.asciidoc - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [ {do-not-delete_legacy-docs: master} ] + live: [ do-not-delete_legacy-docs ] chunk: 2 tags: Cloud Native Ingest/Reference subject: cloud native ingest @@ -1692,9 +1682,9 @@ contents: path: shared/attributes.asciidoc - title: Integrations Developer Guide prefix: en/integrations-developer - current: main - branches: [ {main: master} ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [ {do-not-delete_legacy-docs: master} ] + live: [ do-not-delete_legacy-docs ] index: docs/en/integrations/index.asciidoc chunk: 1 tags: Integrations/Developer @@ -1712,14 +1702,18 @@ contents: - repo: package-spec path: versions + map_branches: + do-not-delete_legacy-docs: main - repo: package-spec path: spec + map_branches: + do-not-delete_legacy-docs: main - title: Auditbeat Reference prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Auditbeat/Reference @@ -1775,8 +1769,8 @@ contents: - title: Beats Developer Guide prefix: en/beats/devguide index: docs/devguide/index.asciidoc - current: main - branches: [ {main: master}, 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 ] + current: 8.18 + 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 ] live: *stacklive chunk: 1 tags: Devguide/Reference @@ -1807,7 +1801,7 @@ contents: prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Libbeat/Reference @@ -1832,7 +1826,7 @@ contents: prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Filebeat/Reference @@ -1887,7 +1881,7 @@ contents: prefix: en/beats/heartbeat current: *stackcurrent index: heartbeat/docs/index.asciidoc - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Heartbeat/Reference @@ -1934,7 +1928,7 @@ contents: prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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 ] + 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 ] live: *stacklive chunk: 1 tags: Metricbeat/Reference @@ -1991,7 +1985,7 @@ contents: prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1, 1.0.1] + 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, 1.3, 1.2, 1.1, 1.0.1] live: *stacklive chunk: 1 tags: Packetbeat/Reference @@ -2034,7 +2028,7 @@ contents: prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc current: *stackcurrent - branches: [ {main: master}, 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, 1.3, 1.2, 1.1 ] + 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, 1.3, 1.2, 1.1 ] live: *stacklive chunk: 1 tags: Winlogbeat/Reference @@ -2321,8 +2315,8 @@ contents: noindex: 1 prefix: en/elasticsearch/resiliency toc: 1 - branches: [{main: master}] - current: main + branches: [{do-not-delete_legacy-docs: master}] + current: do-not-delete_legacy-docs index: docs/resiliency/index.asciidoc single: 1 tags: Elasticsearch/Resiliency Status diff --git a/integtest/spec/all_books_broken_link_detection_spec.rb b/integtest/spec/all_books_broken_link_detection_spec.rb index 675e151d5e486..34a14a91865ed 100644 --- a/integtest/spec/all_books_broken_link_detection_spec.rb +++ b/integtest/spec/all_books_broken_link_detection_spec.rb @@ -151,72 +151,12 @@ '${ELASTIC_GITHUB}kibana/issues/new/choose', false include_examples 'all links are ok' end - describe 'when there is a broken Elasticsearch Guide link in Kibana' do - include_context 'there is a kibana link', true, - '${ELASTICSEARCH_DOCS}missing-page.html', true - include_examples 'there are broken links in kibana', - 'en/elasticsearch/reference/master/missing-page.html' - end - describe 'when there is a broken Kibana guide link' do - include_context 'there is a kibana link', true, - '${KIBANA_DOCS}not-a-kibana-page.html', true - include_examples 'there are broken links in kibana', - 'en/kibana/master/not-a-kibana-page.html' - end - describe 'when there is a broken ES Plugin link' do - include_context 'there is a kibana link', true, - '${PLUGIN_DOCS}not-valid-plugin.html', true - include_examples 'there are broken links in kibana', - 'en/elasticsearch/plugins/master/not-valid-plugin.html' - end - describe 'when there is a broken Fleet link' do - include_context 'there is a kibana link', true, - '${FLEET_DOCS}not-a-fleet-page.html', true - include_examples 'there are broken links in kibana', - 'en/fleet/master/not-a-fleet-page.html' - end describe 'when there is a broken APM link' do include_context 'there is a kibana link', true, '${APM_DOCS}not-an-apm-page.html', true include_examples 'there are broken links in kibana', 'en/apm/not-an-apm-page.html' end - describe 'when there is a broken Stack link' do - include_context 'there is a kibana link', true, - '${STACK_DOCS}not-a-stack-page.html', true - include_examples 'there are broken links in kibana', - 'en/elastic-stack/master/not-a-stack-page.html' - end - describe 'when there is a broken Security link' do - include_context 'there is a kibana link', true, - '${SECURITY_SOLUTION_DOCS}not-a-security-page.html', true - include_examples 'there are broken links in kibana', - 'en/security/master/not-a-security-page.html' - end - describe 'when there is a broken Stack Getting Started link' do - include_context 'there is a kibana link', true, - '${STACK_GETTING_STARTED}not-a-page.html', true - include_examples 'there are broken links in kibana', - 'en/elastic-stack-get-started/master/not-a-page.html' - end - describe 'when there is a broken App Search link' do - include_context 'there is a kibana link', true, - '${APP_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/app-search/master/not-a-search-page.html' - end - describe 'when there is a broken Enterprise Search link' do - include_context 'there is a kibana link', true, - '${ENTERPRISE_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/enterprise-search/master/not-a-search-page.html' - end - describe 'when there is a broken Workplace Search link' do - include_context 'there is a kibana link', true, - '${WORKPLACE_SEARCH_DOCS}not-a-search-page.html', true - include_examples 'there are broken links in kibana', - 'en/workplace-search/master/not-a-search-page.html' - end describe 'when using --keep_hash and --sub_dir together like a PR test' do describe 'when there is a broken link in one of the books being built' do convert_before do |src, dest| diff --git a/lib/ES/LinkCheck.pm b/lib/ES/LinkCheck.pm index 40d557d33e181..e0d96d29e31e0 100644 --- a/lib/ES/LinkCheck.pm +++ b/lib/ES/LinkCheck.pm @@ -63,12 +63,28 @@ sub check_source { while ( my ( $path, $fragment ) = $link_it->() ) { my $dest = $self->root->file($path); unless ( $self->_file_exists( $dest, $path ) ) { - $self->add_bad( $file_descr, $path ); + # Check if the path contains 'main' or 'master' + if ($path =~ /main|master/) { + # Warn (not error!) on broken main/master links + warn "Warning: $file_descr contains a broken link to $path\n"; + } else { + # Add non-main/master broken links to the list of bad links + # A list length greater than zero will result in a build failure + $self->add_bad( $file_descr, $path ); + } next; } next unless $fragment; unless ( $self->_fragment_exists( $dest, $path, $fragment ) ) { - $self->add_bad( $file_descr, "$path#$fragment" ); + # Check if the path contains 'main' or 'master' + if ($path =~ /main|master/) { + # Warn (not error!) on broken main/master links + warn "Warning: $file_descr contains a broken link to $path#$fragment\n"; + } else { + # Add non-main/master broken links to the list of bad links + # A list length greater than zero will result in a build failure + $self->add_bad( $file_descr, "$path#$fragment" ); + } } } } diff --git a/shared/versions/stack/do-not-delete_legacy-docs.asciidoc b/shared/versions/stack/do-not-delete_legacy-docs.asciidoc new file mode 100644 index 0000000000000..b74c3ca40cef6 --- /dev/null +++ b/shared/versions/stack/do-not-delete_legacy-docs.asciidoc @@ -0,0 +1 @@ +include::master.asciidoc[] \ No newline at end of file From 55ab9ac060d8053ef8c116fa217dd3078af5555c Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 25 Feb 2025 12:06:37 +0000 Subject: [PATCH 0964/1049] Bump the docs version to 7.17.28 (#3172) --- shared/versions/stack/7.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 1e9d98623d6ae..d22c0803ba942 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -1,12 +1,12 @@ -:version: 7.17.27 +:version: 7.17.28 //// bare_version never includes -alpha or -beta //// -:bare_version: 7.17.27 -:logstash_version: 7.17.27 -:elasticsearch_version: 7.17.27 -:kibana_version: 7.17.27 -:apm_server_version: 7.17.27 +:bare_version: 7.17.28 +:logstash_version: 7.17.28 +:elasticsearch_version: 7.17.28 +:kibana_version: 7.17.28 +:apm_server_version: 7.17.28 :branch: 7.17 :minor-version: 7.17 :major-version: 7.x From a20d2489036a9d7e646a7b07a43069c51fdd8dc4 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 26 Feb 2025 13:46:49 -0800 Subject: [PATCH 0965/1049] remove more master branches (#3176) Signed-off-by: bmorelli25 --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index e7fc6ffed0a4c..894c96c58b253 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2228,7 +2228,7 @@ contents: tags: Kubernetes/Reference subject: ECK current: 2.16 - branches: [ {main: master}, 2.16, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] + branches: [ 2.16, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ] index: docs/index.asciidoc chunk: 1 sources: @@ -2247,7 +2247,7 @@ contents: tags: CloudControl/Reference subject: ECCTL current: 1.14 - branches: [ master, 1.14, 1.13, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] + branches: [ 1.14, 1.13, 1.12, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ] index: docs/index.asciidoc chunk: 1 sources: From 61ac84a68a7c117b375ca4ad7e92eb81df22ba09 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Mon, 3 Mar 2025 16:20:16 -0600 Subject: [PATCH 0966/1049] Bumps Docs to 8.17.3 (#3175) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index f5aa4755dc95b..a17242cac2cc7 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.2 +:version: 8.17.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.2 -:logstash_version: 8.17.2 -:elasticsearch_version: 8.17.2 -:kibana_version: 8.17.2 -:apm_server_version: 8.17.2 +:bare_version: 8.17.3 +:logstash_version: 8.17.3 +:elasticsearch_version: 8.17.3 +:kibana_version: 8.17.3 +:apm_server_version: 8.17.3 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From 80faf8fed998824f7f48717dff80f85220a73a91 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Mon, 3 Mar 2025 17:45:48 -0600 Subject: [PATCH 0967/1049] Revert "Bumps Docs to 8.17.3 (#3175)" (#3179) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index a17242cac2cc7..f5aa4755dc95b 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.3 +:version: 8.17.2 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.3 -:logstash_version: 8.17.3 -:elasticsearch_version: 8.17.3 -:kibana_version: 8.17.3 -:apm_server_version: 8.17.3 +:bare_version: 8.17.2 +:logstash_version: 8.17.2 +:elasticsearch_version: 8.17.2 +:kibana_version: 8.17.2 +:apm_server_version: 8.17.2 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From 198a699bb1a51317bf34406aae1a984e94ffa077 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 4 Mar 2025 03:50:46 -0600 Subject: [PATCH 0968/1049] Bumps docs version to 8.17.3 (#3180) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index f5aa4755dc95b..a17242cac2cc7 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.2 +:version: 8.17.3 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.2 -:logstash_version: 8.17.2 -:elasticsearch_version: 8.17.2 -:kibana_version: 8.17.2 -:apm_server_version: 8.17.2 +:bare_version: 8.17.3 +:logstash_version: 8.17.3 +:elasticsearch_version: 8.17.3 +:kibana_version: 8.17.3 +:apm_server_version: 8.17.3 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From b5638b3146b3eb442bf5e9bbb18d797615b9fb89 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 4 Mar 2025 04:20:18 -0600 Subject: [PATCH 0969/1049] Bumps Docs to 8.16.5 (#3174) --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index 3d357a590182b..a8354dcb02cf6 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.4 +:version: 8.16.5 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.4 -:logstash_version: 8.16.4 -:elasticsearch_version: 8.16.4 -:kibana_version: 8.16.4 -:apm_server_version: 8.16.4 +:bare_version: 8.16.5 +:logstash_version: 8.16.5 +:elasticsearch_version: 8.16.5 +:kibana_version: 8.16.5 +:apm_server_version: 8.16.5 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 07f8793eb30f75538c2fe315b1551b1f718b504e Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 4 Mar 2025 11:49:47 -0600 Subject: [PATCH 0970/1049] change search-ui branch (#3181) --- conf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 894c96c58b253..cbc6383cd36cb 100644 --- a/conf.yaml +++ b/conf.yaml @@ -123,9 +123,9 @@ contents: sections: - title: Search UI prefix: en/search-ui - current: main - branches: [ main ] - live: [ main ] + current: do-not-delete_legacy-docs + branches: [{do-not-delete_legacy-docs: main}] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc chunk: 3 tags: Search UI/Guide From ca2f11c68a1ebde4868cb6e0195258dd7bb7f006 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 4 Mar 2025 16:17:21 -0600 Subject: [PATCH 0971/1049] test using glob in build_pr.sh (#3182) --- .buildkite/scripts/build_pr.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index b15ea94c0f602..681e9a4b2ee1b 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -64,13 +64,19 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) ;; - + + # test glob + "ecs-logging") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/**/*.asciidoc) + ;; + # repositories with a docs dir - "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") + "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) ;; - + # repositories with a docs dir, changelogs dir, and changelog "apm-server") git fetch origin "$GITHUB_PR_TARGET_BRANCH" From 2dbe477b2038e5b2f8a7bfef28bb48a02b45d39e Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Thu, 6 Mar 2025 14:05:59 +0100 Subject: [PATCH 0972/1049] Make ms-121 current for ESS/ECH (#3178) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index cbc6383cd36cb..0e881f80882f9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -83,7 +83,7 @@ variables: stackcurrent: &stackcurrent 8.17 stacklive: &stacklive [ 8.17, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-120 + cloudSaasCurrent: &cloudSaasCurrent ms-121 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From 937cd7202089253a8b221e9cd374cae74a83e8b0 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 7 Mar 2025 08:09:08 -0800 Subject: [PATCH 0973/1049] Add alias for temporary Installation and Upgrade Guide (#3184) --- doc_build_aliases.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index cc8816aea50f5..35bac73e41d1f 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -69,6 +69,9 @@ docbldlsvpr() { # Ingest Overview alias docbldingest='$GIT_HOME/docs/build_docs --doc $GIT_HOME/ingest-docs/docs/en/ingest-guide/index.asciidoc --chunk 1' +# Installation and Upgrade Guide 9.0 +alias docbldstk90='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/install-upgrade/index.asciidoc --chunk 1' + # Installation and Upgrade Guide 7.10 and later alias docbldstk='$GIT_HOME/docs/build_docs --doc $GIT_HOME/stack-docs/docs/en/install-upgrade/index.asciidoc --resource=$GIT_HOME/elasticsearch/docs/ --resource=$GIT_HOME/kibana/docs/ --resource=$GIT_HOME/beats/libbeat/docs/ --resource=$GIT_HOME/observability-docs/docs/en/observability --resource=$GIT_HOME/logstash/docs/ --resource=$GIT_HOME/elasticsearch-hadoop/docs/src/reference/asciidoc/ --resource=$GIT_HOME/security-docs/docs/ --chunk 1' From 4fac57912162e2c232684d2c3a316a84adc3e4e3 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 12 Mar 2025 09:36:52 -0500 Subject: [PATCH 0974/1049] update conf (#3185) --- conf.yaml | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/conf.yaml b/conf.yaml index 0e881f80882f9..0addf0cceb9af 100644 --- a/conf.yaml +++ b/conf.yaml @@ -530,9 +530,9 @@ contents: sections: - title: APM Android Agent prefix: android - current: 0.x - branches: [ 0.x ] - live: [ 0.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 0.x } ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Android Agent/Reference subject: APM @@ -546,9 +546,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Go Agent prefix: go - current: 2.x - branches: [ 2.x, 1.x, 0.5 ] - live: [ 2.x, 1.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 2.x }, 1.x, 0.5 ] + live: [ do-not-delete_legacy-docs, 1.x ] index: docs/index.asciidoc tags: APM Go Agent/Reference subject: APM @@ -563,9 +563,9 @@ contents: exclude_branches: [ 0.5 ] - title: APM iOS Agent prefix: swift - current: 1.x - branches: [ 1.x, 0.x ] - live: [ 1.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 1.x }, 0.x ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM iOS Agent/Reference subject: APM @@ -579,9 +579,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Java Agent prefix: java - current: 1.x - branches: [ 1.x, 0.7, 0.6 ] - live: [ 1.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 1.x }, 0.7, 0.6 ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Java Agent/Reference subject: APM @@ -602,9 +602,9 @@ contents: 1.x: do-not-delete_legacy-docs - title: APM .NET Agent prefix: dotnet - current: 1.x - branches: [ 1.x, 1.8 ] - live: [ 1.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 1.x }, 1.8 ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM .NET Agent/Reference subject: APM @@ -618,9 +618,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Node.js Agent prefix: nodejs - current: 4.x - branches: [ 4.x, 3.x, 2.x, 1.x ] - live: [ 4.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 4.x }, 3.x, 2.x, 1.x ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Node.js Agent/Reference subject: APM @@ -642,9 +642,9 @@ contents: 4.x: do-not-delete_legacy-docs - title: APM PHP Agent prefix: php - current: 1.x - branches: [ 1.x ] - live: [ 1.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 1.x } ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM PHP Agent/Reference subject: APM @@ -658,9 +658,9 @@ contents: path: CHANGELOG.asciidoc - title: APM Python Agent prefix: python - current: 6.x - branches: [ 6.x, 5.x, 4.x, 3.x, 2.x, 1.x ] - live: [ 6.x, 5.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 6.x }, 5.x, 4.x, 3.x, 2.x, 1.x ] + live: [ do-not-delete_legacy-docs, 5.x ] index: docs/index.asciidoc tags: APM Python Agent/Reference subject: APM @@ -681,9 +681,9 @@ contents: 6.x: do-not-delete_legacy-docs - title: APM Ruby Agent prefix: ruby - current: 4.x - branches: [ 4.x, 3.x, 2.x, 1.x ] - live: [ 4.x ] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 4.x }, 3.x, 2.x, 1.x ] + live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Ruby Agent/Reference subject: APM @@ -698,9 +698,9 @@ contents: exclude_branches: [ 1.x, 0.x ] - title: APM Real User Monitoring JavaScript Agent prefix: rum-js - current: 5.x - branches: [ 5.x, 4.x, 3.x, 2.x, 1.x, 0.x ] - live: [ 5.x, 4.x] + current: do-not-delete_legacy-docs + branches: [ { do-not-delete_legacy-docs: 5.x }, 4.x, 3.x, 2.x, 1.x, 0.x ] + live: [ do-not-delete_legacy-docs, 4.x] index: docs/index.asciidoc tags: APM Real User Monitoring JavaScript Agent/Reference subject: APM From 90883cba50b25d8936a3219ec98f992595a0c2d6 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 13 Mar 2025 11:14:27 -0500 Subject: [PATCH 0975/1049] Test wildcard pattern in `build_pr.sh` (part 2) (#3186) * try wrapping in quotes * Update .buildkite/scripts/build_pr.sh --- .buildkite/scripts/build_pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 681e9a4b2ee1b..38f8f97be4a2d 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -68,7 +68,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then # test glob "ecs-logging") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/**/*.asciidoc) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "**/*.asciidoc") ;; # repositories with a docs dir From faaedc1f53b6766fde09b16dd1b4b4a888b97ce6 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Mon, 24 Mar 2025 08:29:35 -0500 Subject: [PATCH 0976/1049] Bump to 9.0.0-rc1 (#3177) --- shared/versions/stack/9.0.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/stack/9.0.asciidoc b/shared/versions/stack/9.0.asciidoc index 565f378e55029..ea561edb83523 100644 --- a/shared/versions/stack/9.0.asciidoc +++ b/shared/versions/stack/9.0.asciidoc @@ -1,4 +1,4 @@ -:version: 9.0.0-beta1 +:version: 9.0.0-rc1 //// bare_version never includes -alpha or -beta //// From dc9f8bdfd7e04eb6574482cf48d7ffe0bed8ae8c Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Mon, 24 Mar 2025 17:00:02 +0100 Subject: [PATCH 0977/1049] Make ms-122 current (#3191) --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 0addf0cceb9af..abc4b8741cef6 100644 --- a/conf.yaml +++ b/conf.yaml @@ -83,7 +83,7 @@ variables: stackcurrent: &stackcurrent 8.17 stacklive: &stacklive [ 8.17, 7.17 ] - cloudSaasCurrent: &cloudSaasCurrent ms-121 + cloudSaasCurrent: &cloudSaasCurrent ms-122 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam ms-105: main From c35d40c81af31e4f8e1f002dd96ea5b06ae03fdf Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:58:41 +0000 Subject: [PATCH 0978/1049] Bump the docs version to 8.16.6 (#3188) --- shared/versions/stack/8.16.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc index a8354dcb02cf6..a7dfc886de234 100644 --- a/shared/versions/stack/8.16.asciidoc +++ b/shared/versions/stack/8.16.asciidoc @@ -1,12 +1,12 @@ -:version: 8.16.5 +:version: 8.16.6 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.16.5 -:logstash_version: 8.16.5 -:elasticsearch_version: 8.16.5 -:kibana_version: 8.16.5 -:apm_server_version: 8.16.5 +:bare_version: 8.16.6 +:logstash_version: 8.16.6 +:elasticsearch_version: 8.16.6 +:kibana_version: 8.16.6 +:apm_server_version: 8.16.6 // branch is 8.16 instead of 8.x for long-term linking purposes :branch: 8.16 :minor-version: 8.16 From 5230f6dea161fd70988862dc09f8eb96b69cde25 Mon Sep 17 00:00:00 2001 From: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com> Date: Tue, 25 Mar 2025 10:47:26 +0000 Subject: [PATCH 0979/1049] Bump the docs version to 8.17.4 (#3189) --- shared/versions/stack/8.17.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index a17242cac2cc7..354c2e331fdc5 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -1,12 +1,12 @@ -:version: 8.17.3 +:version: 8.17.4 //// bare_version never includes -alpha or -beta //// -:bare_version: 8.17.3 -:logstash_version: 8.17.3 -:elasticsearch_version: 8.17.3 -:kibana_version: 8.17.3 -:apm_server_version: 8.17.3 +:bare_version: 8.17.4 +:logstash_version: 8.17.4 +:elasticsearch_version: 8.17.4 +:kibana_version: 8.17.4 +:apm_server_version: 8.17.4 // branch is 8.17 instead of 8.x for long-term linking purposes :branch: 8.17 :minor-version: 8.17 From 51e480dbad5e1325e24c4237a34bfd1639827d8c Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 2 Apr 2025 11:28:27 -0500 Subject: [PATCH 0980/1049] bump apm android to 1.x (#3200) --- conf.yaml | 2 +- shared/versions/stack/8.17.asciidoc | 2 +- shared/versions/stack/8.18.asciidoc | 2 +- shared/versions/stack/8.x.asciidoc | 2 +- shared/versions/stack/9.0.asciidoc | 2 +- shared/versions/stack/master.asciidoc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.yaml b/conf.yaml index abc4b8741cef6..028326e3a7039 100644 --- a/conf.yaml +++ b/conf.yaml @@ -531,7 +531,7 @@ contents: - title: APM Android Agent prefix: android current: do-not-delete_legacy-docs - branches: [ { do-not-delete_legacy-docs: 0.x } ] + branches: [ { do-not-delete_legacy-docs: 1.x }, 0.x ] live: [ do-not-delete_legacy-docs ] index: docs/index.asciidoc tags: APM Android Agent/Reference diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc index 354c2e331fdc5..b719bf7a940a6 100644 --- a/shared/versions/stack/8.17.asciidoc +++ b/shared/versions/stack/8.17.asciidoc @@ -39,7 +39,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: 0.x +:apm-android-branch: 1.x :apm-go-branch: 2.x :apm-ios-branch: 1.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.18.asciidoc b/shared/versions/stack/8.18.asciidoc index ff16a54eb2366..b1d20d326ccfa 100644 --- a/shared/versions/stack/8.18.asciidoc +++ b/shared/versions/stack/8.18.asciidoc @@ -39,7 +39,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: 0.x +:apm-android-branch: 1.x :apm-go-branch: 2.x :apm-ios-branch: 1.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc index e17b36acb31bd..36fe0452f0b53 100644 --- a/shared/versions/stack/8.x.asciidoc +++ b/shared/versions/stack/8.x.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: 0.x +:apm-android-branch: 1.x :apm-go-branch: 2.x :apm-ios-branch: 1.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/9.0.asciidoc b/shared/versions/stack/9.0.asciidoc index ea561edb83523..d53ee19ccacb5 100644 --- a/shared/versions/stack/9.0.asciidoc +++ b/shared/versions/stack/9.0.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: 0.x +:apm-android-branch: 1.x :apm-go-branch: 2.x :apm-ios-branch: 1.x :apm-java-branch: 1.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index b2f64c47e4bc4..53c2e9e09a7a5 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -38,7 +38,7 @@ hide-xpack-tags defaults to "false" (they are shown unless set to "true") //// APM Agent versions //// -:apm-android-branch: 0.x +:apm-android-branch: 1.x :apm-go-branch: 2.x :apm-ios-branch: 1.x :apm-java-branch: 1.x From 4f4ccdd2f3095f0c65eb69f9a098b575f1f1f7d1 Mon Sep 17 00:00:00 2001 From: florent-leborgne Date: Mon, 7 Apr 2025 16:48:29 +0200 Subject: [PATCH 0981/1049] Change current for ECE to 3.8 (#3163) Co-authored-by: Colleen McGinnis --- conf.yaml | 6 +++++- shared/versions/ece/current.asciidoc | 2 +- shared/versions/ece/master.asciidoc | 6 +++--- shared/versions/ece/ms-119.asciidoc | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 shared/versions/ece/ms-119.asciidoc diff --git a/conf.yaml b/conf.yaml index 028326e3a7039..f2be38d7b9b17 100644 --- a/conf.yaml +++ b/conf.yaml @@ -86,6 +86,7 @@ variables: cloudSaasCurrent: &cloudSaasCurrent ms-122 mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam + ms-119: main ms-105: main ms-92: main ms-81: main @@ -2110,8 +2111,9 @@ contents: prefix: en/cloud-enterprise tags: CloudEnterprise/Reference subject: ECE - current: ms-105 + current: ms-119 live: + - ms-119 - ms-105 - ms-92 - ms-81 @@ -2121,6 +2123,7 @@ contents: - ms-70 - ms-69 branches: + - ms-119: 3.8 - ms-105: 3.7 - ms-92: 3.6 - ms-81: 3.5 @@ -2164,6 +2167,7 @@ contents: repo: cloud-assets path: docs map_branches: + ms-119: master ms-105: master ms-92: master ms-81: master diff --git a/shared/versions/ece/current.asciidoc b/shared/versions/ece/current.asciidoc index 1f2a117a7ced9..fdb37f79a11dc 100644 --- a/shared/versions/ece/current.asciidoc +++ b/shared/versions/ece/current.asciidoc @@ -1 +1 @@ -include::ms-105.asciidoc[] +include::ms-119.asciidoc[] diff --git a/shared/versions/ece/master.asciidoc b/shared/versions/ece/master.asciidoc index 2d9e14f069608..939e56a56ec86 100644 --- a/shared/versions/ece/master.asciidoc +++ b/shared/versions/ece/master.asciidoc @@ -1,3 +1,3 @@ -:ece-version: 3.8.1 -:ece-version-short: 3.8 -:ece-version-link: 3.8 \ No newline at end of file +:ece-version: 4.0.0 +:ece-version-short: 4.0 +:ece-version-link: 4.0 \ No newline at end of file diff --git a/shared/versions/ece/ms-119.asciidoc b/shared/versions/ece/ms-119.asciidoc new file mode 100644 index 0000000000000..01165dc70d0e2 --- /dev/null +++ b/shared/versions/ece/ms-119.asciidoc @@ -0,0 +1,3 @@ +:ece-version: 3.8.0 +:ece-version-short: 3.8 +:ece-version-link: 3.8 \ No newline at end of file From 7bd889ce358672c9d1c191d10a5e9e58a381f047 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 9 Apr 2025 11:32:43 -0500 Subject: [PATCH 0982/1049] Make `build_pr` script more specific (#3183) * only run docs pr preview job when an asciidoc file is edited * wrap paths using wildcards in quotes * apply suggestions from code review Co-authored-by: Brandon Morelli * Update .buildkite/scripts/build_pr.sh Co-authored-by: Brandon Morelli --------- Co-authored-by: Brandon Morelli --- .buildkite/scripts/build_pr.sh | 40 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh index 38f8f97be4a2d..506a5a6d0ee11 100755 --- a/.buildkite/scripts/build_pr.sh +++ b/.buildkite/scripts/build_pr.sh @@ -62,17 +62,17 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then # repositories with a docs dir and changelog "apm-aws-lambda" | "apm-agent-android" | "apm-agent-nodejs" | "apm-agent-python" | "apm-agent-ruby" | "apm-agent-rum-js" | "apm-agent-go" | "apm-agent-java" | "apm-agent-dotnet" | "apm-agent-php" | "apm-agent-ios") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" CHANGELOG.asciidoc) ;; - # test glob - "ecs-logging") + # repositories with a docs dir that are migrated to docs-builder + "apm-k8s-attacher" | "cloud" | "ecs-logging" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-ruby" | "elasticsearch-php"| "elasticsearch-rs" | "logstash" | "logstash-docs" | "security-docs") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "**/*.asciidoc") + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc") ;; - # repositories with a docs dir - "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype") + # repositories with a docs dir that are not migrated to docs-builder + "cloud-assets" | "elasticsearch-js-legacy" | "elasticsearch-perl" | "kibana-cn" | "sense" | "swiftype") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs) ;; @@ -80,7 +80,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then # repositories with a docs dir, changelogs dir, and changelog "apm-server") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" "./changelogs/**.asciidoc" CHANGELOG.asciidoc) ;; "docs-content") @@ -90,7 +90,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then "beats") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./auditbeat/**.asciidoc" ./**.asciidoc "./docs/**.asciidoc" "./filebeat/**.asciidoc" "./heartbeat/**.asciidoc" "./journalbeat/**.asciidoc" "./libbeat/docs/**.asciidoc" "./libbeat/outputs/*/docs/**.asciidoc" "./libbeat/processors/*/docs/**.asciidoc" "./metricbeat/**/*.asciidoc" "./packetbeat/**.asciidoc" "./topbeat/docs/**.asciidoc" "./winlogbeat/**.asciidoc" "./x-pack/auditbeat/**/*.asciidoc" "./x-pack/dockerlogbeat/docs/**.asciidoc" "./x-pack/filebeat/docs/**.asciidoc" "./x-pack/filebeat/processors/*/docs/**.asciidoc" "./x-pack/functionbeat/**.asciidoc" "./x-pack/libbeat/docs/**.asciidoc" "./x-pack/libbeat/processors/*/docs/**.asciidoc" "./x-pack/metricbeat/module/**.asciidoc") ;; "clients-team") @@ -103,14 +103,19 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/asciidoc) ;; - "eland" | "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby") + "eland") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/guide/**.asciidoc") + ;; + + "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide) ;; "elasticsearch") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client ./docs ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client "./docs/**.asciidoc" ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql) ;; "elasticsearch-hadoop") @@ -120,22 +125,22 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then "elasticsearch-java") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./java-client/src/test/java/co/elastic/clients/documentation) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs "./java-client/src/test/java/co/elastic/clients/documentation/**.asciidoc") ;; "elasticsearch-net") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./tests/Tests/Documentation) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" ./tests/Tests/Documentation) ;; "elasticsearch-py") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide ./docs/examples) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/guide/**.asciidoc" ./docs/examples) ;; "go-elasticsearch") git fetch origin "$GITHUB_PR_TARGET_BRANCH" - docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./.doc) + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./.doc/**.asciidoc") ;; "enterprise-search-pubs") @@ -148,11 +153,16 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./packages/enterprise-search/docs) ;; - "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash") + "x-pack-logstash") git fetch origin "$GITHUB_PR_TARGET_BRANCH" docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en) ;; + "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash") + git fetch origin "$GITHUB_PR_TARGET_BRANCH" + docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/en/**.asciidoc") + ;; + "observability-robots-playground") git fetch origin "$GITHUB_PR_TARGET_BRANCH" echo "This project is only for testing purposes" From a50dabdfdcf0f81895dba191fa4f4da51a41ef70 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 10 Apr 2025 10:55:53 -0700 Subject: [PATCH 0983/1049] Add Cloud Hosted Release Notes book (#3202) Co-authored-by: George Wallace --- conf.yaml | 19 ++++++++++++++++++- doc_build_aliases.sh | 3 +++ shared/attributes.asciidoc | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index f2be38d7b9b17..ee7856d0c57db 100644 --- a/conf.yaml +++ b/conf.yaml @@ -2271,7 +2271,24 @@ contents: - repo: terraform-provider-ec path: docs-elastic/ - + - title: Elastic Cloud Hosted Release Notes + prefix: en/cloud-hosted + tags: Cloud/Reference + subject: Elastic Cloud + current: master + branches: [ master ] + index: docs/saas/index.asciidoc + chunk: 1 + sources: + - + repo: cloud + path: docs/saas + - + repo: docs + path: shared/attributes.asciidoc + - + repo: docs + path: shared/versions/stack/current.asciidoc - title: Legacy Documentation sections: - title: Elastic Stack and Google Cloud's Anthos diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 35bac73e41d1f..d6dd690445bf5 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -143,6 +143,9 @@ alias docbldcr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/curator/docs/asciidoc/ # Cloud alias docbldec='$GIT_HOME/docs/build_docs --doc $GIT_HOME/cloud/docs/saas/index.asciidoc --resource=$GIT_HOME/cloud/docs/shared --chunk 1' +# Cloud Release Notes +alias docbldecrn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/cloud/docs/saas/index.asciidoc --chunk 1' + alias docbldess=docbldec # Cloud - Elastic Cloud Enterprise diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index a3fad915051e2..f1fbecb04cfc8 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -47,6 +47,7 @@ :docker-logging-ref: https://www.elastic.co/guide/en/beats/loggingplugin/{branch} :esf-ref: https://www.elastic.co/guide/en/esf/{esf_version} :kinesis-firehose-ref: https://www.elastic.co/guide/en/kinesis/{kinesis_version} +:ecctl-ref: https://www.elastic.co/guide/en/ecctl/current /////// Elastic-level pages /////// From bfaab26317978b0b1f946d31c84d020ac23cb278 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 15 Apr 2025 08:12:21 +0200 Subject: [PATCH 0984/1049] Add version mapping and bump to 8.18 (#3198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * inject test * try again * test * test again * test * test * ok * commit am speed up * Revert conf * ok * Try without file read * test * fix * test * fix * test * ok * Remove /guide prefix * Refactor and cleanup * Revert nav.rb * Update v3-mapping.json (not finalized yet) * Refactor to satisfy rubocop * bumping current docs to 8.18 * Update stacklive * remove 404ing redirects * Fix styling * update with FINAL redirects * fix 404 * Adjust wording * Add old elastic docs experience warning * Remove 404ing beats links * css updates for landing page and text update * Fix z-index * Increase font-weight for h2 and h3 tags * update landing page to point to 8.18, etc. * fix * Move heading * Update documentation links to version 8.18 * one row --------- Co-authored-by: Brandon Morelli Co-authored-by: Edu González de la Herrán <25320357+eedugon@users.noreply.github.com> Co-authored-by: Colleen McGinnis --- conf.yaml | 6 +- extra/docs_landing.html | 407 +- .../asciidoctor/lib/chunker/extension.rb | 10 + .../asciidoctor/lib/chunker/url_to_v3.rb | 61 + .../asciidoctor/lib/chunker/v3-mapping.json | 18262 ++++++++++++++++ resources/web/style/page_header.pcss | 12 +- shared/versions/stack/8.17.asciidoc | 2 +- shared/versions/stack/current.asciidoc | 2 +- 8 files changed, 18646 insertions(+), 116 deletions(-) create mode 100644 resources/asciidoctor/lib/chunker/url_to_v3.rb create mode 100644 resources/asciidoctor/lib/chunker/v3-mapping.json diff --git a/conf.yaml b/conf.yaml index ee7856d0c57db..20facd44b424f 100644 --- a/conf.yaml +++ b/conf.yaml @@ -80,8 +80,8 @@ contents_title: Elastic documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 8.17 - stacklive: &stacklive [ 8.17, 7.17 ] + stackcurrent: &stackcurrent 8.18 + stacklive: &stacklive [ 8.18 ] cloudSaasCurrent: &cloudSaasCurrent ms-122 @@ -2289,7 +2289,7 @@ contents: - repo: docs path: shared/versions/stack/current.asciidoc - - title: Legacy Documentation + - title: Archive sections: - title: Elastic Stack and Google Cloud's Anthos noindex: 1 diff --git a/extra/docs_landing.html b/extra/docs_landing.html index 2a4655b81196a..a19bf90b7177a 100644 --- a/extra/docs_landing.html +++ b/extra/docs_landing.html @@ -79,14 +79,23 @@ text-align: center; } + #guide #viewall h2 { + font-size: 40px !important; + font-weight: 600 !important; + margin: 16px 0 !important; + } + #guide h2 { - font-size: 40px; - font-weight: 500; - margin: 16px 0; + text-align: left; + font-size: 20px; + margin: 16px 16px; + font-weight: 600; } #guide h3 { - margin: 0; - font-weight: 400; + text-align: left; + font-size: 20px; + margin: 16px 16px; + font-weight: 600; } #guide .patterns:before { @@ -416,8 +425,30 @@ margin: 0 auto 50px; border: none; } + + .old-elastic-experience-warning { + padding: 1em; + margin-bottom: 1em; + border: 1px solid #ccc; + background: #FFFFD2; + color: black; + position: relative; + z-index: 1; + } + + div#content { + display: none; + } + + div#manual-content { + margin: 50px 0 60px; + } +
          + You are viewing the previous version of Elastic docs. To view the current docs, go to elastic.co/docs. +
          +
          @@ -484,7 +506,7 @@

          Observability

          Monitor applications and systems with Elastic Observability.

          - + Get started @@ -493,7 +515,7 @@

          - + View Observability docs @@ -502,15 +524,6 @@

          - - - View serverless docs - - - - - -

          @@ -522,7 +535,7 @@

          Security

          Detect, investigate, and respond to threats with Elastic Security.

          - + Get started @@ -531,7 +544,7 @@

          - + View Security docs @@ -540,15 +553,6 @@

          - - - View serverless docs - - - - - -

          @@ -557,7 +561,7 @@