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 #17119

Merged

Conversation

elasticmachine
Copy link
Contributor

Update ELK Images

Copy link

github-actions bot commented Jul 4, 2024

Diff for bcfe78e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a148d18..2a7587c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,10 +9,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
-Tags: 8.14.1
+Tags: 8.14.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.14
-GitCommit: 69af7042cfc0b32c0d9de82110f15ff8dd74ded8
+GitCommit: 6a774f1d36237237d5eda06004226f05ef409bf7
 
 
 # kibana
@@ -26,10 +26,10 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
-Tags: 8.14.1
+Tags: 8.14.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.14
-GitCommit: 69af7042cfc0b32c0d9de82110f15ff8dd74ded8
+GitCommit: 6a774f1d36237237d5eda06004226f05ef409bf7
 
 
 # logstash
@@ -43,7 +43,7 @@ Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
 GitCommit: 1f54f19c85034114800de30ef9929c9b52947ffb
 
-Tags: 8.14.1
+Tags: 8.14.2
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/8.14
-GitCommit: 69af7042cfc0b32c0d9de82110f15ff8dd74ded8
+GitCommit: 6a774f1d36237237d5eda06004226f05ef409bf7
diff --git a/_bashbrew-list b/_bashbrew-list
index 5131564..5e7bb40 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
 elasticsearch:7.17.22
-elasticsearch:8.14.1
+elasticsearch:8.14.2
 kibana:7.17.22
-kibana:8.14.1
+kibana:8.14.2
 logstash:7.17.22
-logstash:8.14.1
+logstash:8.14.2
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5131564..5e7bb40 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 elasticsearch:7.17.22
-elasticsearch:8.14.1
+elasticsearch:8.14.2
 kibana:7.17.22
-kibana:8.14.1
+kibana:8.14.2
 logstash:7.17.22
-logstash:8.14.1
+logstash:8.14.2
diff --git a/elasticsearch_8.14.1/Dockerfile b/elasticsearch_8.14.2/Dockerfile
similarity index 94%
rename from elasticsearch_8.14.1/Dockerfile
rename to elasticsearch_8.14.2/Dockerfile
index 8521433..e5bf4da 100644
--- a/elasticsearch_8.14.1/Dockerfile
+++ b/elasticsearch_8.14.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.14.1-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.14.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-06-10T23:35:17.114581191Z" \
+LABEL org.label-schema.build-date="2024-07-01T22:06:58.515911606Z" \
   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="93a57a1a76f556d8aee6a90d1a95b06187501310" \
+  org.label-schema.vcs-ref="2afe7caceec8a26ff53817e5ed88235e90592a1b" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.14.1" \
-  org.opencontainers.image.created="2024-06-10T23:35:17.114581191Z" \
+  org.label-schema.version="8.14.2" \
+  org.opencontainers.image.created="2024-07-01T22:06:58.515911606Z" \
   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="93a57a1a76f556d8aee6a90d1a95b06187501310" \
+  org.opencontainers.image.revision="2afe7caceec8a26ff53817e5ed88235e90592a1b" \
   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.14.1"
+  org.opencontainers.image.version="8.14.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.14.1/bin/docker-entrypoint.sh b/elasticsearch_8.14.2/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_8.14.1/bin/docker-entrypoint.sh
rename to elasticsearch_8.14.2/bin/docker-entrypoint.sh
diff --git a/elasticsearch_8.14.1/bin/docker-openjdk b/elasticsearch_8.14.2/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_8.14.1/bin/docker-openjdk
rename to elasticsearch_8.14.2/bin/docker-openjdk
diff --git a/elasticsearch_8.14.1/config/elasticsearch.yml b/elasticsearch_8.14.2/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_8.14.1/config/elasticsearch.yml
rename to elasticsearch_8.14.2/config/elasticsearch.yml
diff --git a/elasticsearch_8.14.1/config/log4j2.properties b/elasticsearch_8.14.2/config/log4j2.properties
similarity index 100%
rename from elasticsearch_8.14.1/config/log4j2.properties
rename to elasticsearch_8.14.2/config/log4j2.properties
diff --git a/kibana_8.14.1/Dockerfile b/kibana_8.14.2/Dockerfile
similarity index 91%
rename from kibana_8.14.1/Dockerfile
rename to kibana_8.14.2/Dockerfile
index 26cc877..333e537 100644
--- a/kibana_8.14.1/Dockerfile
+++ b/kibana_8.14.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.14.1-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-8.14.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-06-11T00:21:28.765Z" \
+LABEL org.label-schema.build-date="2024-07-01T18:11:39.861Z" \
   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="afbd904e868f2a48a2bbeb8ff20baee8d4aeb468" \
+  org.label-schema.vcs-ref="50d89958910ab6fa9b8c4f4f40c53e89ad6dbbe1" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="8.14.1" \
-  org.opencontainers.image.created="2024-06-11T00:21:28.765Z" \
+  org.label-schema.version="8.14.2" \
+  org.opencontainers.image.created="2024-07-01T18:11:39.861Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="afbd904e868f2a48a2bbeb8ff20baee8d4aeb468" \
+  org.opencontainers.image.revision="50d89958910ab6fa9b8c4f4f40c53e89ad6dbbe1" \
   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.14.1"
+  org.opencontainers.image.version="8.14.2"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.14.1/bin/kibana-docker b/kibana_8.14.2/bin/kibana-docker
similarity index 99%
rename from kibana_8.14.1/bin/kibana-docker
rename to kibana_8.14.2/bin/kibana-docker
index 64f94ae..a82b87c 100755
--- a/kibana_8.14.1/bin/kibana-docker
+++ b/kibana_8.14.2/bin/kibana-docker
@@ -117,6 +117,7 @@ kibana_vars=(
     monitoring.cluster_alerts.email_notifications.email_address
     monitoring.kibana.collection.enabled
     monitoring.kibana.collection.interval
+    monitoring.ui.ccs.enabled
     monitoring.ui.container.elasticsearch.enabled
     monitoring.ui.container.logstash.enabled
     monitoring.ui.elasticsearch.hosts
@@ -360,6 +361,7 @@ kibana_vars=(
     xpack.reporting.roles.allow
     xpack.reporting.roles.enabled
     xpack.ruleRegistry.write.enabled
+    xpack.screenshotting.browser.chromium.disableSandbox
     xpack.security.accessAgreement.message
     xpack.security.audit.appender.fileName
     xpack.security.audit.appender.layout.highlight
diff --git a/kibana_8.14.1/config/kibana.yml b/kibana_8.14.2/config/kibana.yml
similarity index 100%
rename from kibana_8.14.1/config/kibana.yml
rename to kibana_8.14.2/config/kibana.yml
diff --git a/logstash_8.14.1/Dockerfile b/logstash_8.14.2/Dockerfile
similarity index 91%
rename from logstash_8.14.1/Dockerfile
rename to logstash_8.14.2/Dockerfile
index c8aaf79..7b9c842 100644
--- a/logstash_8.14.1/Dockerfile
+++ b/logstash_8.14.2/Dockerfile
@@ -25,9 +25,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.14.1-linux-$(arch).tar.gz | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.14.2-linux-$(arch).tar.gz | \
   tar zxf - -C /usr/share && \
-  mv /usr/share/logstash-8.14.1 /usr/share/logstash && \
+  mv /usr/share/logstash-8.14.2 /usr/share/logstash && \
   chown --recursive logstash:logstash /usr/share/logstash/ && \
   chown -R logstash:root /usr/share/logstash && \
   chmod -R g=u /usr/share/logstash && \
@@ -80,14 +80,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.14.1" \
-  org.opencontainers.image.version="8.14.1" \
+  org.label-schema.version="8.14.2" \
+  org.opencontainers.image.version="8.14.2" \
   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-06-10T18:33:17+00:00 \
-  org.opencontainers.image.created=2024-06-10T18:33:17+00:00
+  org.label-schema.build-date=2024-06-27T16:49:00+00:00 \
+  org.opencontainers.image.created=2024-06-27T16:49:00+00:00
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.14.1/bin/docker-entrypoint b/logstash_8.14.2/bin/docker-entrypoint
similarity index 100%
rename from logstash_8.14.1/bin/docker-entrypoint
rename to logstash_8.14.2/bin/docker-entrypoint
diff --git a/logstash_8.14.1/config/log4j2.file.properties b/logstash_8.14.2/config/log4j2.file.properties
similarity index 100%
rename from logstash_8.14.1/config/log4j2.file.properties
rename to logstash_8.14.2/config/log4j2.file.properties
diff --git a/logstash_8.14.1/config/log4j2.properties b/logstash_8.14.2/config/log4j2.properties
similarity index 100%
rename from logstash_8.14.1/config/log4j2.properties
rename to logstash_8.14.2/config/log4j2.properties
diff --git a/logstash_8.14.1/config/logstash-full.yml b/logstash_8.14.2/config/logstash-full.yml
similarity index 100%
rename from logstash_8.14.1/config/logstash-full.yml
rename to logstash_8.14.2/config/logstash-full.yml
diff --git a/logstash_8.14.1/config/pipelines.yml b/logstash_8.14.2/config/pipelines.yml
similarity index 100%
rename from logstash_8.14.1/config/pipelines.yml
rename to logstash_8.14.2/config/pipelines.yml
diff --git a/logstash_8.14.1/env2yaml/env2yaml-amd64 b/logstash_8.14.2/env2yaml/env2yaml-amd64
similarity index 100%
rename from logstash_8.14.1/env2yaml/env2yaml-amd64
rename to logstash_8.14.2/env2yaml/env2yaml-amd64
diff --git a/logstash_8.14.1/env2yaml/env2yaml-arm64 b/logstash_8.14.2/env2yaml/env2yaml-arm64
similarity index 100%
rename from logstash_8.14.1/env2yaml/env2yaml-arm64
rename to logstash_8.14.2/env2yaml/env2yaml-arm64
diff --git a/logstash_8.14.1/pipeline/default.conf b/logstash_8.14.2/pipeline/default.conf
similarity index 100%
rename from logstash_8.14.1/pipeline/default.conf
rename to logstash_8.14.2/pipeline/default.conf

Relevant Maintainers:

@watson
Copy link

watson commented Jul 4, 2024

We need someone else to be the contact person for Kibana as I no longer work for Elastic

@tianon
Copy link
Member

tianon commented Jul 5, 2024

Thanks ❤️

@mark-vieira @jsvd any idea who we should swap to? also, any thoughts why all three images failed to build in the CI smoke test?

@jbudz
Copy link
Contributor

jbudz commented Jul 5, 2024

@tianon I spoke with @jsvd, I can take this over. Is updating

Maintainers: Thomas Watson (@watson)
GitRepo: https://github.com/elastic/dockerfiles.git
Directory: kibana
Builder: buildkit
sufficient for automation?

@tianon
Copy link
Member

tianon commented Jul 5, 2024

That's fine/sufficient for our side, but you'll probably want to double check with whoever maintains @elasticmachine that it doesn't have a template somewhere that needs to be updated as well 😄 ❤️

@jbudz
Copy link
Contributor

jbudz commented Jul 8, 2024

Thanks! I reached out internally, I'll circle back when I get a response.

jbudz added a commit to jbudz/official-images that referenced this pull request Jul 8, 2024
@jbudz jbudz mentioned this pull request Jul 8, 2024
@jmlrt
Copy link
Contributor

jmlrt commented Jul 8, 2024

👋🏻 @tianon Test PR errors look transient. Can you re-run them 🙏🏻

@whalelines
Copy link
Contributor

Failed jobs have been restarted…

@whalelines
Copy link
Contributor

Everything passed this time

@tianon tianon merged commit 53469cc into docker-library:master Jul 8, 2024
11 checks passed
@jbudz jbudz mentioned this pull request Jul 11, 2024
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.

6 participants