Skip to content

Commit

Permalink
Merge branch 'main' into fix-health-task
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsbauman committed Feb 16, 2024
2 parents 876ba54 + 50c57e0 commit 6d50068
Show file tree
Hide file tree
Showing 339 changed files with 6,641 additions and 3,581 deletions.
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"upstream" : "elastic/elasticsearch",
"targetBranchChoices" : [ "main", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
"targetBranchChoices" : [ "main", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
"targetPRLabels" : [ "backport" ],
"branchLabelMapping" : {
"^v8.13.0$" : "main",
"^v8.14.0$" : "main",
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
}
}
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.19", "8.12.2", "8.13.0"]
BWC_VERSION: ["7.17.19", "8.12.2", "8.13.0", "8.14.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
16 changes: 16 additions & 0 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,22 @@ steps:
env:
BWC_VERSION: 8.13.0

- label: "{{matrix.image}} / 8.14.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.0
timeout_in_minutes: 300
matrix:
setup:
image:
- rocky-8
- ubuntu-2004
agents:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.14.0

- group: packaging-tests-windows
steps:
- label: "{{matrix.image}} / packaging-tests-windows"
Expand Down
10 changes: 10 additions & 0 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,16 @@ steps:
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.13.0
- label: 8.14.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.0#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.14.0
- label: concurrent-search-tests
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
timeout_in_minutes: 420
Expand Down
1 change: 1 addition & 0 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,4 @@ BWC_VERSION:
- "8.12.1"
- "8.12.2"
- "8.13.0"
- "8.14.0"
1 change: 1 addition & 0 deletions .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ BWC_VERSION:
- "7.17.19"
- "8.12.2"
- "8.13.0"
- "8.14.0"
4 changes: 2 additions & 2 deletions .github/workflows/docs-preview-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
script: |
const pr = context.payload.pull_request;
const comment = `Documentation preview:
- ✨ [Changed pages](https://${context.repo.repo}_${pr.number}.docs-preview.app.elstc.co/diff)`;
- ✨ [Changed pages](https://${context.repo.repo}_bk_${pr.number}.docs-preview.app.elstc.co/diff)`;
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
Expand Down
3 changes: 3 additions & 0 deletions branches.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
{
"branch": "main"
},
{
"branch": "8.13"
},
{
"branch": "8.12"
},
Expand Down
4 changes: 2 additions & 2 deletions build-tools-internal/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.5
8.6
4 changes: 2 additions & 2 deletions build-tools-internal/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 8.13.0
elasticsearch = 8.14.0
lucene = 9.9.2

bundled_jdk_vendor = openjdk
Expand All @@ -14,7 +14,7 @@ log4j = 2.19.0
slf4j = 2.0.6
ecsLogging = 1.2.0
jna = 5.10.0
netty = 4.1.94.Final
netty = 4.1.107.Final
commons_lang3 = 3.9
google_oauth_client = 1.34.1

Expand Down
12 changes: 6 additions & 6 deletions docs/README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ https://github.com/elastic/docs#readme[elastic/docs README].

=== Preview links for PRs

For open PRs, the `elasticsearch-ci/docs` check generates a live preview of any
For open PRs, a Buildkite job called `docs-build-pr` generates a live preview of any
docs changes. If the check runs successfully, you can find the preview at:

`https://elasticsearch_<PR_NUM>.docs-preview.app.elstc.co/diff`
`https://elasticsearch_bk_<PR_NUM>.docs-preview.app.elstc.co/diff`

`elasticsearch-ci/docs` runs automatically for PRs opened by Elastic employees.
`docs-build-pr` runs automatically for PRs opened by Elastic employees.
To run CI checks on PRs from external contributors, an Elastic employee can
leave a GitHub comment containing `@elasticmachine ok to test`.
leave a GitHub comment containing `run docs-build`.

To re-run `elasticsearch-ci/docs`, an Elastic employee can leave a GitHub
comment containing `@elasticmachine run elasticsearch-ci/docs`.
To re-run `docs-build-pr`, an Elastic employee can leave a GitHub
comment containing `run docs-build`.

== Add API reference pages

Expand Down
5 changes: 0 additions & 5 deletions docs/changelog/103134.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions docs/changelog/105223.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105223
summary: "x-pack/plugin/apm-data: Add a new field transaction.profiler_stack_trace_ids to [email protected]"
area: Data streams
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105272.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105272
summary: "Stop the periodic health logger when es is stopping"
area: Health
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/105315.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 105315
summary: Always show `composed_of` field for composable index templates
area: Indices APIs
type: bug
issues:
- 104627
6 changes: 6 additions & 0 deletions docs/changelog/105365.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 105365
summary: Fix bug in `rule_query` where `text_expansion` errored because it was not
rewritten
area: Application
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105391.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105391
summary: Catch all the potential exceptions in the ingest processor code
area: Machine Learning
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105427.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105427
summary: Adding `executedPipelines` to the `IngestDocument` copy constructor
area: Ingest Node
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105428.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105428
summary: Limiting the number of nested pipelines that can be executed
area: Ingest Node
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105429.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105429
summary: Changed system auditor to use levels
area: Machine Learning
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/105440.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 105440
summary: Avoid false-positive matches on intermediate objects in `ecs@mappings`
area: Data streams
type: bug
issues:
- 102794
5 changes: 5 additions & 0 deletions docs/changelog/105458.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105458
summary: The OpenAI model parameter should be in service settings not task settings. Move the configuration field to service settings
area: Machine Learning
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105468.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105468
summary: Include better output in profiling & `toString` for automaton based queries
area: Search
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/105476.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 105476
summary: "ESQL: Fix bug in grammar that allowed spaces inside id pattern"
area: ES|QL
type: bug
issues:
- 105441
6 changes: 6 additions & 0 deletions docs/changelog/105477.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 105477
summary: "ESQL: Introduce expression validation phase"
area: ES|QL
type: enhancement
issues:
- 105425
5 changes: 5 additions & 0 deletions docs/changelog/105486.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105486
summary: Fix use-after-free at event-loop shutdown
area: Network
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105499.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105499
summary: Fix a bug where destination index aliases are not set up for an unattended transform
area: Transform
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/105517.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105517
summary: Upgrade to Netty 4.1.107
area: Network
type: upgrade
issues: []
6 changes: 6 additions & 0 deletions docs/reference/connector/apis/connector-apis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ Use the following APIs to manage connectors:
* <<update-connector-configuration-api>>
* <<update-connector-error-api>>
* <<update-connector-filtering-api>>
* <<update-connector-index-name-api>>
* <<update-connector-last-sync-api>>
* <<update-connector-name-description-api>>
* <<update-connector-pipeline-api>>
* <<update-connector-scheduling-api>>
* <<update-connector-service-type-api>>
* <<update-connector-status-api>>


[discrete]
Expand Down Expand Up @@ -70,7 +73,10 @@ include::set-connector-sync-job-stats-api.asciidoc[]
include::update-connector-configuration-api.asciidoc[]
include::update-connector-error-api.asciidoc[]
include::update-connector-filtering-api.asciidoc[]
include::update-connector-index-name-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[]
include::update-connector-service-type-api.asciidoc[]
include::update-connector-status-api.asciidoc[]
31 changes: 31 additions & 0 deletions docs/reference/connector/apis/list-connectors-api.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ Returns information about all stored connectors.
`from`::
(Optional, integer) The offset from the first result to fetch.

`index_name`::
(Optional, string) A comma-separated list of data index names associated with connectors, used to filter search results.

`connector_name`::
(Optional, string) A comma-separated list of connector names, used to filter search results.

`service_type`::
(Optional, string) A comma-separated list of connector service types, used to filter search results.

[[list-connector-api-example]]
==== {api-examples-title}

Expand Down Expand Up @@ -74,3 +83,25 @@ The following example lists the first two connectors:
----
GET _connector/?from=0&size=2
----

An example to list connectors associated with `search-google-drive` data index name:

[source,console]
----
GET _connector/?index_name=search-google-drive
----


An example to list all connectors with `sharepoint_online` service type:

[source,console]
----
GET _connector/?service_type=sharepoint_online
----

An example to list all connectors with `sharepoint_online` or `google_drive` service type:

[source,console]
----
GET _connector/?service_type=sharepoint_online,google_drive
----
Loading

0 comments on commit 6d50068

Please sign in to comment.