Skip to content

Commit a44c6dc

Browse files
committed
Merge remote-tracking branch 'upstream/main' into semantic-search-updates
2 parents 38ddc51 + 353b9dd commit a44c6dc

File tree

88 files changed

+256
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+256
-300
lines changed

serverless/index-serverless-elasticsearch.asciidoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
++++
66

77
include::./pages/what-is-elasticsearch-serverless.asciidoc[leveloffset=+2]
8+
include::./pages/serverless-differences.asciidoc[leveloffset=+2]
89

910
include::./pages/pricing.asciidoc[leveloffset=+2]
1011

@@ -42,8 +43,4 @@ include::./pages/search-your-data-semantic-search.asciidoc[leveloffset=+3]
4243

4344
include::./pages/explore-your-data.asciidoc[leveloffset=+2]
4445

45-
include::./pages/search-playground.asciidoc[leveloffset=+2]
46-
47-
include::./pages/serverless-differences.asciidoc[leveloffset=+2]
48-
49-
include::./pages/technical-preview-limitations.asciidoc[leveloffset=+2]
46+
include::./pages/search-playground.asciidoc[leveloffset=+2]

serverless/pages/action-connectors.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: Configure connections to third party systems for use in cases and rules.
55
// :keywords: serverless
66

7-
preview:[]
8-
97
This content applies to: {es-badge} {obs-badge} {sec-badge}
108

119
The list of available connectors varies by project type.

serverless/pages/api-keys.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: API keys allow access to the {stack} on behalf of a user.
55
// :keywords: serverless, Elasticsearch, Observability, Security
66

7-
preview:[]
8-
97
This content applies to: {es-badge} {obs-badge} {sec-badge}
108

119
API keys are security mechanisms used to authenticate and authorize access to {stack} resources,

serverless/pages/apis-elasticsearch-conventions.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: The {es-serverless} REST APIs have conventions for headers and request bodies.
55
// :keywords: serverless, elasticsearch, API, reference
66

7-
preview:[]
8-
97
You can run {es} API requests in **{dev-tools-app} → Console**.
108
For example:
119

serverless/pages/apis-http-apis.asciidoc

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,33 @@
44
// :description: {es} and {kib} expose REST APIs that can be called directly to configure and access {stack} features.
55
// :keywords: serverless, elasticsearch, http, rest, overview
66

7-
preview:[]
7+
[discrete]
8+
[[elasticsearch-api-references-links]]
9+
== API references
810

9-
* <<elasticsearch-api-conventions>>: The {es-serverless} REST APIs have conventions for headers and request bodies.
10-
* <<elasticsearch-kibana-api-conventions>>: The Management APIs for {serverless-short} have request header conventions.
11-
* https://www.elastic.co/docs/api/[API Reference]: Explore the reference information for Elastic Serverless REST APIs
11+
The following APIs are available for {es-serverless} users.
12+
These links will take you to the autogenerated API reference documentation.
13+
14+
https://www.elastic.co/docs/api/doc/elasticsearch-serverless[Elasticsearch Serverless APIs →]::
15+
Use these APIs to index, manage, search, and analyze your data in {es-serverless}.
16+
+
17+
[TIP]
18+
====
19+
Learn how to <<elasticsearch-connecting-to-es-serverless-endpoint,connect to your {es-serverless} endpoint>>.
20+
====
21+
22+
https://www.elastic.co/docs/api/doc/serverless[Kibana Serverless APIs →]::
23+
Use these APIs to manage resources such as connectors, data views, and saved objects for your {serverless-full} project.
24+
25+
https://www.elastic.co/docs/api/doc/elastic-cloud-serverless[{serverless-full} APIs →]::
26+
Use these APIs to manage your {serverless-full} projects.
27+
28+
[discrete]
29+
[[additional-api-details]]
30+
== Additional API information
31+
32+
<<elasticsearch-api-conventions>>::
33+
Reference information about headers and request body conventions for {es-serverless} REST APIs.
34+
35+
<<elasticsearch-kibana-api-conventions>>::
36+
Reference information about request header conventions for {serverless-full} REST APIs.

serverless/pages/apis-kibana-conventions.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: The Management APIs for {serverless-short} have request header conventions.
55
// :keywords: serverless, kibana, API, reference
66

7-
preview:[]
8-
97
The Management REST APIs for {serverless-full} let you manage resources that are available in multiple solutions.
108
These resources include connectors, data views, and saved objects.
119
If you've previously used the {stack}, the Management APIs are similar to {kib} APIs.

serverless/pages/clients-dot-net-getting-started.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: Set up and use the .NET client for {es3}.
55
// :keywords: serverless, elasticsearch, .net, how to
66

7-
preview:[]
8-
97
[NOTE]
108
====
119
This client is for use with {es-serverless} only. See also the https://www.elastic.co/guide/en/elasticsearch/client/index.html[{es} clients].

serverless/pages/clients-go-getting-started.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: Set up and use the Go client for {es3}.
55
// :keywords: serverless, elasticsearch, go, how to
66

7-
preview:[]
8-
97
[NOTE]
108
====
119
This client is for use with {es-serverless} only. See also the https://www.elastic.co/guide/en/elasticsearch/client/index.html[{es} clients].

serverless/pages/clients-java-getting-started.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: Set up and use the Java client for {es3}.
55
// :keywords: serverless, elasticsearch, java, how to
66

7-
preview:[]
8-
97
[NOTE]
108
====
119
This client is for use with {es-serverless} only. See also the https://www.elastic.co/guide/en/elasticsearch/client/index.html[{es} clients].

serverless/pages/clients-nodejs-getting-started.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// :description: Set up and use the Node.js client for {es3}.
55
// :keywords: serverless, elasticsearch, nodejs, how to
66

7-
preview:[]
8-
97
[NOTE]
108
====
119
This client is for use with {es-serverless} only. See also the https://www.elastic.co/guide/en/elasticsearch/client/index.html[{es} clients].

0 commit comments

Comments
 (0)