From a367b647ff7b6f509f6b0d3b97315462300c186e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 18 May 2022 16:03:09 +0200 Subject: [PATCH] Align the version of Elasticsearch/Logstash/Kibana across all integration tests and documentation --- build-parent/pom.xml | 2 ++ docs/pom.xml | 3 +++ .../asciidoc/centralized-log-management.adoc | 17 ++++++++--------- .../asciidoc/elasticsearch-dev-services.adoc | 4 ++-- docs/src/main/asciidoc/elasticsearch.adoc | 2 +- integration-tests/logging-gelf/pom.xml | 4 ++-- .../logging/gelf/it/GelfLogHandlerTest.java | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 5cfcb162945a85..cf91b1c7d1ba5f 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -78,6 +78,8 @@ 7.10.0 docker.elastic.co/elasticsearch/elasticsearch-oss:${elasticsearch-server.version} + docker.elastic.co/logstash/logstash-oss:${elasticsearch-server.version} + docker.elastic.co/kibana/kibana-oss:${elasticsearch-server.version} http 1.2.3 docker.io/opensearchproject/opensearch:${opensearch-server.version} diff --git a/docs/pom.xml b/docs/pom.xml index 5af2c1b1781fe1..17918bc2474469 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -2824,6 +2824,9 @@ ${rest-assured.version} ${proposed-maven-version} ${gradle-wrapper.version} + ${elasticsearch.image} + ${logstash.image} + ${kibana.image} ${keycloak.docker.image} ${jandex-maven-plugin.version} diff --git a/docs/src/main/asciidoc/centralized-log-management.adoc b/docs/src/main/asciidoc/centralized-log-management.adoc index bc0ff5c7daac39..24d8ff3e65738c 100644 --- a/docs/src/main/asciidoc/centralized-log-management.adoc +++ b/docs/src/main/asciidoc/centralized-log-management.adoc @@ -6,7 +6,6 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Centralized log management (Graylog, Logstash, Fluentd) include::./attributes.adoc[] -:es-version: 7.10.0 This guide explains how you can send your logs to a centralized log management system like Graylog, Logstash (inside the Elastic Stack or ELK - Elasticsearch, Logstash, Kibana) or Fluentd (inside EFK - Elasticsearch, Fluentd, Kibana). @@ -103,7 +102,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version} + image: {elasticsearch-image} ports: - "9200:9200" environment: @@ -190,7 +189,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version} + image: {elasticsearch-image} ports: - "9200:9200" - "9300:9300" @@ -201,7 +200,7 @@ services: - elk logstash: - image: docker.elastic.co/logstash/logstash-oss:{es-version} + image: {logstash-image} volumes: - source: $HOME/pipelines target: /usr/share/logstash/pipeline @@ -216,7 +215,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:{es-version} + image: {kibana-image} ports: - "5601:5601" networks: @@ -279,7 +278,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version} + image: {elasticsearch-image} ports: - "9200:9200" - "9300:9300" @@ -303,7 +302,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:{es-version} + image: {kibana-image} ports: - "5601:5601" networks: @@ -366,7 +365,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version} + image: {elasticsearch-image} ports: - "9200:9200" - "9300:9300" @@ -389,7 +388,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:{es-version} + image: {kibana-image} ports: - "5601:5601" networks: diff --git a/docs/src/main/asciidoc/elasticsearch-dev-services.adoc b/docs/src/main/asciidoc/elasticsearch-dev-services.adoc index 065767d675e413..bd1241d0a88a75 100644 --- a/docs/src/main/asciidoc/elasticsearch-dev-services.adoc +++ b/docs/src/main/asciidoc/elasticsearch-dev-services.adoc @@ -50,10 +50,10 @@ Note that the Elasticsearch hosts property is automatically configured with the Dev Services for Elasticsearch only support Elasticsearch based images, Opensearch is not supported at the moment. -If you need to use a different image than the default one you can configure it via +If you need to use a different image than the default one you can configure it via: [source, properties] ---- -quarkus.elasticsearch.devservices.image-name=docker.elastic.co/elasticsearch/elasticsearch:7.17.0 +quarkus.elasticsearch.devservices.image-name={elasticsearch-image} ---- == Current limitations diff --git a/docs/src/main/asciidoc/elasticsearch.adoc b/docs/src/main/asciidoc/elasticsearch.adoc index a000b66045a383..cd1b247453fa36 100644 --- a/docs/src/main/asciidoc/elasticsearch.adoc +++ b/docs/src/main/asciidoc/elasticsearch.adoc @@ -337,7 +337,7 @@ If you want to use Docker to run an Elasticsearch instance, you can use the foll [source,bash,subs=attributes+] ---- docker run --name elasticsearch -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms512m -Xmx512m"\ - --rm -p 9200:9200 docker.elastic.co/elasticsearch/elasticsearch-oss:{elasticsearch-version} + --rm -p 9200:9200 {elasticsearch-image} ---- == Running the application diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 8b486fc38c8b32..55fc1eda4c9ff6 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -142,7 +142,7 @@ true - docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 + ${elasticsearch.image} elasticsearch @@ -174,7 +174,7 @@ - docker.elastic.co/logstash/logstash-oss:7.10.0 + ${logstash.image} logstash diff --git a/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java b/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java index b4c271deda068f..e466d8a589d80e 100644 --- a/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java +++ b/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java @@ -28,7 +28,7 @@ public void test() { //we need to await for a certain time as logstash needs to create the index template, // then elasticsearch create the index // then some logs being indexed. - await().atMost(10, TimeUnit.SECONDS) + await().atMost(20, TimeUnit.SECONDS) .untilAsserted( () -> { RestAssured.given().when().get("/gelf-log-handler").then().statusCode(204);