Fixes merge conflict (#82172)

Author: gchaps

docs/setup/connect-to-elasticsearch.asciidoc

@@ -1,107 +1,73 @@
 [[connect-to-elasticsearch]]
-== Add data to {kib}
+== Add data
+++++
+<titleabbrev>Add data</titleabbrev>
+++++
 
-To start working with your data in {kib}, you can:
+To start working with your data in {kib}, use one of the many ingest options,
+available from the home page.
+You can collect data from an app or service
+or upload a file that contains your data.  If you're not ready to use your own data,
+add a sample data set and give {kib} a test drive.
 
-* Upload a CSV, JSON, or log file with the File Data Visualizer.
+[role="screenshot"]
+image::images/add-data-home.png[Built-in options for adding data to Kibana:  Add data, Add Elastic Agent, Upload a file]
 
-* Upload geospatial data with the GeoJSON Upload feature.
+[float]
+[[add-data-tutorial-kibana]]
+===  Add data
 
-* Index logs, metrics, events, or application data by setting up a Beats module.
+Want to ingest logs, metrics, security, or application data?
+Install and configure a Beats data shipper or other module to periodically collect the data
+and send it to {es}. You can then use the pre-built dashboards to explore and analyze the data.
 
-* Connect {kib} with existing {es} indices.
+[role="screenshot"]
+image::images/add-data-tutorials.png[Add Data tutorials]
 
-If you're not ready to use your own data, you can add a <<get-started, sample data set>>
-to see all that you can do in {kib}.
+[discrete]
+=== Add Elastic Agent
 
-[float]
-[[upload-data-kibana]]
-=== Upload a CSV, JSON, or log file
-
-experimental[]
+beta[] *Elastic Agent* is a sneak peek at the next generation of
+data integration modules, offering
+a centralized way to set up your integrations.
+With *Fleet*, you can add
+and manage integrations for popular services and platforms, providing
+an easy way to collect your data. The integrations
+ship with dashboards and visualizations,
+so you can quickly get insights into your data.
 
-To visualize data in a CSV, JSON, or log file, you can upload it using the File 
-Data Visualizer. On the home page, click *Upload a file*, and 
-then drag your file onto the *File Data Visualizer*. Alternatively, you can open 
-it by navigating to *Machine Learning* from the side navigation and selecting 
-*Data Visualizer*.
+To get started, refer to
+{ingest-guide}/ingest-management-getting-started.html[Quick start: Get logs and metrics into the Elastic Stack].
 
 [role="screenshot"]
-image::images/ingest-data.png[File Data Visualizer on the home page]
+image::images/add-data-fleet.png[Add data using Fleet]
 
-You can upload a file up to 100 MB. This value is configurable up to 1 GB in
-<<kibana-ml-settings, Advanced Settings>>.
+[discrete]
+[[upload-data-kibana]]
+=== Upload a file
+
+experimental[] If your data is in a CSV, JSON, or log file, you can upload it using the File
+Data Visualizer. You can upload a file up to 100 MB. This value is configurable up to 1 GB in
+<<kibana-ml-settings, Advanced Settings>>. To upload a file with geospatial data,
+refer to <<import-geospatial-data, Import geospatial data>>.
 
 [role="screenshot"]
 image::images/add-data-fv.png[File Data Visualizer]
 
-The File Data Visualizer uses the {ref}/ml-find-file-structure.html[find_file_structure API] to analyze
-the uploaded file and to suggest ingest pipelines and mappings for your data.
+
 
 NOTE: This feature is not intended for use as part of a
 repeated production process, but rather for the initial exploration of your data.
 
-[float]
-[[upload-geoipdata-kibana]]
-=== Upload geospatial data
-
-To visualize geospatial data in a point or shape file, you can upload it using the <<import-geospatial-data, GeoJSON Upload>>
-feature in Maps, and then use that data as a layer in a map.
-The data is also available for use in the broader Kibana ecosystem, for example,
-in visualizations and Canvas workpads.
-With GeoJSON Upload, you can upload a file up to 50 MB.
-
-[float]
-[[add-data-tutorial-kibana]]
-===  Index metrics, log, security, and application data
 
-The built-in data tutorials can help you quickly get up and running with
-metrics data, log analytics, security events, and application data.
-These tutorials walk you through installing and configuring a
-Beats data shipper to periodically collect and send data to {es}.
-You can then use the pre-built dashboards to explore and analyze the data.
+[discrete]
+=== Additional options for loading your data
 
-You access the tutorials from the home page.
-If a tutorial doesn’t exist for your data, go to the {beats-ref}/beats-reference.html[Beats overview]
-to learn about other data shippers in the Beats family.
+If the {kib} ingest options don't work for you, you can index your
+data into Elasticsearch with {ref}/getting-started-index.html[REST APIs]
+or https://www.elastic.co/guide/en/elasticsearch/client/index.html[client libraries].
+After you add your data, you're required to create an <<index-patterns,index pattern>> to tell
+{kib} where to find the data.
 
-[role="screenshot"]
-image::images/add-data-tutorials.png[Add Data tutorials]
-
-
-[float]
-[[connect-to-es]]
-=== Connect with {es} indices
-
-To visualize data in existing {es} indices, you must
-create an index pattern that matches the names of the indices that you want to explore.
-When you add data with the File Data Visualizer, GeoJSON Upload feature,
-or built-in tutorial, an index pattern is created for you.
-
-. Open the main menu, then click *Stack Management > Index Patterns*.
-
-. Click *Create index pattern*.
-
-. Specify an index pattern that matches the name of one or more of your Elasticsearch indices.
-+
-For example, an index pattern can point to your Apache data from yesterday,
-`filebeat-apache-4-3-2022`, or any index that matches the pattern, `filebeat-*`.
-Using a wildcard is the more popular approach.
-
-
-. Click *Next Step*, and then select the index field that contains the timestamp you want to use to perform time-based
-comparisons.
-+
-Kibana reads the index mapping and lists all fields that contain a timestamp. If your
-index doesn't have time-based data, choose *I don't want to use the time filter*.
-+
-You must select a time field to use global time filters on your dashboards.
-
-. Click *Create index pattern*.
-+
-{kib} is now configured to access your {es} indices.
-You’ll see a list of fields configured for the matching index.
-You can designate your index pattern as the default by clicking the star icon on this page.
-+
-When searching in *Discover* and creating visualizations, you choose a pattern
-from the index pattern menu to specify the {es} indices that contain the data you want to explore.
+* To add data for Elastic Observability, refer to {observability-guide}/add-observability-data.html[Send data to Elasticsearch].
+* To add data for Elastic Security, refer to https://www.elastic.co/guide/en/security/current/ingest-data.html[Ingest data to Elastic Security].

docs/setup/images/add-data-fleet.png

@@ -26,30 +26,16 @@ image::images/intro-kibana.png[Kibana home page]
 [[get-data-into-kibana]]
 === Ingest data
 
-{kib} is designed to use {es} as a data source. Think of {es} as the engine that stores
+{kib} is designed to use {es} as a data source. Think of Elasticsearch as the engine that stores
 and processes the data, with {kib} sitting on top.
 
-From the home page, {kib} provides these options for ingesting data:
-
-* Import data using the
-https://www.elastic.co/blog/importing-csv-and-log-data-into-elasticsearch-with-file-data-visualizer[File Data visualizer].
-* Set up a data flow to Elasticsearch using our built-in tutorials.
-If a tutorial doesn’t exist for your data, go to the
-{beats-ref}/beats-reference.html[Beats overview] to learn about other data shippers
-in the {beats} family.
-* <<add-sample-data, Add a sample data set>> and take {kib} for a test drive without loading data yourself.
-* Index your data into Elasticsearch with {ref}/getting-started-index.html[REST APIs]
- or https://www.elastic.co/guide/en/elasticsearch/client/index.html[client libraries].
-+
-[role="screenshot"]
-image::images/intro-data-tutorial.png[Ways to get data in from the home page]
-
+To start working with your data in Kibana, use one of the many ingest options,
+available from the home page. You can collect data from an app or service or upload a file that contains your data.
+If you're not ready to use your own data, you can add a sample data set
+to give {kib} a test drive.
 
-{kib} uses an
-<<index-patterns, index pattern>> to tell it which {es} indices to explore.
-If you add upload a file, run a built-in tutorial, or add sample data, you get an index pattern for free,
-and are good to start exploring. If you load your own data, you can create
-an index pattern in <<management, Stack Management>>.
+[role="screenshot"]
+image::setup/images/add-data-home.png[Built-in options for adding data to Kibana:  Add data, Add Elastic Agent, Upload a file]
 
 [float]
 [[explore-and-query]]
@@ -94,7 +80,7 @@ and dynamic client-side styling.
 
 * <<tsvb, TSVB>> allows you to combine
 an infinite number of aggregations to display complex data.
-With TSVB, you can analyze multiple index patterns and customize
+With TSVB, you can customize
 every aspect of your visualization. Choose your own date format and color
 gradients, and easily switch your data view between time series, metric,
 top N, gauge, and markdown.
@@ -124,7 +110,7 @@ dashboards in one space, but full access to all of Kibana’s features in anothe
 === Manage all things Elastic Stack
 
 <<management, Stack Management>> provides guided processes for managing all
-things Elastic Stack &mdash; indices, clusters, licenses, UI settings, index patterns,
+things Elastic Stack &mdash; indices, clusters, licenses, UI settings,
 and more. Want to update your {es} indices? Set user roles and privileges?
 Turn on dark mode? Kibana has UIs for all that.