[8.13.2] Update ELK images #16698

navyau09 · 2024-04-30T18:17:21Z

Update elk images

LaurentGoderre · 2024-04-30T19:34:17Z

@navyau09 there is still the issue that using the arch commands gives the kernel architecture and not the container. It should be switched to using dpkg --print-architecture or apk --print-arch. As mentioned here: #16520 (comment)

github-actions · 2024-05-03T12:56:02Z

Diff for ca06f29:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index f0f7e19..3c9c122 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,10 +9,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
 
-Tags: 8.13.0
+Tags: 8.13.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.13
-GitCommit: 4269a02cf8a56844db30e5e74b23087840ee6fcb
+GitCommit: 66eb45c4940bc8a459f5f5a555c26e86bdde1a03
 
 
 # kibana
@@ -26,10 +26,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
 
-Tags: 8.13.0
+Tags: 8.13.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.13
-GitCommit: 4269a02cf8a56844db30e5e74b23087840ee6fcb
+GitCommit: 66eb45c4940bc8a459f5f5a555c26e86bdde1a03
 
 
 # logstash
@@ -43,7 +43,7 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 948af89c718b515fa24fa06f6a6890ed32e3b120
 
-Tags: 8.13.0
+Tags: 8.13.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.13
-GitCommit: 4269a02cf8a56844db30e5e74b23087840ee6fcb
+GitCommit: f58005ad6373665fb276cd5efea1499829ba17ae
diff --git a/_bashbrew-list b/_bashbrew-list
index 5d26f4d..600f854 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
 elasticsearch:7.17.21
-elasticsearch:8.13.0
+elasticsearch:8.13.2
 kibana:7.17.21
-kibana:8.13.0
+kibana:8.13.2
 logstash:7.17.21
-logstash:8.13.0
+logstash:8.13.2
diff --git a/elasticsearch_8.13.0/Dockerfile b/elasticsearch_8.13.2/Dockerfile
similarity index 94%
rename from elasticsearch_8.13.0/Dockerfile
rename to elasticsearch_8.13.2/Dockerfile
index 236a595..e7a4e7f 100644
--- a/elasticsearch_8.13.0/Dockerfile
+++ b/elasticsearch_8.13.2/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.13.0-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.13.2-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-03-22T03:35:46.757803203Z" \
+LABEL org.label-schema.build-date="2024-04-05T14:45:26.420424304Z" \
   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="09df99393193b2c53d92899662a8b8b3c55b45cd" \
+  org.label-schema.vcs-ref="16cc90cd2d08a3147ce02b07e50894bc060a4cbf" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.13.0" \
-  org.opencontainers.image.created="2024-03-22T03:35:46.757803203Z" \
+  org.label-schema.version="8.13.2" \
+  org.opencontainers.image.created="2024-04-05T14:45:26.420424304Z" \
   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="09df99393193b2c53d92899662a8b8b3c55b45cd" \
+  org.opencontainers.image.revision="16cc90cd2d08a3147ce02b07e50894bc060a4cbf" \
   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.13.0"
+  org.opencontainers.image.version="8.13.2"
 
 # 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.13.0/bin/docker-entrypoint.sh b/elasticsearch_8.13.2/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_8.13.0/bin/docker-entrypoint.sh
rename to elasticsearch_8.13.2/bin/docker-entrypoint.sh
diff --git a/elasticsearch_8.13.0/bin/docker-openjdk b/elasticsearch_8.13.2/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_8.13.0/bin/docker-openjdk
rename to elasticsearch_8.13.2/bin/docker-openjdk
diff --git a/elasticsearch_8.13.0/config/elasticsearch.yml b/elasticsearch_8.13.2/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_8.13.0/config/elasticsearch.yml
rename to elasticsearch_8.13.2/config/elasticsearch.yml
diff --git a/elasticsearch_8.13.0/config/log4j2.properties b/elasticsearch_8.13.2/config/log4j2.properties
similarity index 100%
rename from elasticsearch_8.13.0/config/log4j2.properties
rename to elasticsearch_8.13.2/config/log4j2.properties
diff --git a/kibana_8.13.0/Dockerfile b/kibana_8.13.2/Dockerfile
similarity index 91%
rename from kibana_8.13.0/Dockerfile
rename to kibana_8.13.2/Dockerfile
index 46da7c6..84d259c 100644
--- a/kibana_8.13.0/Dockerfile
+++ b/kibana_8.13.2/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.13.0-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-8.13.2-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-03-22T04:07:01.866Z" \
+LABEL org.label-schema.build-date="2024-04-05T16:08:08.397Z" \
   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="2e3a5cd43e835baa1d596b1aa54735992259ecb9" \
+  org.label-schema.vcs-ref="d4d06bdf0d1d5dcb4532f00d2cbaa83fc61bb877" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.13.0" \
-  org.opencontainers.image.created="2024-03-22T04:07:01.866Z" \
+  org.label-schema.version="8.13.2" \
+  org.opencontainers.image.created="2024-04-05T16:08:08.397Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="2e3a5cd43e835baa1d596b1aa54735992259ecb9" \
+  org.opencontainers.image.revision="d4d06bdf0d1d5dcb4532f00d2cbaa83fc61bb877" \
   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.13.0"
+  org.opencontainers.image.version="8.13.2"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.13.0/bin/kibana-docker b/kibana_8.13.2/bin/kibana-docker
similarity index 100%
rename from kibana_8.13.0/bin/kibana-docker
rename to kibana_8.13.2/bin/kibana-docker
diff --git a/kibana_8.13.0/config/kibana.yml b/kibana_8.13.2/config/kibana.yml
similarity index 100%
rename from kibana_8.13.0/config/kibana.yml
rename to kibana_8.13.2/config/kibana.yml
diff --git a/logstash_8.13.0/Dockerfile b/logstash_8.13.2/Dockerfile
similarity index 51%
rename from logstash_8.13.0/Dockerfile
rename to logstash_8.13.2/Dockerfile
index e04f34c..fdeee23 100644
--- a/logstash_8.13.0/Dockerfile
+++ b/logstash_8.13.2/Dockerfile
@@ -2,33 +4,30 @@
 FROM ubuntu:20.04
 
 RUN for iter in {1..10}; do \
-export DEBIAN_FRONTEND=noninteractive && \
+  export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y && \
 apt-get upgrade -y && \
-apt-get install -y procps findutils tar gzip curl && \
-apt-get install -y locales && \
+apt-get install -y procps findutils tar gzip && \
+  apt-get install -y locales && \
+  apt-get install -y curl && \
 apt-get clean all && \
-locale-gen 'en_US.UTF-8' && \
-apt-get clean metadata && \
+  locale-gen 'en_US.UTF-8' && \
+  apt-get clean metadata && \
 exit_code=0 && break || exit_code=$? && \
 echo "packaging error: retry $iter in 10s" && \
 apt-get clean all && \
-apt-get clean metadata && \
+  apt-get clean metadata && \
 sleep 10; done; \
 (exit $exit_code)
 
 # Provide a non-root user to run the process.
 RUN groupadd --gid 1000 logstash && \
-    adduser --uid 1000 --gid 1000 \
-    --home /usr/share/logstash --no-create-home \
-    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.13.0-linux-$(arch).tar.gz | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.3-linux-$(arch).tar.gz | \
   tar zxf - -C /usr/share && \
-    mv /usr/share/logstash-8.13.0 /usr/share/logstash && \
+  mv /usr/share/logstash-8.13.3 /usr/share/logstash && \
   chown --recursive logstash:logstash /usr/share/logstash/ && \
   chown -R logstash:root /usr/share/logstash && \
   chmod -R g=u /usr/share/logstash && \
@@ -46,14 +44,30 @@ ENV PATH=/usr/share/logstash/bin:$PATH
 # Provide a minimal configuration, so that simple invocations will provide
 # a good experience.
 COPY config/pipelines.yml config/pipelines.yml
-COPY config/logstash-full.yml config/logstash.yml
+  COPY config/logstash-full.yml config/logstash.yml
 COPY config/log4j2.properties config/
 COPY config/log4j2.file.properties config/
 COPY pipeline/default.conf pipeline/logstash.conf
+COPY env2yaml/env2yaml-amd64 env2yaml/
+COPY env2yaml/env2yaml-arm64 env2yaml/
+
 RUN chown --recursive logstash:root config/ pipeline/
 # Ensure Logstash gets the correct locale by default.
 ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
-COPY env2yaml/env2yaml /usr/local/bin/
+
+# Copy over the appropriate env2yaml artifact
+RUN env2yamlarch="$(dpkg --print-architecture)"; \
+  case "${env2yamlarch}" in \
+    'x86_64'|'amd64') \
+      env2yamlarch=amd64; \
+      ;; \
+    'aarch64'|'arm64') \
+      env2yamlarch=arm64; \
+      ;; \
+    *) echo >&2 "error: unsupported architecture '$env2yamlarch'"; exit 1 ;; \
+  esac; \
+  cp env2yaml/env2yaml-${env2yamlarch} /usr/local/bin/env2yaml; \
+  rm -rf env2yaml
 # Place the startup wrapper script.
 COPY bin/docker-entrypoint /usr/local/bin/
 
@@ -68,15 +83,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.13.0" \
-  org.opencontainers.image.version="8.13.0" \
+  org.label-schema.version="8.13.3" \
+  org.opencontainers.image.version="8.13.3" \
   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-03-21T09:15:34+00:00 \
-  org.opencontainers.image.created=2024-03-21T09:15:34+00:00
-
+  org.label-schema.build-date=2024-04-25T21:23:18+00:00 \
+  org.opencontainers.image.created=2024-04-25T21:23:18+00:00
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.13.0/bin/docker-entrypoint b/logstash_8.13.2/bin/docker-entrypoint
similarity index 100%
rename from logstash_8.13.0/bin/docker-entrypoint
rename to logstash_8.13.2/bin/docker-entrypoint
diff --git a/logstash_8.13.0/config/log4j2.file.properties b/logstash_8.13.2/config/log4j2.file.properties
similarity index 100%
rename from logstash_8.13.0/config/log4j2.file.properties
rename to logstash_8.13.2/config/log4j2.file.properties
diff --git a/logstash_8.13.0/config/log4j2.properties b/logstash_8.13.2/config/log4j2.properties
similarity index 100%
rename from logstash_8.13.0/config/log4j2.properties
rename to logstash_8.13.2/config/log4j2.properties
diff --git a/logstash_8.13.0/config/logstash-full.yml b/logstash_8.13.2/config/logstash-full.yml
similarity index 100%
rename from logstash_8.13.0/config/logstash-full.yml
rename to logstash_8.13.2/config/logstash-full.yml
diff --git a/logstash_8.13.0/config/pipelines.yml b/logstash_8.13.2/config/pipelines.yml
similarity index 100%
rename from logstash_8.13.0/config/pipelines.yml
rename to logstash_8.13.2/config/pipelines.yml
diff --git a/logstash_8.13.0/env2yaml/env2yaml b/logstash_8.13.2/env2yaml/env2yaml-amd64
similarity index 49%
copy from logstash_8.13.0/env2yaml/env2yaml
copy to logstash_8.13.2/env2yaml/env2yaml-amd64
index fc22245..1954371 100755
Binary files a/logstash_8.13.0/env2yaml/env2yaml and b/logstash_8.13.2/env2yaml/env2yaml-amd64 differ
diff --git a/logstash_8.13.0/env2yaml/env2yaml b/logstash_8.13.2/env2yaml/env2yaml-arm64
similarity index 32%
rename from logstash_8.13.0/env2yaml/env2yaml
rename to logstash_8.13.2/env2yaml/env2yaml-arm64
index fc22245..bfb4874 100755
Binary files a/logstash_8.13.0/env2yaml/env2yaml and b/logstash_8.13.2/env2yaml/env2yaml-arm64 differ
diff --git a/logstash_8.13.0/pipeline/default.conf b/logstash_8.13.2/pipeline/default.conf
similarity index 100%
rename from logstash_8.13.0/pipeline/default.conf
rename to logstash_8.13.2/pipeline/default.conf

Relevant Maintainers:

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

navyau09 · 2024-05-03T13:01:51Z

@LaurentGoderre Could you please verify again, if this looks good?

LaurentGoderre · 2024-05-06T13:43:43Z

@navyau09 Can we close #16697 in favor of this?

tianon · 2024-05-06T17:59:48Z

This is good for now, but please do revisit elastic/logstash#16063 (comment) (adding at the very least set -e to all semi-colon-using RUN lines, if not the full set -eux I suggest there).

tianon · 2024-05-06T18:01:21Z

-RUN \
- curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.0-linux-$(arch).tar.gz | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.3-linux-$(arch).tar.gz | \

Wait a minute, this is 8.13.3 but the tags are 8.13.2 - I think that's a mistake?

(We should also apply the same "avoiding arch in favor of querying the image userspace environment" logic to these lines, but they're pre-existing usage so I feel less strongly about enforcing that for now.)

LaurentGoderre · 2024-05-06T18:34:49Z

Good catch @tianon . It seems only logstash got the bump.

navyau09 · 2024-05-07T07:44:38Z

@tianon @LaurentGoderre Sorry for the confusion.

We have the tags updated for all the three images and this is the latest PR -#16710 with the right sha.

Please verify the latest one and then we can close both 8.13.1 and 8.13.2

Thanks

navyau09 added 2 commits April 30, 2024 23:38

Update elk images

c743150

Update elk images

b8526e8

navyau09 requested a review from a team as a code owner April 30, 2024 18:17

github-actions bot added library/elasticsearch library/kibana library/logstash labels Apr 30, 2024

This comment has been minimized.

Sign in to view

navyau09 mentioned this pull request Apr 30, 2024

Update ELK Images #16554

Closed

Update git commit

ca06f29

LaurentGoderre approved these changes May 6, 2024

View reviewed changes

LaurentGoderre closed this May 7, 2024

tianon mentioned this pull request May 9, 2024

Update ELK Images #16747

Merged

tianon mentioned this pull request Dec 3, 2024

Update ELK Images for 7.17.26 #18008

Merged

tianon mentioned this pull request Feb 18, 2025

Update ELK images for 9.0.0-beta1 #18475

Closed

tianon mentioned this pull request Mar 26, 2025

Update ELK images for 9.0.0-rc1 #18692

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[8.13.2] Update ELK images #16698

[8.13.2] Update ELK images #16698

navyau09 commented Apr 30, 2024

This comment has been minimized.

LaurentGoderre commented Apr 30, 2024

github-actions bot commented May 3, 2024

navyau09 commented May 3, 2024

LaurentGoderre commented May 6, 2024 •

edited

Loading

tianon commented May 6, 2024

tianon commented May 6, 2024

LaurentGoderre commented May 6, 2024

navyau09 commented May 7, 2024

[8.13.2] Update ELK images #16698

[8.13.2] Update ELK images #16698

Conversation

navyau09 commented Apr 30, 2024

This comment has been minimized.

LaurentGoderre commented Apr 30, 2024

github-actions bot commented May 3, 2024

navyau09 commented May 3, 2024

LaurentGoderre commented May 6, 2024 • edited Loading

tianon commented May 6, 2024

tianon commented May 6, 2024

LaurentGoderre commented May 6, 2024

navyau09 commented May 7, 2024

LaurentGoderre commented May 6, 2024 •

edited

Loading