Merge branch 'master' into fix/reporting-viewport-regression

Author: kibanamachine

.github/CODEOWNERS

@@ -138,6 +138,10 @@
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/public/alert_types/geo_threshold @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
 #CC# /src/plugins/maps_oss/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis

dev_docs/api_welcome.mdx

@@ -0,0 +1,14 @@
+---
+id: kibDevDocsApiWelcome
+slug: /kibana-dev-docs/api-welcome
+title: Welcome
+summary: The home of automatically generated plugin API documentation using extracted TSDocs
+date: 2021-01-02
+tags: ['kibana','dev', 'contributor', 'api docs']
+---
+
+Welcome to Kibana's plugin API documentation. As a plugin developer, this is where you can 
+learn the details of every service you can take advantage of to help you build awe-inspiring creative solutions and applications!
+
+If you have any questions or issues, please reach out to the Kibana platform team or create an issue [here](https://github.com/elastic/kibana/issues).
+

dev_docs/dev_welcome.mdx

@@ -0,0 +1,17 @@
+---
+id: kibDevDocsWelcome
+slug: /kibana-dev-docs/welcome
+title: Welcome
+summary: Build custom solutions and applications on top of Kibana.
+date: 2021-01-02
+tags: ['kibana','dev', 'contributor']
+---
+
+Welcome to Kibana's plugin developer documentation!
+
+Did you know that the vast majority of functionality built inside of Kibana is a plugin? A handful of core services hold the system together,
+but it's our vast system of plugin developers that provide the amazing, out of the box, functionality you can use when building your own set of
+custom utilities and applications.
+
+Browse the `Services` section to view all the plugins that offer functionality you can take advantage of, or check out the
+`API documentation` to dig into the nitty gritty details of every public plugin API.

docs/apm/deployment-annotations.asciidoc

@@ -6,6 +6,9 @@
 <titleabbrev>Track deployments with annotations</titleabbrev>
 ++++
 
+[role="screenshot"]
+image::apm/images/apm-transaction-annotation.png[Example view of transactions annotation in the APM app in Kibana]
+
 For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
 This feature enables you to easily determine if your deployment has increased response times for an end-user,
 or if the memory/CPU footprint of your application has changed.
@@ -43,6 +46,3 @@ See the <<apm-annotation-api,annotation API>> reference for more information.
 
 
 NOTE: If custom annotations have been created for the selected time period, any derived annotations, i.e., those created automatically when `service.version` changes, will not be shown.
-
-[role="screenshot"]
-image::apm/images/apm-transaction-annotation.png[Example view of transactions annotation in the APM app in Kibana]

docs/apm/errors.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[errors]]
-=== Errors overview
+=== Errors
 
 TIP: {apm-overview-ref-v}/errors.html[Errors] are groups of exceptions with a similar exception or log message.
 

docs/apm/getting-started.asciidoc

@@ -6,26 +6,20 @@
 <titleabbrev>Get started</titleabbrev>
 ++++
 
-Elastic APM captures different types of information from within instrumented applications:
-
-* *Spans* contain information about the execution of a specific code path.
-They measure from the start to end of an activity,
-and they can have a parent/child relationship with other spans.
-* *Transactions* are a special kind of span;
-they are the first span for a particular service and have extra metadata associated with them.
-As an example, a transaction could be a request to your server, a batch job, or a custom transaction type.
-*Traces* link together related transactions to show an end-to-end performance of how a request was served and which services were part of it.
-* *Errors* contain information about the original exception that occurred or about a log created when the exception occurred.
-
-Curated charts and tables display the different types of APM data, which allows you to compare and debug your applications easily.
+For a quick, high-level overview of the health and performance of your application,
+start with:
 
 * <<services>>
 * <<traces>>
+* <<service-maps>>
+
+Notice something awry? Select a service or trace and dive deeper with:
+
+* <<service-overview>>
 * <<transactions>>
 * <<spans>>
 * <<errors>>
 * <<metrics>>
-* <<service-maps>>
 
 TIP: Want to learn more about the Elastic APM ecosystem?
 See the {apm-get-started-ref}/overview.html[APM Overview].
@@ -34,12 +28,14 @@ include::services.asciidoc[]
 
 include::traces.asciidoc[]
 
+include::service-maps.asciidoc[]
+
+include::service-overview.asciidoc[]
+
 include::transactions.asciidoc[]
 
 include::spans.asciidoc[]
 
 include::errors.asciidoc[]
 
 include::metrics.asciidoc[]
-
-include::service-maps.asciidoc[]