Merge remote-tracking branch 'upstream/master' into feature/apm-server-neutral-naming

* upstream/master:
  [DOCS] 8.0.0-rc2 version attributes. (elastic#2345)
  Rename master to main for Beats project (elastic#2337)
  Fixes .net book generation. (elastic#2367)
  Add main branch to elasticsearch-net repo to docs build. (elastic#2196)
  Update attributes.asciidoc (elastic#2365)
  update stack ecs pointer
  adding in new ecs options per the 8.2 sff
  Note that the full path is required for local doc build (elastic#2364)
  Bump current version to 7.17 (elastic#2333)
  moves old file back to bottom
  add new path for kibana links check

Author: v1v

README.asciidoc

@@ -70,7 +70,7 @@ generate the HTML version of the docs:
 [source,bash]
 ----------------------------
 cd path/to/your/repo
-~/path/to/docs/repo/build_docs --doc path/to/index.asciidoc
+~/path/to/docs/repo/build_docs --doc /full/path/to/index.asciidoc
 ----------------------------
 
 Each Elastic project may need its own documentation book build command.

build_docs.pl

@@ -422,6 +422,9 @@ sub check_kibana_links {
         say "  Branch: $branch, Version: $version";
         my $links_file;
         my $source = eval {
+            $links_file = "packages/kbn-doc-links/src/get_doc_links.ts";
+            $repo->show_file( $link_check_name, $branch, $links_file );
+        } || eval {
             $links_file = $src_path . ".js";
             $repo->show_file( $link_check_name, $branch, $links_file );
         } || eval {

conf.yaml

@@ -71,10 +71,10 @@ contents_title:     Elastic Stack and Product Documentation
 #   <key>: &<variable> <value>
 # The keys don't really matter, but by convention the are the same as the variable.
 variables:
-  stackcurrent: &stackcurrent 7.16
-  stacklive: &stacklive [ master, 8.0, 7.17, 7.16, 6.8 ]
+  stackcurrent: &stackcurrent 7.17
+  stacklive: &stacklive [ master, 8.0, 7.17, 6.8 ]
 
-  stacklivemain: &stacklivemain [ main, 8.0, 7.17, 7.16, 6.8 ]
+  stacklivemain: &stacklivemain [ main, 8.0, 7.17, 6.8 ]
 
   cloudSaasCurrent: &cloudSaasCurrent ms-68
 
@@ -156,7 +156,6 @@ contents:
                 repo:   beats
                 path:   libbeat/docs
                 exclude_branches:   [ 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ]
-                map_branches: *mapMainToMaster
               -
                 repo:   elasticsearch
                 path:   docs/
@@ -256,8 +255,8 @@ contents:
           - title:      Elastic Common Schema (ECS) Reference
             prefix:     en/ecs
             current:    1.12
-            branches:   [  {main: master}, 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.0, 1.12 ]
+            branches:   [  {main: master}, 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.2, 8.1, 8.0, 1.12 ]
             index:      docs/index.asciidoc
             chunk:      2
             tags:       Elastic Common Schema (ECS)/Reference
@@ -354,6 +353,7 @@ contents:
                 repo:   elasticsearch-net
                 path:   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 ]
+                map_branches: *mapMasterToMain
               -
                 alternatives: { source_lang: console, alternative_lang: python }
                 repo:   elasticsearch-py
@@ -542,10 +542,11 @@ contents:
                     path:   .doc/
               - title:      .NET Clients
                 prefix:     net-api
+                # The elasticsearch-net repo only keeps .x branches. Do not
+                # bump these with the rest of the stack.
                 current:    7.16
-                # need to keep 7.x until all tooling is switched over to 7.16
-                branches:   [ master, 8.0, 7.17, 7.16, 7.x, 6.x, 5.x, 2.x, 1.x ]
-                live:       [ master, 8.0, 7.17, 7.16, 7.x ]
+                branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.x, 6.x, 5.x, 2.x, 1.x ]
+                live:       [ main, 8.0, 7.17, 7.16, 7.x ]
                 index:      docs/index.asciidoc
                 tags:       Clients/.Net
                 subject:    Clients
@@ -653,9 +654,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:      Java Transport Client (deprecated)
                 prefix:     java-api
-                current:    *stackcurrent
+                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:       *stacklive
+                live:       [7.17, 6.8]
                 index:      docs/java-api/index.asciidoc
                 tags:       Clients/Java
                 subject:    Clients
@@ -1200,7 +1201,6 @@ contents:
                 repo:   beats
                 path:   libbeat/docs
                 exclude_branches:   [ 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ]
-                map_branches: *mapMainToMaster
               -
                 repo:   docs
                 path:   shared/versions/stack/{version}.asciidoc
@@ -1794,8 +1794,8 @@ contents:
             prefix:     en/beats/libbeat
             index:      libbeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
+            live:       *stacklivemain
             chunk:      1
             tags:       Libbeat/Reference
             subject:    libbeat
@@ -1819,8 +1819,8 @@ contents:
             prefix:     en/beats/auditbeat
             index:      auditbeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Auditbeat/Reference
             respect_edit_url_overrides: true
@@ -1872,8 +1872,8 @@ contents:
             prefix:     en/beats/filebeat
             index:      filebeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
+            live:       *stacklivemain
             chunk:      1
             tags:       Filebeat/Reference
             respect_edit_url_overrides: true
@@ -1927,8 +1927,8 @@ contents:
             prefix:     en/beats/functionbeat
             current:    *stackcurrent
             index:      x-pack/functionbeat/docs/index.asciidoc
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Functionbeat/Reference
             respect_edit_url_overrides: true
@@ -1976,8 +1976,8 @@ contents:
             prefix:     en/beats/heartbeat
             current:    *stackcurrent
             index:      heartbeat/docs/index.asciidoc
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2 ]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Heartbeat/Reference
             respect_edit_url_overrides: true
@@ -2023,8 +2023,8 @@ contents:
             prefix:     en/beats/metricbeat
             index:      metricbeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Metricbeat/Reference
             respect_edit_url_overrides: true
@@ -2080,8 +2080,8 @@ contents:
             prefix:     en/beats/packetbeat
             index:      packetbeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1]
+            live:       *stacklivemain
             chunk:      1
             tags:       Packetbeat/Reference
             respect_edit_url_overrides: true
@@ -2123,8 +2123,8 @@ contents:
             prefix:     en/beats/winlogbeat
             index:      winlogbeat/docs/index.asciidoc
             current:    *stackcurrent
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1 ]
-            live:       *stacklive
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Winlogbeat/Reference
             respect_edit_url_overrides: true
@@ -2165,9 +2165,9 @@ contents:
           - title:      Beats Developer Guide
             prefix:     en/beats/devguide
             index:      docs/devguide/index.asciidoc
-            current:    master
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
-            live:       *stacklive
+            current:    main
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
+            live:       *stacklivemain
             chunk:      1
             tags:       Devguide/Reference
             subject:    Beats
@@ -2197,7 +2197,7 @@ contents:
             prefix:     en/beats/loggingplugin
             current:    *stackcurrent
             index:      x-pack/dockerlogbeat/docs/index.asciidoc
-            branches:   [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6 ]
+            branches:   [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6 ]
             chunk:      1
             tags:       Elastic Logging Plugin/Reference
             respect_edit_url_overrides: true

shared/attributes.asciidoc

@@ -1,7 +1,7 @@
 :ref:                  https://www.elastic.co/guide/en/elasticsearch/reference/{branch}
 :ref-bare:             https://www.elastic.co/guide/en/elasticsearch/reference
 :ref-80:               https://www.elastic.co/guide/en/elasticsearch/reference/master
-:ref-7x:               https://www.elastic.co/guide/en/elasticsearch/reference/7.16
+:ref-7x:               https://www.elastic.co/guide/en/elasticsearch/reference/7.17
 :ref-70:               https://www.elastic.co/guide/en/elasticsearch/reference/7.0
 :ref-60:               https://www.elastic.co/guide/en/elasticsearch/reference/6.0
 :ref-64:               https://www.elastic.co/guide/en/elasticsearch/reference/6.4
@@ -61,7 +61,7 @@ Elastic-level pages
 :defguide:             https://www.elastic.co/guide/en/elasticsearch/guide/2.x
 :painless:             https://www.elastic.co/guide/en/elasticsearch/painless/{branch}
 :plugins:              https://www.elastic.co/guide/en/elasticsearch/plugins/{branch}
-:plugins-7x:           https://www.elastic.co/guide/en/elasticsearch/plugins/7.16
+:plugins-7x:           https://www.elastic.co/guide/en/elasticsearch/plugins/7.17
 :plugins-6x:           https://www.elastic.co/guide/en/elasticsearch/plugins/6.8
 :glossary:             https://www.elastic.co/guide/en/elastic-stack-glossary/current
 :upgrade_guide:        https://www.elastic.co/products/upgrade_guide
@@ -427,12 +427,3 @@ 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}
-///////
-Temporarily reroute APM Agent links to the new APM documentation book
-///////
-ifeval::["{branch}"=="7.16"]
-:apm-server-ref:       {apm-guide-ref}
-:apm-server-ref-v:     {apm-guide-ref}
-:apm-overview-ref-v:   {apm-guide-ref}
-:apm-get-started-ref:  {apm-guide-ref}
-endif::[]

shared/versions/stack/7.16.asciidoc

@@ -22,7 +22,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")

shared/versions/stack/7.17.asciidoc

@@ -17,12 +17,12 @@ bare_version never includes -alpha or -beta
 //////////
 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")

shared/versions/stack/8.0.asciidoc

@@ -1,12 +1,12 @@
-:version:                8.0.0-rc1
+:version:                8.0.0-rc2
 ////
 bare_version never includes -alpha or -beta
 ////
 :bare_version:           8.0.0
-:logstash_version:       8.0.0-rc1
-:elasticsearch_version:  8.0.0-rc1
-:kibana_version:         8.0.0-rc1
-:apm_server_version:     8.0.0-rc1
+:logstash_version:       8.0.0-rc2
+:elasticsearch_version:  8.0.0-rc2
+:kibana_version:         8.0.0-rc2
+:apm_server_version:     8.0.0-rc2
 :branch:                 8.0
 :minor-version:          8.0
 :major-version:          8.x

shared/versions/stack/current.asciidoc

@@ -1 +1 @@
-include::7.16.asciidoc[]
+include::7.17.asciidoc[]

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.1
+:ecs_version:            8.2
 
 //////////
 release-state can be: released | prerelease | unreleased