Update ELK Images

[elasticmachine]

Update ELK Images

[github-actions]

Diff for d86a8a3:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index c6914f7..a148d18 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,10 +4,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: elasticsearch
 Builder: buildkit
 
-Tags: 7.17.21
+Tags: 7.17.22
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
+GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
 Tags: 8.14.1
 Architectures: amd64, arm64v8
@@ -21,10 +21,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: kibana
 Builder: buildkit
 
-Tags: 7.17.21
+Tags: 7.17.22
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
+GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
 Tags: 8.14.1
 Architectures: amd64, arm64v8
@@ -38,10 +38,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: logstash
 Builder: buildkit
 
-Tags: 7.17.21
+Tags: 7.17.22
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
+GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
 Tags: 8.14.1
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 0097405..5131564 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
-elasticsearch:7.17.21
+elasticsearch:7.17.22
 elasticsearch:8.14.1
-kibana:7.17.21
+kibana:7.17.22
 kibana:8.14.1
-logstash:7.17.21
+logstash:7.17.22
 logstash:8.14.1
diff --git a/elasticsearch_7.17.21/Dockerfile b/elasticsearch_7.17.22/Dockerfile
similarity index 94%
rename from elasticsearch_7.17.21/Dockerfile
rename to elasticsearch_7.17.22/Dockerfile
index a102249..d42cdd5 100644
--- a/elasticsearch_7.17.21/Dockerfile
+++ b/elasticsearch_7.17.22/Dockerfile
@@ -42,7 +42,7 @@ RUN set -eux ; \
 RUN mkdir /usr/share/elasticsearch
 WORKDIR /usr/share/elasticsearch
 
-RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.21-linux-$(arch).tar.gz
+RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.22-linux-$(arch).tar.gz
 
 RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1
 
@@ -134,25 +134,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk
 
 EXPOSE 9200 9300
 
-LABEL org.label-schema.build-date="2024-04-26T04:36:26.745220156Z" \
+LABEL org.label-schema.build-date="2024-06-06T07:35:17.876121680Z" \
   org.label-schema.license="Elastic-License-2.0" \
   org.label-schema.name="Elasticsearch" \
   org.label-schema.schema-version="1.0" \
   org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
   org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
-  org.label-schema.vcs-ref="d38e4b028f4a9784bb74de339ac1b877e2dbea6f" \
+  org.label-schema.vcs-ref="38e9ca2e81304a821c50862dafab089ca863944b" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.21" \
-  org.opencontainers.image.created="2024-04-26T04:36:26.745220156Z" \
+  org.label-schema.version="7.17.22" \
+  org.opencontainers.image.created="2024-06-06T07:35:17.876121680Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
   org.opencontainers.image.licenses="Elastic-License-2.0" \
-  org.opencontainers.image.revision="d38e4b028f4a9784bb74de339ac1b877e2dbea6f" \
+  org.opencontainers.image.revision="38e9ca2e81304a821c50862dafab089ca863944b" \
   org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
   org.opencontainers.image.title="Elasticsearch" \
   org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
   org.opencontainers.image.vendor="Elastic" \
-  org.opencontainers.image.version="7.17.21"
+  org.opencontainers.image.version="7.17.22"
 
 # Our actual entrypoint is `tini`, a minimal but functional init program. It
 # calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/elasticsearch_7.17.21/bin/docker-entrypoint.sh b/elasticsearch_7.17.22/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_7.17.21/bin/docker-entrypoint.sh
rename to elasticsearch_7.17.22/bin/docker-entrypoint.sh
diff --git a/elasticsearch_7.17.21/bin/docker-openjdk b/elasticsearch_7.17.22/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_7.17.21/bin/docker-openjdk
rename to elasticsearch_7.17.22/bin/docker-openjdk
diff --git a/elasticsearch_7.17.21/config/elasticsearch.yml b/elasticsearch_7.17.22/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_7.17.21/config/elasticsearch.yml
rename to elasticsearch_7.17.22/config/elasticsearch.yml
diff --git a/elasticsearch_7.17.21/config/log4j2.properties b/elasticsearch_7.17.22/config/log4j2.properties
similarity index 100%
rename from elasticsearch_7.17.21/config/log4j2.properties
rename to elasticsearch_7.17.22/config/log4j2.properties
diff --git a/kibana_7.17.21/Dockerfile b/kibana_7.17.22/Dockerfile
similarity index 92%
rename from kibana_7.17.21/Dockerfile
rename to kibana_7.17.22/Dockerfile
index 88214d4..098f470 100644
--- a/kibana_7.17.21/Dockerfile
+++ b/kibana_7.17.22/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
 RUN cd /tmp && \
   curl --retry 8 -s -L \
     --output kibana.tar.gz \
-     https://artifacts.elastic.co/downloads/kibana/kibana-7.17.21-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-7.17.22-linux-$(arch).tar.gz && \
   cd -
 
 
@@ -104,25 +104,25 @@ RUN groupadd --gid 1000 kibana && \
       --home-dir /usr/share/kibana --no-create-home \
       kibana
 
-LABEL org.label-schema.build-date="2024-04-25T11:06:50.254Z" \
+LABEL org.label-schema.build-date="2024-06-05T11:07:35.640Z" \
   org.label-schema.license="Elastic License" \
   org.label-schema.name="Kibana" \
   org.label-schema.schema-version="1.0" \
   org.label-schema.url="https://www.elastic.co/products/kibana" \
   org.label-schema.usage="https://www.elastic.co/guide/en/kibana/reference/index.html" \
-  org.label-schema.vcs-ref="34995fdf7c8c448c6fc99cd0a5e50c88479ff59f" \
+  org.label-schema.vcs-ref="43696930d77d3bb567e445624874eab9cf363872" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.21" \
-  org.opencontainers.image.created="2024-04-25T11:06:50.254Z" \
+  org.label-schema.version="7.17.22" \
+  org.opencontainers.image.created="2024-06-05T11:07:35.640Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="34995fdf7c8c448c6fc99cd0a5e50c88479ff59f" \
+  org.opencontainers.image.revision="43696930d77d3bb567e445624874eab9cf363872" \
   org.opencontainers.image.source="https://github.com/elastic/kibana" \
   org.opencontainers.image.title="Kibana" \
   org.opencontainers.image.url="https://www.elastic.co/products/kibana" \
   org.opencontainers.image.vendor="Elastic" \
-  org.opencontainers.image.version="7.17.21"
+  org.opencontainers.image.version="7.17.22"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_7.17.21/bin/kibana-docker b/kibana_7.17.22/bin/kibana-docker
similarity index 100%
rename from kibana_7.17.21/bin/kibana-docker
rename to kibana_7.17.22/bin/kibana-docker
diff --git a/kibana_7.17.21/config/kibana.yml b/kibana_7.17.22/config/kibana.yml
similarity index 100%
rename from kibana_7.17.21/config/kibana.yml
rename to kibana_7.17.22/config/kibana.yml
diff --git a/logstash_7.17.21/Dockerfile b/logstash_7.17.22/Dockerfile
similarity index 90%
rename from logstash_7.17.21/Dockerfile
rename to logstash_7.17.22/Dockerfile
index b60c536..8004b69 100644
--- a/logstash_7.17.21/Dockerfile
+++ b/logstash_7.17.22/Dockerfile
@@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
 
 # Add Logstash itself.
 RUN \
-curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.21-linux-$(arch).tar.gz | \
+curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.22-linux-$(arch).tar.gz | \
     tar zxf - -C /usr/share && \
-    mv /usr/share/logstash-7.17.21 /usr/share/logstash && \
+    mv /usr/share/logstash-7.17.22 /usr/share/logstash && \
 chown --recursive logstash:logstash /usr/share/logstash/ && \
     chown -R logstash:root /usr/share/logstash && \
     chmod -R g=u /usr/share/logstash && \
@@ -64,13 +64,13 @@ LABEL  org.label-schema.schema-version="1.0" \
   org.opencontainers.image.vendor="Elastic" \
   org.label-schema.name="logstash" \
   org.opencontainers.image.title="logstash" \
-  org.label-schema.version="7.17.21" \
-  org.opencontainers.image.version="7.17.21" \
+  org.label-schema.version="7.17.22" \
+  org.opencontainers.image.version="7.17.22" \
   org.label-schema.url="https://www.elastic.co/products/logstash" \
   org.label-schema.vcs-url="https://github.com/elastic/logstash" \
   org.label-schema.license="Elastic License" \
   org.opencontainers.image.licenses="Elastic License" \
   org.opencontainers.image.description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
-  org.label-schema.build-date=2024-04-25T21:20:46+00:00 \
-org.opencontainers.image.created=2024-04-25T21:20:46+00:00
+  org.label-schema.build-date=2024-05-02T09:01:17+00:00 \
+org.opencontainers.image.created=2024-05-02T09:01:17+00:00
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_7.17.21/bin/docker-entrypoint b/logstash_7.17.22/bin/docker-entrypoint
similarity index 100%
rename from logstash_7.17.21/bin/docker-entrypoint
rename to logstash_7.17.22/bin/docker-entrypoint
diff --git a/logstash_7.17.21/config/log4j2.properties b/logstash_7.17.22/config/log4j2.properties
similarity index 100%
rename from logstash_7.17.21/config/log4j2.properties
rename to logstash_7.17.22/config/log4j2.properties
diff --git a/logstash_7.17.21/config/logstash-full.yml b/logstash_7.17.22/config/logstash-full.yml
similarity index 100%
rename from logstash_7.17.21/config/logstash-full.yml
rename to logstash_7.17.22/config/logstash-full.yml
diff --git a/logstash_7.17.21/config/pipelines.yml b/logstash_7.17.22/config/pipelines.yml
similarity index 100%
rename from logstash_7.17.21/config/pipelines.yml
rename to logstash_7.17.22/config/pipelines.yml
diff --git a/logstash_7.17.21/env2yaml/env2yaml b/logstash_7.17.22/env2yaml/env2yaml
similarity index 100%
rename from logstash_7.17.21/env2yaml/env2yaml
rename to logstash_7.17.22/env2yaml/env2yaml
diff --git a/logstash_7.17.21/pipeline/default.conf b/logstash_7.17.22/pipeline/default.conf
similarity index 100%
rename from logstash_7.17.21/pipeline/default.conf
rename to logstash_7.17.22/pipeline/default.conf

Relevant Maintainers:

• elasticsearch: @mark-vieira
• kibana: @watson
• logstash: @jsvd

[tianon]

Looks like building this successfully required a few retries that would've been caught sooner if the curl invocations included -f/--fail -- that's actually an issue for our official build infrastructure because it'll do build cache which would cache the "bad" RUN curl line and then no amount of retries will recover until the cache is purged.