Merge branch 'master' into feature/component_template_details

Jenkinsfile

@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
-  ciStats.trackBuild {
-    githubPr.withDefaultPrComments {
+  githubPr.withDefaultPrComments {
+    ciStats.trackBuild {
       catchError {
         retryable.enable()
         parallel([
@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
         ])
       }
     }
+  }
 
-    if (params.NOTIFY_ON_FAILURE) {
-      slackNotifications.onFailure()
-      kibanaPipeline.sendMail()
-    }
+  if (params.NOTIFY_ON_FAILURE) {
+    slackNotifications.onFailure()
+    kibanaPipeline.sendMail()
   }
 }

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md

@@ -9,19 +9,13 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache, fieldFormats: FieldFormatsStartCommon, onNotification: OnNotification, onError: OnError);
+constructor(id: string | undefined, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  id | <code>string &#124; undefined</code> |  |
-|  getConfig | <code>any</code> |  |
-|  savedObjectsClient | <code>SavedObjectsClientContract</code> |  |
-|  apiClient | <code>IIndexPatternsApiClient</code> |  |
-|  patternCache | <code>PatternCache</code> |  |
-|  fieldFormats | <code>FieldFormatsStartCommon</code> |  |
-|  onNotification | <code>OnNotification</code> |  |
-|  onError | <code>OnError</code> |  |
+|  { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, } | <code>IndexPatternDeps</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(id, getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError)](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)(id, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 

docs/infrastructure/index.asciidoc

@@ -1,10 +1,9 @@
+[chapter]
 [role="xpack"]
 [[xpack-infra]]
 = Metrics
 
-[partintro]
---
-The Metrics app enables you to monitor your infrastructure metrics and identify problems in real time.
+The {metrics-app} in {kib} enables you to monitor your infrastructure metrics and identify problems in real time.
 You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services.
 Then you can drill down to view more detailed metrics or other information for that component.
 
@@ -23,14 +22,11 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
 
 * Create alerts based on metric thresholds for one or more components.
 
-To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
-
 [role="screenshot"]
 image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana]
 
---
+[float]
+=== Get started
+
+To get started with Metrics, refer to {metrics-guide}/install-metrics-monitoring.html[Install Metrics].
 
-include::getting-started.asciidoc[]
-include::infra-ui.asciidoc[]
-include::view-metrics.asciidoc[]
-include::metrics-explorer.asciidoc[]

docs/ingest_manager/ingest-manager.asciidoc

@@ -0,0 +1,27 @@
+[chapter]
+[role="xpack"]
+[[ingest-manager]]
+= {ingest-manager}
+
+experimental[]
+
+{ingest-manager} in {kib} enables you to add and manage integrations for popular
+services and platforms, as well as manage {elastic-agent} installations in
+standalone or {fleet} mode.
+
+Standalone mode requires you to manually configure and manage the agent locally.
+
+{fleet} mode offers several advantages:
+
+* A central place to configure and monitor your {agent}s.
+* An overview of the data ingest in your {es} cluster.
+* Multiple integrations to collect and transform data.
+
+[role="screenshot"]
+image::ingest_manager/images/ingest-manager-start.png[{ingest-manager} app in {kib}]
+
+[float]
+== Get started
+
+To get started with {ingest-management}, refer to the
+{ingest-guide}/index.html[Ingest Management Guide].

docs/management/upgrade-assistant/index.asciidoc

@@ -2,14 +2,16 @@
 [[upgrade-assistant]]
 == Upgrade Assistant
 
-The Upgrade Assistant helps you prepare for your upgrade to {es} 9.0. 
-To access the assistant, open the menu, then go to *Stack Management > {es} > 9.0 Upgrade Assistant*. 
+The Upgrade Assistant helps you prepare for your upgrade to the next major {es} version. 
+For example, if you are using 6.8, the Upgrade Assistant helps you to upgrade to 7.0. 
+To access the assistant, open the menu, then go to *Stack Management > {es} > Upgrade Assistant*.
 
 The assistant identifies the deprecated settings in your cluster and indices 
 and guides you through the process of resolving issues, including reindexing. 
 
-Before upgrading to Elasticsearch 9.0, make sure that you are using the final 
-8.x minor release to see the most up-to-date deprecation issues. 
+Before you upgrade, make sure that you are using the latest released minor 
+version of {es} to see the most up-to-date deprecation issues. 
+For example, if you want to upgrade to to 7.0, make sure that you are using 6.8.
 
 [float]
 === Reindexing