From f0c38b9dc089c8825d2aac6b637948b773063d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 18 May 2022 17:58:55 +0200 Subject: [PATCH 1/7] Fix cgroups configuration of docker volume used in logging-gelf integration tests --- integration-tests/logging-gelf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 64acc3b92cc91..9c69a04e364a5 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -196,7 +196,7 @@ - ${project.basedir}/src/test/resources/pipeline:/usr/share/logstash/pipeline + ${project.basedir}/src/test/resources/pipeline:/usr/share/logstash/pipeline:Z From 74c871cb1a3a04008780a5ca96b0c6023e08fd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 18 May 2022 16:07:57 +0200 Subject: [PATCH 2/7] Upgrade to Elasticsearch 7.10 and Graylog 4.3.0 in tests/documentation of logging-gelf Because older versions don't support Elasticsearch 7.10. See https://archivedocs.graylog.org/en/latest/pages/configuration/elasticsearch.html See https://docs.graylog.org/docs/installing#system-requirements --- .../src/main/asciidoc/centralized-log-management.adoc | 11 +++++++++-- integration-tests/logging-gelf/pom.xml | 4 ++-- .../src/test/resources/docker-compose-efk.yml | 5 +++-- .../src/test/resources/docker-compose-elk.yml | 10 +++++----- .../src/test/resources/docker-compose-graylog.yml | 11 +++++++---- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/docs/src/main/asciidoc/centralized-log-management.adoc b/docs/src/main/asciidoc/centralized-log-management.adoc index a4d6e259e24b0..bc0ff5c7daac3 100644 --- a/docs/src/main/asciidoc/centralized-log-management.adoc +++ b/docs/src/main/asciidoc/centralized-log-management.adoc @@ -6,7 +6,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Centralized log management (Graylog, Logstash, Fluentd) include::./attributes.adoc[] -:es-version: 6.8.2 +: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). @@ -108,6 +108,7 @@ services: - "9200:9200" environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - graylog @@ -117,13 +118,17 @@ services: - graylog graylog: - image: graylog/graylog:3.1 + image: graylog/graylog:4.3.0 ports: - "9000:9000" - "12201:12201/udp" - "1514:1514" environment: GRAYLOG_HTTP_EXTERNAL_URI: "http://127.0.0.1:9000/" + # CHANGE ME (must be at least 16 characters)! + GRAYLOG_PASSWORD_SECRET: "forpasswordencryption" + # Password: admin + GRAYLOG_ROOT_PASSWORD_SHA2: "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" networks: - graylog depends_on: @@ -191,6 +196,7 @@ services: - "9300:9300" environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - elk @@ -279,6 +285,7 @@ services: - "9300:9300" environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - efk diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 9c69a04e364a5..8b486fc38c8b3 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.9.3 + docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 elasticsearch @@ -174,7 +174,7 @@ - docker.elastic.co/logstash/logstash-oss:7.9.3 + docker.elastic.co/logstash/logstash-oss:7.10.0 logstash diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index 41fee79d29392..eb4a8b4cabafc 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -2,9 +2,10 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.2 + image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - efk @@ -22,7 +23,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:6.8.2 + image: docker.elastic.co/kibana/kibana-oss:7.10.0 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index 2cf361edaa15d..43e06d1259749 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -2,15 +2,15 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3 + image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 environment: - - ES_JAVA_OPTS=-Xms512m -Xmx512m - - "discovery.type=single-node" + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - elk logstash: - image: docker.elastic.co/logstash/logstash-oss:7.9.3 + image: docker.elastic.co/logstash/logstash-oss:7.10.0 volumes: - source: $HOME/pipelines target: /usr/share/logstash/pipeline @@ -25,7 +25,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:7.9.3 + image: docker.elastic.co/kibana/kibana-oss:7.10.0 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index 9531222e6b428..90698f216bb14 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -2,10 +2,10 @@ version: '3.2' services: elasticsearch: - # Graylog 3 only works with Elasticsearch 6 - image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.9 + image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" networks: - graylog @@ -15,13 +15,16 @@ services: - graylog graylog: - image: graylog/graylog:3.3.8 + image: graylog/graylog:4.3.0 ports: - "9000:9000" - "12201:12201/udp" - "1514:1514" environment: - GRAYLOG_HTTP_EXTERNAL_URI: "http://127.0.0.1:9000/" + # CHANGE ME (must be at least 16 characters)! + GRAYLOG_PASSWORD_SECRET: "forpasswordencryptionEXAMPLE" + # Password: admin + GRAYLOG_ROOT_PASSWORD_SHA2: "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" networks: - graylog depends_on: From af0e8ccd7b64060a88e6bcb0865891c42fa54fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 18 May 2022 16:55:42 +0200 Subject: [PATCH 3/7] Fix outdated properties in logging-gelf IT readme --- integration-tests/logging-gelf/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/logging-gelf/README.md b/integration-tests/logging-gelf/README.md index e90c5fac187b5..1f782bf617025 100644 --- a/integration-tests/logging-gelf/README.md +++ b/integration-tests/logging-gelf/README.md @@ -29,7 +29,7 @@ mvn clean test -Dtest-gelf Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`: ``` -mvn clean integration-test -Dtest-gelf -Dnative +mvn clean integration-test -Dtest-containers -Dnative ``` ## Testing with ELK (Elasticsearch, Logstash, Kibana) aka the Elastic Stack @@ -61,7 +61,7 @@ Then you can use the following commands to run an ELK cluster using the provided docker-compose -f src/test/resources/docker-compose-elk.yml up ``` -Finally, run the test via `mvn clean install -Dtest-gelf -Dmaven.test.failure.ignore` and manually verify that the log +Finally, run the test via `mvn clean install -Dtest-containers -Dmaven.test.failure.ignore` and manually verify that the log events has been pushed to ELK. You can use Kibana on http://localhost:5601/ to access those logs. @@ -99,5 +99,5 @@ Then you can use the following commands to run an EFK cluster using the provided docker-compose -f src/test/resources/docker-compose-efk.yml up ``` -Finally, run the test via `mvn clean install -Dtest-gelf -Dmaven.test.failure.ignore` and manually verify that the log +Finally, run the test via `mvn clean install -Dtest-containers -Dmaven.test.failure.ignore` and manually verify that the log events has been pushed to EFK. You can use Kibana on http://localhost:5601/ to access those logs. \ No newline at end of file From 49102162cb3a97db925f859494bb46415d5ced01 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 4/7] 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 5cfcb162945a8..cf91b1c7d1ba5 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 5af2c1b1781fe..17918bc247446 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 bc0ff5c7daac3..24d8ff3e65738 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 065767d675e41..bd1241d0a88a7 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 a000b66045a38..cd1b247453fa3 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 8b486fc38c8b3..55fc1eda4c9ff 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 b4c271deda068..e466d8a589d80 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); From a032e3062ac5352accb3506ae43348ef386e0543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 18 May 2022 17:29:10 +0200 Subject: [PATCH 5/7] Upgrade to ELK 7.16.3 for tests and documentation --- build-parent/pom.xml | 8 ++++---- .../deployment/pom.xml | 1 + .../hibernate-search-orm-elasticsearch/deployment/pom.xml | 1 + integration-tests/elasticsearch-rest-client/pom.xml | 1 + .../elasticsearch-rest-high-level-client/pom.xml | 1 + .../pom.xml | 1 + .../hibernate-search-orm-elasticsearch-tenancy/pom.xml | 1 + .../hibernate-search-orm-elasticsearch/pom.xml | 1 + integration-tests/logging-gelf/pom.xml | 1 + .../src/test/resources/docker-compose-efk.yml | 4 ++-- .../src/test/resources/docker-compose-elk.yml | 6 +++--- .../src/test/resources/docker-compose-graylog.yml | 2 +- 12 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index cf91b1c7d1ba5..8592b69edfed4 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -76,10 +76,10 @@ 4.9.2 - 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} + 7.16.3 + docker.elastic.co/elasticsearch/elasticsearch:${elasticsearch-server.version} + docker.elastic.co/logstash/logstash:${elasticsearch-server.version} + docker.elastic.co/kibana/kibana:${elasticsearch-server.version} http 1.2.3 docker.io/opensearchproject/opensearch:${opensearch-server.version} diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml index e7ed07cc2deb9..b28101eb9782d 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml @@ -120,6 +120,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index f6cac53c1de58..9b499de4dc9f4 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -121,6 +121,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index 050b29a192539..a259ca1b2cd17 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -165,6 +165,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml index 735e1b0571bed..4e3ba6b705c72 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml +++ b/integration-tests/elasticsearch-rest-high-level-client/pom.xml @@ -166,6 +166,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml index 28054aa8b4f01..563eb725362df 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml @@ -206,6 +206,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index 99bcc0ddef2b3..0c1c16ce8fc45 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -222,6 +222,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index 9bc04cfc8dfda..ef081ee2e3398 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -184,6 +184,7 @@ single-node + -Xms512m -Xmx512m 9200:9200 diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 55fc1eda4c9ff..3a4ddd5d338ca 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -157,6 +157,7 @@ single-node + -Xms512m -Xmx512m Elasticsearch: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index eb4a8b4cabafc..8b9611d7880eb 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" @@ -23,7 +23,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:7.10.0 + image: docker.elastic.co/kibana/kibana:7.16.3 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index 43e06d1259749..cdb38c3f55453 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" @@ -10,7 +10,7 @@ services: - elk logstash: - image: docker.elastic.co/logstash/logstash-oss:7.10.0 + image: docker.elastic.co/logstash/logstash:7.16.3 volumes: - source: $HOME/pipelines target: /usr/share/logstash/pipeline @@ -25,7 +25,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana-oss:7.10.0 + image: docker.elastic.co/kibana/kibana:7.16.3 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index 90698f216bb14..dabaee4e8e397 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" From 22c12c0836c88952db60169905fd29569c22ff39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 19 May 2022 09:02:03 +0200 Subject: [PATCH 6/7] Switch to dockerhub for Elasticsearch/Logstash/Kibana images in integration tests docker.elastic.co has been down a few times in the past, dockerhub is more reliable. They both serve the exact same images (same tags, same hashes), so the change should be mostly transparent. --- build-parent/pom.xml | 6 +++--- .../logging-gelf/src/test/resources/docker-compose-efk.yml | 4 ++-- .../logging-gelf/src/test/resources/docker-compose-elk.yml | 6 +++--- .../src/test/resources/docker-compose-graylog.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 8592b69edfed4..7df7aac42f40b 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -77,9 +77,9 @@ 7.16.3 - docker.elastic.co/elasticsearch/elasticsearch:${elasticsearch-server.version} - docker.elastic.co/logstash/logstash:${elasticsearch-server.version} - docker.elastic.co/kibana/kibana:${elasticsearch-server.version} + docker.io/elastic/elasticsearch:${elasticsearch-server.version} + docker.io/elastic/logstash:${elasticsearch-server.version} + docker.io/elastic/kibana:${elasticsearch-server.version} http 1.2.3 docker.io/opensearchproject/opensearch:${opensearch-server.version} diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index 8b9611d7880eb..0e043df1f9a0d 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 + image: docker.io/elastic/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" @@ -23,7 +23,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana:7.16.3 + image: docker.io/elastic/kibana:7.16.3 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index cdb38c3f55453..ffe67c10cc81b 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 + image: docker.io/elastic/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" @@ -10,7 +10,7 @@ services: - elk logstash: - image: docker.elastic.co/logstash/logstash:7.16.3 + image: docker.io/elastic/logstash:7.16.3 volumes: - source: $HOME/pipelines target: /usr/share/logstash/pipeline @@ -25,7 +25,7 @@ services: - elasticsearch kibana: - image: docker.elastic.co/kibana/kibana:7.16.3 + image: docker.io/elastic/kibana:7.16.3 ports: - "5601:5601" networks: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index dabaee4e8e397..0b5da8e8aaa36 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -2,7 +2,7 @@ version: '3.2' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 + image: docker.io/elastic/elasticsearch:7.16.3 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" From 40765772580e4a6730053d2355103003d7957a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 19 May 2022 09:26:45 +0200 Subject: [PATCH 7/7] Disable the security plugin for Elasticsearch servers used in tests 1. Because we don't use it (we always connect unauthenticated) 2. Because we'll need to disable it in Elasticsearch 8+ anyway, otherwise Elasticsearch uses a self-signed certificate (which we have to allow in the client JVM) and mandates HTTP authentication. --- .../deployment/pom.xml | 1 + extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml | 1 + integration-tests/elasticsearch-rest-client/pom.xml | 1 + integration-tests/elasticsearch-rest-high-level-client/pom.xml | 1 + .../pom.xml | 1 + .../hibernate-search-orm-elasticsearch-tenancy/pom.xml | 1 + integration-tests/hibernate-search-orm-elasticsearch/pom.xml | 1 + integration-tests/logging-gelf/pom.xml | 1 + .../logging-gelf/src/test/resources/docker-compose-efk.yml | 1 + .../logging-gelf/src/test/resources/docker-compose-elk.yml | 1 + .../logging-gelf/src/test/resources/docker-compose-graylog.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml index b28101eb9782d..c3b7c32009ca8 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml @@ -120,6 +120,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 9b499de4dc9f4..99adfce13398c 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -121,6 +121,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index a259ca1b2cd17..2bca0cf269bb1 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -165,6 +165,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml index 4e3ba6b705c72..4129203dc5348 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml +++ b/integration-tests/elasticsearch-rest-high-level-client/pom.xml @@ -166,6 +166,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml index 563eb725362df..550941075da12 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml @@ -206,6 +206,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index 0c1c16ce8fc45..3c237ca5eb1ad 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -222,6 +222,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index ef081ee2e3398..b888e85055237 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -184,6 +184,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 3a4ddd5d338ca..b84d0b6626d72 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -157,6 +157,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index 0e043df1f9a0d..d1b13ca0b7289 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - efk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index ffe67c10cc81b..ef3ac1c81d05e 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - elk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index 0b5da8e8aaa36..2b113d640780e 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - graylog