Merge branch 'main' into serverless_intro_update

elastic · Dec 2, 2024 · 1953979 · 1953979
2 parents 21aab75 + a61c1bf
commit 1953979
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 1,229 deletions.
diff --git a/serverless/index-serverless-elasticsearch.asciidoc b/serverless/index-serverless-elasticsearch.asciidoc
@@ -32,7 +32,6 @@ include::./pages/ingest-your-data-ingest-data-through-integrations-beats.asciido
 
 include::./pages/search-your-data.asciidoc[leveloffset=+2]
 include::./pages/search-your-data-the-search-api.asciidoc[leveloffset=+3]
-include::./pages/search-with-synonyms.asciidoc[leveloffset=+3]
 include::./pages/knn-search.asciidoc[leveloffset=+3]
 include::./pages/search-your-data-semantic-search.asciidoc[leveloffset=+3]
 

diff --git a/serverless/index-serverless-general.asciidoc b/serverless/index-serverless-general.asciidoc
@@ -1,4 +1,3 @@
-[[intro]]
 == Elastic Cloud Serverless
 
 include::./pages/welcome-to-serverless.asciidoc[leveloffset=+2]

diff --git a/serverless/index.asciidoc b/serverless/index.asciidoc
@@ -11,8 +11,6 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :sec-badge: <<what-is-security-serverless,image:images/sec-badge.svg[Security]>>
 
 // The values of these attributes are different in stateful vs serverless
-:observability: Elastic Observability Serverless
-:security: Elastic Security Serverless
 
 = Serverless
 

diff --git a/serverless/pages/action-connectors.asciidoc b/serverless/pages/action-connectors.asciidoc
@@ -4,6 +4,11 @@
 // :description: Configure connections to third party systems for use in cases and rules.
 // :keywords: serverless
 
+[NOTE]
+====
+This page is about Kibana connectors that integrate with services like generative AI model providers. If you're looking for Search connectors that synchronize third-party data into {es}, refer to <<elasticsearch-ingest-data-through-integrations-connector-client,Connector clients>>.
+====
+
 This content applies to: {es-badge} {obs-badge} {sec-badge}
 
 The list of available connectors varies by project type.

diff --git a/serverless/pages/index-management.asciidoc b/serverless/pages/index-management.asciidoc
@@ -80,6 +80,8 @@ on multiple indices, select their checkboxes and then open the **Manage** menu.
 
 Investigate your data streams and address lifecycle management needs in the **Data Streams** view.
 
+In {es-serverless}, indices matching the `logs-*-*` pattern use the logsDB index mode by default. The logsDB index mode creates a {ref}/logs-data-stream.html[logs data stream]. 
+
 The value in the **Indices** column indicates the number of backing indices. Click this number to drill down into details.
 
 A value in the data retention column indicates that the data stream is managed by a data stream lifecycle policy.
@@ -115,6 +117,8 @@ image::images/index-management-index-templates.png[Index templates]
 
 // TO-DO: This screenshot is missing some tabs that exist in serverless
 
+The default *logs* template uses the logsDB index mode to create a {ref}/logs-data-stream.html[logs data stream].
+
 If you don't have any templates, you can create one using the **Create template** wizard.
 
 ////

diff --git a/...ges/ingest-your-data-ingest-data-through-integrations-connector-client.asciidoc b/...ges/ingest-your-data-ingest-data-through-integrations-connector-client.asciidoc
@@ -4,6 +4,11 @@
 // :description: Set up and deploy self-managed connectors that run on your own infrastructure.
 // :keywords: serverless, elasticsearch, ingest, connector, how to
 
+[NOTE]
+====
+This page is about Search connectors that synchronize third-party data into {es}. If you're looking for Kibana connectors to integrate with services like generative AI model providers, refer to <<action-connectors,Kibana Connectors>>.
+====
+
 [NOTE]
 ====
 This page contains high-level instructions about setting up connector clients in your project's UI.