-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.5 #17976
Merged
Merged
Update ELK Images for 8.15.5 #17976
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for b6b8c1a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2df44af..ef85ed5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,10 +9,10 @@ Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
-Tags: 8.15.4
+Tags: 8.15.5
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.15
-GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
+GitCommit: 000ec0794972a956614bdb904bafdb92cb84dfbe
Tags: 8.16.1
Architectures: amd64, arm64v8
@@ -31,10 +31,10 @@ Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
-Tags: 8.15.4
+Tags: 8.15.5
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.15
-GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
+GitCommit: 000ec0794972a956614bdb904bafdb92cb84dfbe
Tags: 8.16.1
Architectures: amd64, arm64v8
@@ -53,10 +53,10 @@ Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
-Tags: 8.15.4
+Tags: 8.15.5
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.15
-GitCommit: 2ead1ff2522226005f77bb65ebb2c7a09e18700a
+GitCommit: 000ec0794972a956614bdb904bafdb92cb84dfbe
Tags: 8.16.1
Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index d64d11e..c4bd337 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
elasticsearch:7.17.25
-elasticsearch:8.15.4
+elasticsearch:8.15.5
elasticsearch:8.16.1
kibana:7.17.25
-kibana:8.15.4
+kibana:8.15.5
kibana:8.16.1
logstash:7.17.25
-logstash:8.15.4
+logstash:8.15.5
logstash:8.16.1
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d64d11e..c4bd337 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
elasticsearch:7.17.25
-elasticsearch:8.15.4
+elasticsearch:8.15.5
elasticsearch:8.16.1
kibana:7.17.25
-kibana:8.15.4
+kibana:8.15.5
kibana:8.16.1
logstash:7.17.25
-logstash:8.15.4
+logstash:8.15.5
logstash:8.16.1
diff --git a/elasticsearch_8.15.4/Dockerfile b/elasticsearch_8.15.5/Dockerfile
similarity index 94%
rename from elasticsearch_8.15.4/Dockerfile
rename to elasticsearch_8.15.5/Dockerfile
index c5c4938..fed051e 100644
--- a/elasticsearch_8.15.4/Dockerfile
+++ b/elasticsearch_8.15.5/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.4-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.5-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-11-07T09:35:45.535387784Z" \
+LABEL org.label-schema.build-date="2024-11-21T22:06:13.985834967Z" \
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="4ec7e3608de63c104724277ebfa8dc7b84685f48" \
+ org.label-schema.vcs-ref="b10896bcfe167cce44a84ba2771d101fb596d40d" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.15.4" \
- org.opencontainers.image.created="2024-11-07T09:35:45.535387784Z" \
+ org.label-schema.version="8.15.5" \
+ org.opencontainers.image.created="2024-11-21T22:06:13.985834967Z" \
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="4ec7e3608de63c104724277ebfa8dc7b84685f48" \
+ org.opencontainers.image.revision="b10896bcfe167cce44a84ba2771d101fb596d40d" \
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.4"
+ org.opencontainers.image.version="8.15.5"
# 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.4/bin/docker-entrypoint.sh b/elasticsearch_8.15.5/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_8.15.4/bin/docker-entrypoint.sh
rename to elasticsearch_8.15.5/bin/docker-entrypoint.sh
diff --git a/elasticsearch_8.15.4/bin/docker-openjdk b/elasticsearch_8.15.5/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_8.15.4/bin/docker-openjdk
rename to elasticsearch_8.15.5/bin/docker-openjdk
diff --git a/elasticsearch_8.15.4/config/elasticsearch.yml b/elasticsearch_8.15.5/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_8.15.4/config/elasticsearch.yml
rename to elasticsearch_8.15.5/config/elasticsearch.yml
diff --git a/elasticsearch_8.15.4/config/log4j2.properties b/elasticsearch_8.15.5/config/log4j2.properties
similarity index 100%
rename from elasticsearch_8.15.4/config/log4j2.properties
rename to elasticsearch_8.15.5/config/log4j2.properties
diff --git a/kibana_8.15.4/Dockerfile b/kibana_8.15.5/Dockerfile
similarity index 92%
rename from kibana_8.15.4/Dockerfile
rename to kibana_8.15.5/Dockerfile
index 1a57235..6a6877a 100644
--- a/kibana_8.15.4/Dockerfile
+++ b/kibana_8.15.5/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.4-linux-$(arch).tar.gz && \
+ https://artifacts.elastic.co/downloads/kibana/kibana-8.15.5-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-11-06T19:12:41.867Z" \
+LABEL org.label-schema.build-date="2024-11-21T19:13:27.003Z" \
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="79d00ab0a960bc3594ebf8d96c7523673b84e745" \
+ org.label-schema.vcs-ref="5454456a21f37f1af07df030c56a2953ad33f999" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.15.4" \
- org.opencontainers.image.created="2024-11-06T19:12:41.867Z" \
+ org.label-schema.version="8.15.5" \
+ org.opencontainers.image.created="2024-11-21T19:13:27.003Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
- org.opencontainers.image.revision="79d00ab0a960bc3594ebf8d96c7523673b84e745" \
+ org.opencontainers.image.revision="5454456a21f37f1af07df030c56a2953ad33f999" \
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.4"
+ org.opencontainers.image.version="8.15.5"
ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.15.4/bin/kibana-docker b/kibana_8.15.5/bin/kibana-docker
similarity index 100%
rename from kibana_8.15.4/bin/kibana-docker
rename to kibana_8.15.5/bin/kibana-docker
diff --git a/kibana_8.15.4/config/kibana.yml b/kibana_8.15.5/config/kibana.yml
similarity index 100%
rename from kibana_8.15.4/config/kibana.yml
rename to kibana_8.15.5/config/kibana.yml
diff --git a/logstash_8.15.4/env2yaml/env2yaml-amd64 b/logstash_8.15.4/env2yaml/env2yaml-amd64
deleted file mode 100755
index 93e92dd..0000000
diff --git a/logstash_8.15.4/env2yaml/env2yaml-arm64 b/logstash_8.15.4/env2yaml/env2yaml-arm64
deleted file mode 100755
index e06d319..0000000
diff --git a/logstash_8.15.4/Dockerfile b/logstash_8.15.5/Dockerfile
similarity index 91%
rename from logstash_8.15.4/Dockerfile
rename to logstash_8.15.5/Dockerfile
index 3f877d0..056fdf7 100644
--- a/logstash_8.15.4/Dockerfile
+++ b/logstash_8.15.5/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.4-linux-$(arch).tar.gz | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.15.5-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
- mv /usr/share/logstash-8.15.4 /usr/share/logstash && \
+ mv /usr/share/logstash-8.15.5 /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.4" \
- org.opencontainers.image.version="8.15.4" \
+ org.label-schema.version="8.15.5" \
+ org.opencontainers.image.version="8.15.5" \
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-11-06T19:09:26+00:00 \
- org.opencontainers.image.created=2024-11-06T19:09:26+00:00
+ org.label-schema.build-date=2024-11-21T16:16:23+00:00 \
+ org.opencontainers.image.created=2024-11-21T16:16:23+00:00
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.15.4/bin/docker-entrypoint b/logstash_8.15.5/bin/docker-entrypoint
similarity index 100%
rename from logstash_8.15.4/bin/docker-entrypoint
rename to logstash_8.15.5/bin/docker-entrypoint
diff --git a/logstash_8.15.4/config/log4j2.file.properties b/logstash_8.15.5/config/log4j2.file.properties
similarity index 100%
rename from logstash_8.15.4/config/log4j2.file.properties
rename to logstash_8.15.5/config/log4j2.file.properties
diff --git a/logstash_8.15.4/config/log4j2.properties b/logstash_8.15.5/config/log4j2.properties
similarity index 100%
rename from logstash_8.15.4/config/log4j2.properties
rename to logstash_8.15.5/config/log4j2.properties
diff --git a/logstash_8.15.4/config/logstash-full.yml b/logstash_8.15.5/config/logstash-full.yml
similarity index 100%
rename from logstash_8.15.4/config/logstash-full.yml
rename to logstash_8.15.5/config/logstash-full.yml
diff --git a/logstash_8.15.4/config/pipelines.yml b/logstash_8.15.5/config/pipelines.yml
similarity index 100%
rename from logstash_8.15.4/config/pipelines.yml
rename to logstash_8.15.5/config/pipelines.yml
diff --git a/logstash_8.16.1/env2yaml/env2yaml-amd64 b/logstash_8.15.5/env2yaml/env2yaml-amd64
similarity index 100%
copy from logstash_8.16.1/env2yaml/env2yaml-amd64
copy to logstash_8.15.5/env2yaml/env2yaml-amd64
diff --git a/logstash_8.16.1/env2yaml/env2yaml-arm64 b/logstash_8.15.5/env2yaml/env2yaml-arm64
similarity index 100%
copy from logstash_8.16.1/env2yaml/env2yaml-arm64
copy to logstash_8.15.5/env2yaml/env2yaml-arm64
diff --git a/logstash_8.15.4/pipeline/default.conf b/logstash_8.15.5/pipeline/default.conf
similarity index 100%
rename from logstash_8.15.4/pipeline/default.conf
rename to logstash_8.15.5/pipeline/default.conf Relevant Maintainers:
|
tianon
approved these changes
Nov 26, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update looks fine -- revisiting #17158 (comment) (and the comment link chain) would still be a good idea though. 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.