Align with beats, use deprecated.

docs/configuring.asciidoc

@@ -12,8 +12,8 @@ The following topics describe how to configure APM Server:
 * <<configuration-ssl>>
 * <<configuration-template>>
 * <<configuration-logging>>
-* <<setup-kibana-endpoint, Set up the Kibana endpoint (deprecated)>>
-* <<configuration-dashboards, Load the Kibana dashboards (deprecated)>>
+* <<setup-kibana-endpoint>>
+* <<configuration-dashboards>>
 * <<configuration-rum>>
 * <<using-environ-vars>>
 * <<configuration-path>>

docs/copied-from-beats/command-reference.asciidoc

@@ -34,8 +34,7 @@ endif::[]
 
 ifdef::deprecate_dashboard_loading[]
 
-:setup-command-short-desc: Sets up the initial environment,
-including the ES index template and Kibana dashboards (deprecated).
+:setup-command-short-desc: Sets up the initial environment, including the ES index template and Kibana dashboards (deprecated).
 
 endif::[]
 
@@ -409,25 +408,21 @@ the end of the file is reached. By default harvesters are closed after
 
 endif::[]
 
-ifndef::deprecate_dashboard_loading[]
 *`--setup`*::
-endif::[]
-
 ifdef::deprecate_dashboard_loading[]
-*`--setup (deprecated)`*::
+deprecated[{deprecate_dashboard_loading}]
 endif::[]
-
++
 ifdef::has_ml_jobs[]
 Loads the initial setup, including Elasticsearch template, Kibana index pattern,
 Kibana dashboards and Machine learning jobs.
 endif::[]
-
 ifndef::has_ml_jobs[]
 Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards.
 endif::[]
-
 If you want to use the command without running {beatname_uc}, use the <<setup-command,`setup`>> command instead.
 
+
 ifeval::["{beatname_lc}"=="metricbeat"]
 
 *`--system.hostfs MOUNT_POINT`*::
@@ -465,15 +460,12 @@ Or:
 [[setup-command]]
 ==== `setup` command
 
-{setup-command-short-desc}.
+{setup-command-short-desc}
 
 * The index template ensures that fields are mapped correctly in Elasticsearch.
 
 * The Kibana dashboards make it easier for you to visualize {beatname_uc} data
 in Kibana.
-ifdef::deprecate_dashboard_loading[]
-(deprecated)
-endif::[]
 
 ifdef::has_ml_jobs[]
 * The machine learning jobs contain the configuration information and metadata
@@ -502,7 +494,10 @@ in the _Beats Developer Guide_.
 endif::[]
 
 ifdef::deprecate_dashboard_loading[]
-*`--dashboards` (deprecated)*::
+*`--dashboards`*::
+
+deprecated[{deprecate_dashboard_loading}]
++
 Sets up the Kibana dashboards only.
 endif::[]
 

docs/copied-from-beats/dashboardsconfig.asciidoc

@@ -10,12 +10,11 @@
 //////////////////////////////////////////////////////////////////////////
 
 [[configuration-dashboards]]
-ifndef::deprecate_dashboard_loading[]
 == Load the Kibana dashboards
-endif::[]
-
 ifdef::deprecate_dashboard_loading[]
-== Load the Kibana dashboards (deprecated)
+
+deprecated[{deprecate_dashboard_loading}]
+
 endif::[]
 
 {beatname_uc} comes packaged with example Kibana dashboards, visualizations,

docs/copied-from-beats/outputconfig.asciidoc

@@ -218,17 +218,12 @@ The index name to write events to. The default is
 need to configure the `setup.template.name` and `setup.template.pattern` options
 (see <<configuration-template>>).
 
-ifndef::deprecate_dashboard_loading[]
-
 If you are using the pre-built Kibana dashboards,
 you also need to set the `setup.dashboards.index` option (see <<configuration-dashboards>>).
 
-endif::[]
-
 ifdef::deprecate_dashboard_loading[]
 
-If you are using the pre-built Kibana dashboards,
-you also need to set the index pattern properly when loading the dashboards via the Kibana UI.
+deprecated[{deprecate_dashboard_loading}]
 
 endif::[]
 

docs/copied-from-beats/shared-kibana-config.asciidoc

@@ -10,13 +10,12 @@
 //////////////////////////////////////////////////////////////////////////
 
 [[setup-kibana-endpoint]]
-ifndef::deprecate_dashboard_loading[]
 == Set up the Kibana endpoint
-endif::[]
 ifdef::deprecate_dashboard_loading[]
-== Set up the Kibana endpoint (deprecated)
-endif::[]
 
+deprecated[{deprecate_dashboard_loading}]
+
+endif::[]
 
 ifeval::["{beatname_lc}" == "apm-server"]
 The Kibana dashboards are loaded into Kibana via the Kibana API.

docs/dashboards.asciidoc

@@ -3,10 +3,10 @@
 
 From APM Server and Kibana 6.4 on you can load dashboards directly via the Kibana UI.
 
-NOTE: Loading index pattern and dashboards through the APM Server is deprecated.
- It is recommended to use the Kibana UI instead.
+==== Setup via APM Server
+
+deprecated[{deprecate_dashboard_loading}]
 
-==== Setup via APM Server (deprecated)
 Loading via APM Server requires a <<setup-kibana-endpoint,Kibana endpoint configuration>>. 
 If you are accessing a secured Kibana instance, make sure you've configured credentials.
 

docs/index.asciidoc

@@ -17,7 +17,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :logstashdoc: https://www.elastic.co/guide/en/logstash/{doc-branch}
 :elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}
 :securitydoc: https://www.elastic.co/guide/en/elastic-stack-overview/{doc-branch}
-:deprecate_dashboard_loading: true 
+:deprecate_dashboard_loading: 6.4.0 
 
 ifdef::env-github[]
 NOTE: For the best reading experience,