Merge branch 'master' into esql_main

Author: ChrisHegarty

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

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
 //////////
@@ -137,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
@@ -172,6 +213,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 +463,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

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

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
 
 //////////
@@ -61,3 +61,8 @@ ECS Logging
 :ecs-logging-php:       master
 :ecs-logging-python:    master
 :ecs-logging-ruby:      master
+
+////
+Synthetics
+////
+:synthetics_version: v1.3.0