Skip to content

Commit 2a86315

Browse files
pquentinpquentin
committed
Merge remote-tracking branch 'origin/9.1' into backport/9.1/pr-136640
2 parents fd0daa2 + 2d4366d commit 2a86315

37 files changed

+904
-91
lines changed

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:4d8871dbc3525d92a71b1f76145d4d9101d01951e9500040f30f16ac73bf36d8 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a02c67d96cd6ec1b50a055f1f5515e0987b643d001d436088cefc02e5b786bf9 AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -104,7 +104,7 @@ WORKDIR /usr/share/elasticsearch/config
104104
# Add entrypoint
105105
################################################################################
106106

107-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:4d8871dbc3525d92a71b1f76145d4d9101d01951e9500040f30f16ac73bf36d8
107+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a02c67d96cd6ec1b50a055f1f5515e0987b643d001d436088cefc02e5b786bf9
108108

109109
RUN <%= retry.loop(package_manager,
110110
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4f225dcff81c518939e79180749b55b60287b2edbce40801834380e285ca9076 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:25397820ef168d951339e69cedb5460f354cea842e2af367e33b89e988c51615 AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -80,7 +80,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
8080
# Add entrypoint
8181
################################################################################
8282

83-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4f225dcff81c518939e79180749b55b60287b2edbce40801834380e285ca9076
83+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:25397820ef168d951339e69cedb5460f354cea842e2af367e33b89e988c51615
8484

8585
RUN <%= retry.loop(package_manager,
8686
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/138097.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138097
2+
summary: Bump anomalies index template version to install latest
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎muted-tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,9 @@ tests:
401401
- class: org.elasticsearch.xpack.inference.InferenceRestIT
402402
method: test {p0=inference/70_text_similarity_rank_retriever/Text similarity reranker with min_score zero includes all docs}
403403
issue: https://github.com/elastic/elasticsearch/issues/137732
404+
- class: org.elasticsearch.threadpool.ThreadPoolTests
405+
method: testDetailedUtilizationMetric
406+
issue: https://github.com/elastic/elasticsearch/issues/138242
404407

405408
# Examples:
406409
#

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@
4242
},
4343
"h": {
4444
"type": "list",
45-
"description": "Comma-separated list of column names to display"
45+
"description": "Comma-separated list of column names to display",
46+
"options": [
47+
"alias",
48+
"index",
49+
"filter",
50+
"routing.index",
51+
"routing.search",
52+
"is_write_index"
53+
]
4654
},
4755
"help": {
4856
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,22 @@
7777
},
7878
"h": {
7979
"type": "list",
80-
"description": "Comma-separated list of column names to display"
80+
"description": "Comma-separated list of column names to display",
81+
"options": [
82+
"shards",
83+
"shards.undesired",
84+
"write_load.forecast",
85+
"disk.indices.forecast",
86+
"disk.indices",
87+
"disk.used",
88+
"disk.avail",
89+
"disk.total",
90+
"disk.percent",
91+
"host",
92+
"ip",
93+
"node",
94+
"node.role"
95+
]
8196
},
8297
"help": {
8398
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.component_templates.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,16 @@
5252
},
5353
"h": {
5454
"type": "list",
55-
"description": "Comma-separated list of column names to display"
55+
"description": "Comma-separated list of column names to display",
56+
"options": [
57+
"name",
58+
"version",
59+
"alias_count",
60+
"mapping_count",
61+
"settings_count",
62+
"metadata_count",
63+
"included_in"
64+
]
5665
},
5766
"help": {
5867
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@
4242
},
4343
"h": {
4444
"type": "list",
45-
"description": "Comma-separated list of column names to display"
45+
"description": "Comma-separated list of column names to display",
46+
"options": [
47+
"epoch",
48+
"timestamp",
49+
"count"
50+
]
4651
},
4752
"help": {
4853
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,15 @@
5454
},
5555
"h": {
5656
"type": "list",
57-
"description": "Comma-separated list of column names to display"
57+
"description": "Comma-separated list of column names to display",
58+
"options": [
59+
"id",
60+
"host",
61+
"ip",
62+
"node",
63+
"field",
64+
"size"
65+
]
5866
},
5967
"help": {
6068
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,24 @@
3030
},
3131
"h": {
3232
"type": "list",
33-
"description": "Comma-separated list of column names to display"
33+
"description": "Comma-separated list of column names to display",
34+
"options": [
35+
"epoch",
36+
"timestamp",
37+
"cluster",
38+
"status",
39+
"node.total",
40+
"node.data",
41+
"shards",
42+
"pri",
43+
"relo",
44+
"init",
45+
"unassign",
46+
"unassign.pri",
47+
"pending_tasks",
48+
"max_task_wait_time",
49+
"active_shards_percent"
50+
]
3451
},
3552
"help": {
3653
"type": "boolean",

0 commit comments

Comments
 (0)