Skip to content

Commit

Permalink
Merge branch 'main' into fips_enforce_provider
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelandis authored Dec 18, 2023
2 parents 9a77e1e + 4a583d9 commit a6b376e
Show file tree
Hide file tree
Showing 150 changed files with 4,131 additions and 1,237 deletions.
13 changes: 13 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,16 @@ x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/sto
# APM Data index templates, etc.
x-pack/plugin/apm-data/src/main/resources @elastic/apm-server
x-pack/plugin/apm-data/src/yamlRestTest/resources @elastic/apm-server

# Delivery
gradle @elastic/es-delivery
build-conventions @elastic/es-delivery
build-tools @elastic/es-delivery
build-tools-internal @elastic/es-delivery
*.gradle @elastic/es-delivery
.buildkite @elastic/es-delivery
.ci @elastic/es-delivery
.idea @elastic/es-delivery
distribution/src @elastic/es-delivery
distribution/packages/src @elastic/es-delivery
distribution/docker/src @elastic/es-delivery
5 changes: 5 additions & 0 deletions docs/changelog/102798.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 102798
summary: Hot-reloadable remote cluster credentials
area: Security
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/103032.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103032
summary: "x-pack/plugin/apm-data: Map some APM fields as flattened and fix error.grouping_name script"
area: Data streams
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/103135.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 103135
summary: Use deduced mappings for determining proper fields' format even if `deduce_mappings==false`
area: Transform
type: bug
issues:
- 103115
6 changes: 6 additions & 0 deletions docs/changelog/103325.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 103325
summary: Added Duplicate Word Check Feature to Analysis Nori
area: Search
type: feature
issues:
- 103321
5 changes: 5 additions & 0 deletions docs/changelog/103340.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103340
summary: Avoid humongous blocks
area: ES|QL
type: enhancement
issues: []
76 changes: 76 additions & 0 deletions docs/reference/connector/apis/check-in-connector-api.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
[[check-in-connector-api]]
=== Check in connector API

preview::[]

++++
<titleabbrev>Check in a connector</titleabbrev>
++++

Updates the `last_seen` field of a connector with current timestamp.

[[check-in-connector-api-request]]
==== {api-request-title}

`PUT _connector/<connector_id>/_check_in`

[[check-in-connector-api-prereq]]
==== {api-prereq-title}

* To sync data using connectors, it's essential to have the Elastic connectors service running.
* The `connector_id` parameter should reference an existing connector.

[[check-in-connector-api-path-params]]
==== {api-path-parms-title}

`<connector_id>`::
(Required, string)


[[check-in-connector-api-response-codes]]
==== {api-response-codes-title}

`200`::
Connector `last_seen` field was successfully updated with a current timestamp.

`400`::
The `connector_id` was not provided.

`404` (Missing resources)::
No connector matching `connector_id` could be found.

[[check-in-connector-api-example]]
==== {api-examples-title}

The following example updates the `last_seen` property with current timestamp for the connector with ID `my-connector`:

////
[source, console]
--------------------------------------------------
PUT _connector/my-connector
{
"index_name": "search-google-drive",
"name": "My Connector",
"service_type": "google_drive"
}
--------------------------------------------------
// TESTSETUP
[source,console]
--------------------------------------------------
DELETE _connector/my-connector
--------------------------------------------------
// TEARDOWN
////

[source,console]
----
PUT _connector/my-connector/_check_in
----

[source,console-result]
----
{
"result": "updated"
}
----
14 changes: 14 additions & 0 deletions docs/reference/connector/apis/connector-apis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ Use the following APIs to manage connectors:
* <<delete-connector-api>>
* <<get-connector-api>>
* <<list-connector-api>>
* <<check-in-connector-api>>
* <<update-connector-error-api>>
* <<update-connector-last-sync-api>>
* <<update-connector-name-description-api>>
* <<update-connector-pipeline-api>>
* <<update-connector-scheduling-api>>


[discrete]
Expand All @@ -44,9 +50,11 @@ Use the following APIs to manage sync jobs:
* <<get-connector-sync-job-api>>
* <<list-connector-sync-jobs-api>>
* <<set-connector-sync-job-error-api>>
* <<set-connector-sync-job-stats-api>>


include::cancel-connector-sync-job-api.asciidoc[]
include::check-in-connector-api.asciidoc[]
include::check-in-connector-sync-job-api.asciidoc[]
include::create-connector-api.asciidoc[]
include::create-connector-sync-job-api.asciidoc[]
Expand All @@ -57,3 +65,9 @@ include::get-connector-sync-job-api.asciidoc[]
include::list-connectors-api.asciidoc[]
include::list-connector-sync-jobs-api.asciidoc[]
include::set-connector-sync-job-error-api.asciidoc[]
include::set-connector-sync-job-stats-api.asciidoc[]
include::update-connector-error-api.asciidoc[]
include::update-connector-last-sync-api.asciidoc[]
include::update-connector-name-description-api.asciidoc[]
include::update-connector-pipeline-api.asciidoc[]
include::update-connector-scheduling-api.asciidoc[]
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ This is a destructive action that is not recoverable.
==== {api-prereq-title}

* To sync data using connectors, it's essential to have the Elastic connectors service running.
* The `connector_id` parameter should reference an existing connector.

[[delete-connector-api-path-params]]
==== {api-path-parms-title}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
[[set-connector-sync-job-stats-api]]
=== Set connector sync job stats API
++++
<titleabbrev>Set connector sync job stats</titleabbrev>
++++

Sets connector sync job stats.

[[set-connector-sync-job-stats-api-request]]
==== {api-request-title}
`PUT _connector/_sync_job/<connector_sync_job_id>/_stats`

[[set-connector-sync-job-stats-api-prereqs]]
==== {api-prereq-title}

* To sync data using connectors, it's essential to have the Elastic connectors service running.
* The `connector_sync_job_id` parameter should reference an existing connector sync job.

[[set-connector-sync-job-stats-api-desc]]
==== {api-description-title}

Sets the stats for a connector sync job.
Stats include: `deleted_document_count`, `indexed_document_count`, `indexed_document_volume` and `total_document_count`.
`last_seen` can also be updated using this API.
This API is mainly used by the connector service for updating sync job information.

[[set-connector-sync-job-stats-api-path-params]]
==== {api-path-parms-title}

`<connector_sync_job_id>`::
(Required, string)

[role="child_attributes"]
[[set-connector-sync-job-stats-api-request-body]]
==== {api-request-body-title}

`deleted_document_count`::
(Required, int) The number of documents the sync job deleted.

`indexed_document_count`::
(Required, int) The number of documents the sync job indexed.

`indexed_document_volume`::
(Required, int) The total size of the data (in MiB) the sync job indexed.

`total_document_count`::
(Optional, int) The total number of documents in the target index after the sync job finished.

`last_seen`::
(Optional, instant) The timestamp to set the connector sync job's `last_seen` property.

[[set-connector-sync-job-stats-api-response-codes]]
==== {api-response-codes-title}

`200`::
Indicates that the connector sync job stats were successfully updated.

`404`::
No connector sync job matching `connector_sync_job_id` could be found.

[[set-connector-sync-job-stats-api-example]]
==== {api-examples-title}

The following example sets all mandatory and optional stats for the connector sync job `my-connector-sync-job`:

[source,console]
----
PUT _connector/_sync_job/my-connector-sync-job/_stats
{
"deleted_document_count": 10,
"indexed_document_count": 20,
"indexed_document_volume": 1000,
"total_document_count": 2000,
"last_seen": "2023-01-02T10:00:00Z"
}
----
// TEST[skip:there's no way to clean up after creating a connector sync job, as we don't know the id ahead of time. Therefore, skip this test.]
86 changes: 86 additions & 0 deletions docs/reference/connector/apis/update-connector-error-api.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
[[update-connector-error-api]]
=== Update connector error API

preview::[]

++++
<titleabbrev>Update connector error</titleabbrev>
++++

Updates the `error` field of a connector.

[[update-connector-error-api-request]]
==== {api-request-title}

`PUT _connector/<connector_id>/_error`

[[update-connector-error-api-prereq]]
==== {api-prereq-title}

* To sync data using connectors, it's essential to have the Elastic connectors service running.
* The `connector_id` parameter should reference an existing connector.

[[update-connector-error-api-path-params]]
==== {api-path-parms-title}

`<connector_id>`::
(Required, string)

[role="child_attributes"]
[[update-connector-error-api-request-body]]
==== {api-request-body-title}

`error`::
(Required, string) A messaged related to the last error encountered by the connector.


[[update-connector-error-api-response-codes]]
==== {api-response-codes-title}

`200`::
Connector `error` field was successfully updated.

`400`::
The `connector_id` was not provided or the request payload was malformed.

`404` (Missing resources)::
No connector matching `connector_id` could be found.

[[update-connector-error-api-example]]
==== {api-examples-title}

The following example updates the `error` field for the connector with ID `my-connector`:

////
[source, console]
--------------------------------------------------
PUT _connector/my-connector
{
"index_name": "search-google-drive",
"name": "My Connector",
"service_type": "google_drive"
}
--------------------------------------------------
// TESTSETUP
[source,console]
--------------------------------------------------
DELETE _connector/my-connector
--------------------------------------------------
// TEARDOWN
////

[source,console]
----
PUT _connector/my-connector/_error
{
"error": "Houston, we have a problem!"
}
----

[source,console-result]
----
{
"result": "updated"
}
----
Loading

0 comments on commit a6b376e

Please sign in to comment.