From a961fa336f61a3fac6785474300267173f9c56c7 Mon Sep 17 00:00:00 2001 From: sebp Date: Sat, 10 Aug 2024 17:54:50 +0200 Subject: [PATCH] update ELK to version OSS 8.15.0 --- Dockerfile | 17 +++-------------- README-short.txt | 6 +----- README.md | 10 ++-------- nginx-filebeat/Dockerfile | 14 +++++--------- 4 files changed, 11 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index f05349c6..817fcf29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,5 @@ # Dockerfile for ELK stack -<<<<<<< HEAD -# Elasticsearch, Logstash, Kibana 8.14.1 -======= -# Elasticsearch, Logstash, Kibana OSS 8.14.2 ->>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144 +# Elasticsearch, Logstash, Kibana OSS 8.15.0 # Build with: # docker build -t /elk . @@ -37,17 +33,10 @@ RUN set -x \ ### set current package version -<<<<<<< HEAD -ARG ELK_VERSION=8.14.1 +ARG ELK_VERSION=oss-8.15.0 # base version (i.e. remove OSS prefix) for Elasticsearch and Kibana (no OSS version since 7.11.0) -ARG ELK_BASE_VERSION=8.14.1 -======= -ARG ELK_VERSION=oss-8.14.2 - -# base version (i.e. remove OSS prefix) for Elasticsearch and Kibana (no OSS version since 7.11.0) -ARG ELK_BASE_VERSION=8.14.2 ->>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144 +ARG ELK_BASE_VERSION=8.15.0 # replace with aarch64 for ARM64 systems ARG ARCH=x86_64 diff --git a/README-short.txt b/README-short.txt index b7af70e3..52013dd0 100644 --- a/README-short.txt +++ b/README-short.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Collect, search and visualise log data with ELK (Elasticsearch 8.14.1, Logstash 8.14.1, Kibana 8.14.1). -======= -Collect, search and visualise log data with ELK (Elasticsearch OSS 8.14.2, Logstash OSS 8.14.2, Kibana OSS 8.14.2). ->>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144 +Collect, search and visualise log data with ELK (Elasticsearch OSS 8.15.0, Logstash OSS 8.15.0, Kibana OSS 8.15.0). diff --git a/README.md b/README.md index 971f1cb7..aef79f2f 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,9 @@ This image is hosted on Docker Hub at [https://hub.docker.com/r/sebp/elk/](https The following tags are available: -<<<<<<< HEAD -- `latest`, `8.14.1`: ELK 8.14.1. +- `latest`, `oss-8.15.0`: ELK OSS 8.15.0. -- `oss-8.14.1` (ELK OSS 8.14.1), `8.14.0` (8.14.0), `oss-8.14.0` (OSS 8.14.0), `8.13.4` (8.13.4), `oss-8.13.4` (OSS 8.13.4), `8.13.3` (8.13.3), `oss-8.13.3` (OSS 8.13.3), `8.13.2` (8.13.2), `oss-8.13.2` (OSS 8.13.2), `8.13.1` (8.13.1), `oss-8.13.1` (OSS 8.13.1), `8.13.0` (8.13.0), `oss-8.13.0` (OSS 8.13.0), `8.12.2` (8.12.2), `oss-8.12.2` (OSS 8.12.2), `8.12.1` (8.12.1), `oss-8.12.1` (OSS 8.12.1), `8.12.0` (8.12.0), `oss-8.12.0` (OSS 8.12.0), `8.11.4` (8.11.4), `oss-8.11.4` (OSS 8.11.4), `8.11.3` (8.11.3), `oss-8.11.3` (OSS 8.11.3), `8.11.2` (8.11.2), `oss-8.11.2` (OSS 8.11.2), `8.11.1` (8.11.1), `oss-8.11.1` (OSS 8.11.1), `8.10.4` (8.10.4), `oss-8.10.4` (OSS 8.10.4), `8.9.2` (8.9.2), `oss-8.9.2` (OSS 8.9.2), `8.9.1` (8.9.1), `oss-8.9.1` (OSS 8.9.1), `8.9.0` (8.9.0), `oss-8.9.0` (OSS 8.9.0), `8.8.2` (8.8.2), `oss-8.8.2` (OSS 8.8.2), `8.8.1` (8.8.1), `oss-8.8.1` (OSS 8.8.1), `8.8.0` (8.8.0), `oss-8.8.0` (OSS 8.8.0), `8.7.1` (8.7.1), `oss-8.7.1` (OSS 8.7.1), `8.7.0` (8.7.0), `oss-8.7.0` (OSS 8.7.0), `8.6.2` (8.6.2), `oss-8.6.2` (OSS 8.6.2), `8.6.1` (8.6.1), `oss-8.6.1` (OSS 8.6.1), `8.6.0` (8.6.0), `oss-8.6.0` (OSS 8.6.0), `8.5.3` (8.5.3), `oss-8.5.3` (OSS 8.5.3), `8.5.2` (8.5.2), `oss-8.5.2` (OSS 8.5.2), `8.5.1` (8.5.1), `oss-8.5.1` (OSS 8.5.1), `8.5.0` (8.5.0), `oss-8.5.0` (OSS 8.5.0), `8.4.3` (8.4.3), `oss-8.4.3` (OSS 8.4.3), `8.4.2` (8.4.2), `oss-8.4.2` (OSS 8.4.2), `8.4.1` (8.4.1), `oss-8.4.1` (OSS 8.4.1), `8.4.0` (8.4.0), `oss-8.4.0` (OSS 8.4.0), `8.3.3` (8.3.3), `oss-8.3.3` (OSS 8.3.3), `8.3.2` (8.3.2), `oss-8.3.2` (OSS 8.3.2), `8.3.1` (8.3.1), `oss-8.3.1` (OSS 8.3.1), `8.3.0` (8.3.0), `oss-8.3.0` (OSS 8.3.0), `8.2.3` (8.2.3), `oss-8.2.3` (OSS 8.2.3), `8.2.2` (8.2.2), `oss-8.2.2` (OSS 8.2.2), `8.2.1` (8.2.1), `oss-8.2.1` (OSS 8.2.1), `8.2.0` (8.2.0), `oss-8.2.0` (OSS 8.2.0), `8.1.3` (8.1.3), `oss-8.1.3` (OSS 8.1.3), `8.1.2` (8.1.2), `oss-8.1.2` (OSS 8.1.2), `8.1.1` (8.1.1), `oss-8.1.1` (OSS 8.1.1), `8.1.0` (8.1.0), `oss-8.1.0` (OSS 8.1.0), `8.0.1` (8.0.1), `oss-8.0.1` (OSS 8.0.1), `8.0.0` (8.0.0), `oss-8.0.0` (OSS 8.0.0). -======= -- `latest`, `oss-8.14.2`: ELK OSS 8.14.2. - -- `8.14.1` (ELK 8.14.1), `oss-8.14.1` (OSS 8.14.1), `8.14.0` (8.14.0), `oss-8.14.0` (OSS 8.14.0), `8.13.4` (8.13.4), `oss-8.13.4` (OSS 8.13.4), `8.13.3` (8.13.3), `oss-8.13.3` (OSS 8.13.3), `8.13.2` (8.13.2), `oss-8.13.2` (OSS 8.13.2), `8.13.1` (8.13.1), `oss-8.13.1` (OSS 8.13.1), `8.13.0` (8.13.0), `oss-8.13.0` (OSS 8.13.0), `8.12.2` (8.12.2), `oss-8.12.2` (OSS 8.12.2), `8.12.1` (8.12.1), `oss-8.12.1` (OSS 8.12.1), `8.12.0` (8.12.0), `oss-8.12.0` (OSS 8.12.0), `8.11.4` (8.11.4), `oss-8.11.4` (OSS 8.11.4), `8.11.3` (8.11.3), `oss-8.11.3` (OSS 8.11.3), `8.11.2` (8.11.2), `oss-8.11.2` (OSS 8.11.2), `8.11.1` (8.11.1), `oss-8.11.1` (OSS 8.11.1), `8.10.4` (8.10.4), `oss-8.10.4` (OSS 8.10.4), `8.9.2` (8.9.2), `oss-8.9.2` (OSS 8.9.2), `8.9.1` (8.9.1), `oss-8.9.1` (OSS 8.9.1), `8.9.0` (8.9.0), `oss-8.9.0` (OSS 8.9.0), `8.8.2` (8.8.2), `oss-8.8.2` (OSS 8.8.2), `8.8.1` (8.8.1), `oss-8.8.1` (OSS 8.8.1), `8.8.0` (8.8.0), `oss-8.8.0` (OSS 8.8.0), `8.7.1` (8.7.1), `oss-8.7.1` (OSS 8.7.1), `8.7.0` (8.7.0), `oss-8.7.0` (OSS 8.7.0), `8.6.2` (8.6.2), `oss-8.6.2` (OSS 8.6.2), `8.6.1` (8.6.1), `oss-8.6.1` (OSS 8.6.1), `8.6.0` (8.6.0), `oss-8.6.0` (OSS 8.6.0), `8.5.3` (8.5.3), `oss-8.5.3` (OSS 8.5.3), `8.5.2` (8.5.2), `oss-8.5.2` (OSS 8.5.2), `8.5.1` (8.5.1), `oss-8.5.1` (OSS 8.5.1), `8.5.0` (8.5.0), `oss-8.5.0` (OSS 8.5.0), `8.4.3` (8.4.3), `oss-8.4.3` (OSS 8.4.3), `8.4.2` (8.4.2), `oss-8.4.2` (OSS 8.4.2), `8.4.1` (8.4.1), `oss-8.4.1` (OSS 8.4.1), `8.4.0` (8.4.0), `oss-8.4.0` (OSS 8.4.0), `8.3.3` (8.3.3), `oss-8.3.3` (OSS 8.3.3), `8.3.2` (8.3.2), `oss-8.3.2` (OSS 8.3.2), `8.3.1` (8.3.1), `oss-8.3.1` (OSS 8.3.1), `8.3.0` (8.3.0), `oss-8.3.0` (OSS 8.3.0), `8.2.3` (8.2.3), `oss-8.2.3` (OSS 8.2.3), `8.2.2` (8.2.2), `oss-8.2.2` (OSS 8.2.2), `8.2.1` (8.2.1), `oss-8.2.1` (OSS 8.2.1), `8.2.0` (8.2.0), `oss-8.2.0` (OSS 8.2.0), `8.1.3` (8.1.3), `oss-8.1.3` (OSS 8.1.3), `8.1.2` (8.1.2), `oss-8.1.2` (OSS 8.1.2), `8.1.1` (8.1.1), `oss-8.1.1` (OSS 8.1.1), `8.1.0` (8.1.0), `oss-8.1.0` (OSS 8.1.0), `8.0.1` (8.0.1), `oss-8.0.1` (OSS 8.0.1), `8.0.0` (8.0.0), `oss-8.0.0` (OSS 8.0.0). ->>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144 +- `8.14.3` (ELK 8.14.3), `8.14.1` (8.14.1), `oss-8.14.1` (OSS 8.14.1), `8.14.0` (8.14.0), `oss-8.14.0` (OSS 8.14.0), `8.13.4` (8.13.4), `oss-8.13.4` (OSS 8.13.4), `8.13.3` (8.13.3), `oss-8.13.3` (OSS 8.13.3), `8.13.2` (8.13.2), `oss-8.13.2` (OSS 8.13.2), `8.13.1` (8.13.1), `oss-8.13.1` (OSS 8.13.1), `8.13.0` (8.13.0), `oss-8.13.0` (OSS 8.13.0), `8.12.2` (8.12.2), `oss-8.12.2` (OSS 8.12.2), `8.12.1` (8.12.1), `oss-8.12.1` (OSS 8.12.1), `8.12.0` (8.12.0), `oss-8.12.0` (OSS 8.12.0), `8.11.4` (8.11.4), `oss-8.11.4` (OSS 8.11.4), `8.11.3` (8.11.3), `oss-8.11.3` (OSS 8.11.3), `8.11.2` (8.11.2), `oss-8.11.2` (OSS 8.11.2), `8.11.1` (8.11.1), `oss-8.11.1` (OSS 8.11.1), `8.10.4` (8.10.4), `oss-8.10.4` (OSS 8.10.4), `8.9.2` (8.9.2), `oss-8.9.2` (OSS 8.9.2), `8.9.1` (8.9.1), `oss-8.9.1` (OSS 8.9.1), `8.9.0` (8.9.0), `oss-8.9.0` (OSS 8.9.0), `8.8.2` (8.8.2), `oss-8.8.2` (OSS 8.8.2), `8.8.1` (8.8.1), `oss-8.8.1` (OSS 8.8.1), `8.8.0` (8.8.0), `oss-8.8.0` (OSS 8.8.0), `8.7.1` (8.7.1), `oss-8.7.1` (OSS 8.7.1), `8.7.0` (8.7.0), `oss-8.7.0` (OSS 8.7.0), `8.6.2` (8.6.2), `oss-8.6.2` (OSS 8.6.2), `8.6.1` (8.6.1), `oss-8.6.1` (OSS 8.6.1), `8.6.0` (8.6.0), `oss-8.6.0` (OSS 8.6.0), `8.5.3` (8.5.3), `oss-8.5.3` (OSS 8.5.3), `8.5.2` (8.5.2), `oss-8.5.2` (OSS 8.5.2), `8.5.1` (8.5.1), `oss-8.5.1` (OSS 8.5.1), `8.5.0` (8.5.0), `oss-8.5.0` (OSS 8.5.0), `8.4.3` (8.4.3), `oss-8.4.3` (OSS 8.4.3), `8.4.2` (8.4.2), `oss-8.4.2` (OSS 8.4.2), `8.4.1` (8.4.1), `oss-8.4.1` (OSS 8.4.1), `8.4.0` (8.4.0), `oss-8.4.0` (OSS 8.4.0), `8.3.3` (8.3.3), `oss-8.3.3` (OSS 8.3.3), `8.3.2` (8.3.2), `oss-8.3.2` (OSS 8.3.2), `8.3.1` (8.3.1), `oss-8.3.1` (OSS 8.3.1), `8.3.0` (8.3.0), `oss-8.3.0` (OSS 8.3.0), `8.2.3` (8.2.3), `oss-8.2.3` (OSS 8.2.3), `8.2.2` (8.2.2), `oss-8.2.2` (OSS 8.2.2), `8.2.1` (8.2.1), `oss-8.2.1` (OSS 8.2.1), `8.2.0` (8.2.0), `oss-8.2.0` (OSS 8.2.0), `8.1.3` (8.1.3), `oss-8.1.3` (OSS 8.1.3), `8.1.2` (8.1.2), `oss-8.1.2` (OSS 8.1.2), `8.1.1` (8.1.1), `oss-8.1.1` (OSS 8.1.1), `8.1.0` (8.1.0), `oss-8.1.0` (OSS 8.1.0), `8.0.1` (8.0.1), `oss-8.0.1` (OSS 8.0.1), `8.0.0` (8.0.0), `oss-8.0.0` (OSS 8.0.0). - `7.17.1` (ELK 7.17.5), `oss-7.17.1` (OSS 7.17.5), `7.17.1` (7.17.1), `oss-7.17.1` (OSS 7.17.1), `7.17.0` (7.17.0), `oss-7.17.0` (OSS 7.17.0), `7.16.3` (7.16.3), `oss-7.16.3` (OSS 7.16.3), `7.16.2` (7.16.2), `oss-7.16.2` (OSS 7.16.2), `7.16.1` (7.16.1), `oss-7.16.1` (OSS 7.16.1), `7.16.0` (7.16.0), `oss-7.16.0` (OSS 7.16.0), `7.15.2` (7.15.2), `oss-7.15.2` (OSS 7.15.2), `7.15.1` (7.15.1), `oss-7.15.1` (OSS 7.15.1), `7.15.0` (7.15.0), `oss-7.15.0` (OSS 7.15.0), `7.14.2` (7.14.2), `oss-7.14.2` (OSS 7.14.2), `7.14.1` (7.14.1), `oss-7.14.1` (OSS 7.14.1), `7.14.0` (7.14.0), `oss-7.14.0` (OSS 7.14.0), `7.13.4` (7.13.4), `oss-7.13.4` (OSS 7.13.4), `7.13.3` (7.13.3), `oss-7.13.3` (OSS 7.13.3), `7.13.2` (7.13.2), `oss-7.13.2` (OSS 7.13.2), `7.13.1` (7.13.1), `oss-7.13.1` (OSS 7.13.1), `7.13.0` (7.13.0), `oss-7.13.0` (OSS 7.13.0), `7.12.1` (7.12.1), `oss-7.12.1` (OSS 7.12.1), `7.12.0` (7.12.0), `oss-7.12.0` (OSS 7.12.0), `7.11.2` (7.11.2), `oss-7.11.2` (OSS 7.11.2), `7.11.1` (7.11.1), `oss-7.11.1` (OSS 7.11.1), `oss-7.11.0` (OSS 7.11.0), `7.11.0` (7.11.0), `oss-7.10.2` (OSS 7.10.2), `7.10.2` (7.10.2), `oss-7.10.1` (OSS 7.10.1), `7.10.1` (7.10.1), `oss-7.10.0` (OSS 7.10.0), `7.10.0` (7.10.0), `oss-793` (OSS 7.9.3), `793` (7.9.3), `oss-792` (OSS 7.9.2), `792` (7.9.2), `oss-791` (OSS 7.9.1), `791` (7.9.1), `oss-790` (OSS 7.9.0), `790` (7.9.0), `oss-781` (OSS 7.8.1), `781` (7.8.1), `oss-780` (OSS 7.8.0), `780` (7.8.0), `771` (7.7.1), `770` (7.7.0), `762` (7.6.2), `761` (7.6.1), `760` (7.6.0), `752` (7.5.2), `751` (7.5.1), `750` (7.5.0), `742` (7.4.2), `741` (7.4.1), `740` (7.4.0), `732` (7.3.2), `731` (7.3.1), `730` (7.3.0), `721` (7.2.1), `720` (7.2.0), `711` (7.1.1), `710` (7.1.0), `701` (7.0.1), `700` (7.0.0). diff --git a/nginx-filebeat/Dockerfile b/nginx-filebeat/Dockerfile index f00f234d..faf7e86d 100644 --- a/nginx-filebeat/Dockerfile +++ b/nginx-filebeat/Dockerfile @@ -1,9 +1,5 @@ # Dockerfile to illustrate how Filebeat can be used with nginx -<<<<<<< HEAD -# Filebeat 8.14.1 -======= -# Filebeat OSS 8.14.2 ->>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144 +# Filebeat OSS 8.14.3 # Build with: # docker build -t filebeat-nginx-example . @@ -24,11 +20,11 @@ ENV REFRESHED_AT 2020-10-02 ### install Filebeat <<<<<<< HEAD -ENV FILEBEAT_VERSION 8.14.1 -ENV FILEBEAT_BASE_VERSION 8.14.1 +ENV FILEBEAT_VERSION oss-8.15.0 +ENV FILEBEAT_BASE_VERSION 8.15.0 ======= -ENV FILEBEAT_VERSION oss-8.14.2 -ENV FILEBEAT_BASE_VERSION 8.14.2 +ENV FILEBEAT_VERSION oss-8.14.3 +ENV FILEBEAT_BASE_VERSION 8.15.0 >>>>>>> 7b5a7e1625b123c49d1a817cad15725b10f23144