Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ELK images for 8.15.4 #17889

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

navyau09
Copy link
Contributor

Update ELK images for 8.15.4

Copy link

Diff for f4a7133:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4ee3252..cb09eca 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,10 +9,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
 
-Tags: 8.15.3
+Tags: 8.15.4
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.15
-GitCommit: 5a2646dafd69282b29f600e9b366a4904764523a
+GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
 
 
 # kibana
@@ -26,10 +26,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
 
-Tags: 8.15.3
+Tags: 8.15.4
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.15
-GitCommit: 5a2646dafd69282b29f600e9b366a4904764523a
+GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
 
 
 # logstash
@@ -43,7 +43,7 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
 
-Tags: 8.15.3
+Tags: 8.15.4
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.15
-GitCommit: 5a2646dafd69282b29f600e9b366a4904764523a
+GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
diff --git a/_bashbrew-list b/_bashbrew-list
index 5e519f9..7c2734f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
 elasticsearch:7.17.25
-elasticsearch:8.15.3
+elasticsearch:8.15.4
 kibana:7.17.25
-kibana:8.15.3
+kibana:8.15.4
 logstash:7.17.25
-logstash:8.15.3
+logstash:8.15.4
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5e519f9..7c2734f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 elasticsearch:7.17.25
-elasticsearch:8.15.3
+elasticsearch:8.15.4
 kibana:7.17.25
-kibana:8.15.3
+kibana:8.15.4
 logstash:7.17.25
-logstash:8.15.3
+logstash:8.15.4
diff --git a/elasticsearch_8.15.3/Dockerfile b/elasticsearch_8.15.4/Dockerfile
similarity index 94%
rename from elasticsearch_8.15.3/Dockerfile
rename to elasticsearch_8.15.4/Dockerfile
index 6f519c9..c5c4938 100644
--- a/elasticsearch_8.15.3/Dockerfile
+++ b/elasticsearch_8.15.4/Dockerfile
@@ -43,7 +43,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-8.15.3-linux-$(arch).tar.gz
+RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.15.4-linux-$(arch).tar.gz
 
 RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1
 
@@ -135,25 +135,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk
 
 EXPOSE 9200 9300
 
-LABEL org.label-schema.build-date="2024-10-09T22:08:00.328917561Z" \
+LABEL org.label-schema.build-date="2024-11-07T09:35:45.535387784Z" \
   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="f97532e680b555c3a05e73a74c28afb666923018" \
+  org.label-schema.vcs-ref="4ec7e3608de63c104724277ebfa8dc7b84685f48" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.15.3" \
-  org.opencontainers.image.created="2024-10-09T22:08:00.328917561Z" \
+  org.label-schema.version="8.15.4" \
+  org.opencontainers.image.created="2024-11-07T09:35:45.535387784Z" \
   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="f97532e680b555c3a05e73a74c28afb666923018" \
+  org.opencontainers.image.revision="4ec7e3608de63c104724277ebfa8dc7b84685f48" \
   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="8.15.3"
+  org.opencontainers.image.version="8.15.4"
 
 # 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_8.15.3/bin/docker-entrypoint.sh b/elasticsearch_8.15.4/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_8.15.3/bin/docker-entrypoint.sh
rename to elasticsearch_8.15.4/bin/docker-entrypoint.sh
diff --git a/elasticsearch_8.15.3/bin/docker-openjdk b/elasticsearch_8.15.4/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_8.15.3/bin/docker-openjdk
rename to elasticsearch_8.15.4/bin/docker-openjdk
diff --git a/elasticsearch_8.15.3/config/elasticsearch.yml b/elasticsearch_8.15.4/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_8.15.3/config/elasticsearch.yml
rename to elasticsearch_8.15.4/config/elasticsearch.yml
diff --git a/elasticsearch_8.15.3/config/log4j2.properties b/elasticsearch_8.15.4/config/log4j2.properties
similarity index 100%
rename from elasticsearch_8.15.3/config/log4j2.properties
rename to elasticsearch_8.15.4/config/log4j2.properties
diff --git a/kibana_8.15.3/Dockerfile b/kibana_8.15.4/Dockerfile
similarity index 92%
rename from kibana_8.15.3/Dockerfile
rename to kibana_8.15.4/Dockerfile
index 5046d6a..1a57235 100644
--- a/kibana_8.15.3/Dockerfile
+++ b/kibana_8.15.4/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-8.15.3-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-8.15.4-linux-$(arch).tar.gz && \
   cd -
 
 RUN mkdir /usr/share/kibana
@@ -107,25 +107,25 @@ RUN groupadd --gid 1000 kibana && \
       --home-dir /usr/share/kibana --no-create-home \
       kibana
 
-LABEL org.label-schema.build-date="2024-10-09T11:11:49.786Z" \
+LABEL org.label-schema.build-date="2024-11-06T19:12:41.867Z" \
   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="3933429968aafb1ba31319fc38649d0f974044bf" \
+  org.label-schema.vcs-ref="79d00ab0a960bc3594ebf8d96c7523673b84e745" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.15.3" \
-  org.opencontainers.image.created="2024-10-09T11:11:49.786Z" \
+  org.label-schema.version="8.15.4" \
+  org.opencontainers.image.created="2024-11-06T19:12:41.867Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="3933429968aafb1ba31319fc38649d0f974044bf" \
+  org.opencontainers.image.revision="79d00ab0a960bc3594ebf8d96c7523673b84e745" \
   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="8.15.3"
+  org.opencontainers.image.version="8.15.4"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.15.3/bin/kibana-docker b/kibana_8.15.4/bin/kibana-docker
similarity index 100%
rename from kibana_8.15.3/bin/kibana-docker
rename to kibana_8.15.4/bin/kibana-docker
diff --git a/kibana_8.15.3/config/kibana.yml b/kibana_8.15.4/config/kibana.yml
similarity index 100%
rename from kibana_8.15.3/config/kibana.yml
rename to kibana_8.15.4/config/kibana.yml
diff --git a/logstash_8.15.3/Dockerfile b/logstash_8.15.4/Dockerfile
similarity index 91%
rename from logstash_8.15.3/Dockerfile
rename to logstash_8.15.4/Dockerfile
index 9216f2c..3f877d0 100644
--- a/logstash_8.15.3/Dockerfile
+++ b/logstash_8.15.4/Dockerfile
@@ -26,9 +26,9 @@ RUN groupadd --gid 1000 logstash && \
   adduser --uid 1000 --gid 1000 --home /usr/share/logstash --no-create-home logstash
 
 # Add Logstash itself.
-RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.15.3-linux-$(arch).tar.gz | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.15.4-linux-$(arch).tar.gz | \
   tar zxf - -C /usr/share && \
-  mv /usr/share/logstash-8.15.3 /usr/share/logstash && \
+  mv /usr/share/logstash-8.15.4 /usr/share/logstash && \
   chown --recursive logstash:logstash /usr/share/logstash/ && \
   chown -R logstash:root /usr/share/logstash && \
   chmod -R g=u /usr/share/logstash && \
@@ -82,14 +82,14 @@ 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="8.15.3" \
-  org.opencontainers.image.version="8.15.3" \
+  org.label-schema.version="8.15.4" \
+  org.opencontainers.image.version="8.15.4" \
   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-10-08T16:06:14+00:00 \
-  org.opencontainers.image.created=2024-10-08T16:06:14+00:00
+  org.label-schema.build-date=2024-11-06T19:09:26+00:00 \
+  org.opencontainers.image.created=2024-11-06T19:09:26+00:00
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.15.3/bin/docker-entrypoint b/logstash_8.15.4/bin/docker-entrypoint
similarity index 100%
rename from logstash_8.15.3/bin/docker-entrypoint
rename to logstash_8.15.4/bin/docker-entrypoint
diff --git a/logstash_8.15.3/config/log4j2.file.properties b/logstash_8.15.4/config/log4j2.file.properties
similarity index 100%
rename from logstash_8.15.3/config/log4j2.file.properties
rename to logstash_8.15.4/config/log4j2.file.properties
diff --git a/logstash_8.15.3/config/log4j2.properties b/logstash_8.15.4/config/log4j2.properties
similarity index 100%
rename from logstash_8.15.3/config/log4j2.properties
rename to logstash_8.15.4/config/log4j2.properties
diff --git a/logstash_8.15.3/config/logstash-full.yml b/logstash_8.15.4/config/logstash-full.yml
similarity index 100%
rename from logstash_8.15.3/config/logstash-full.yml
rename to logstash_8.15.4/config/logstash-full.yml
diff --git a/logstash_8.15.3/config/pipelines.yml b/logstash_8.15.4/config/pipelines.yml
similarity index 100%
rename from logstash_8.15.3/config/pipelines.yml
rename to logstash_8.15.4/config/pipelines.yml
diff --git a/logstash_8.15.3/env2yaml/env2yaml-amd64 b/logstash_8.15.4/env2yaml/env2yaml-amd64
similarity index 100%
rename from logstash_8.15.3/env2yaml/env2yaml-amd64
rename to logstash_8.15.4/env2yaml/env2yaml-amd64
diff --git a/logstash_8.15.3/env2yaml/env2yaml-arm64 b/logstash_8.15.4/env2yaml/env2yaml-arm64
similarity index 100%
rename from logstash_8.15.3/env2yaml/env2yaml-arm64
rename to logstash_8.15.4/env2yaml/env2yaml-arm64
diff --git a/logstash_8.15.3/pipeline/default.conf b/logstash_8.15.4/pipeline/default.conf
similarity index 100%
rename from logstash_8.15.3/pipeline/default.conf
rename to logstash_8.15.4/pipeline/default.conf

Relevant Maintainers:

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid a possible merge conflict and reduce the number of image update PRs, multiple version updates can be combined when they happen at the same time (like #17888)

LGTM

@yosifkit
Copy link
Member

Doh, I was worried that merging #17888 first might cause a merge conflict. Can you force push a rebase?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants