Sync documentation of main branch

quarkusio · May 22, 2022 · f6157a9 · f6157a9
1 parent e3622b2
commit f6157a9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/_versions/main/guides/centralized-log-management.adoc b/_versions/main/guides/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: 6.8.2
 
 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,11 +102,12 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version}
+    image: {elasticsearch-image}
     ports:
       - "9200:9200"
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      discovery.type: "single-node"
     networks:
       - graylog
 
@@ -117,13 +117,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:
@@ -185,17 +189,18 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version}
+    image: {elasticsearch-image}
     ports:
       - "9200:9200"
       - "9300:9300"
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      discovery.type: "single-node"
     networks:
       - elk
 
   logstash:
-    image: docker.elastic.co/logstash/logstash-oss:{es-version}
+    image: {logstash-image}
     volumes:
       - source: $HOME/pipelines
         target: /usr/share/logstash/pipeline
@@ -210,7 +215,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:{es-version}
+    image: {kibana-image}
     ports:
       - "5601:5601"
     networks:
@@ -273,12 +278,13 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:{es-version}
+    image: {elasticsearch-image}
     ports:
       - "9200:9200"
       - "9300:9300"
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      discovery.type: "single-node"
     networks:
       - efk
 
@@ -296,7 +302,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:{es-version}
+    image: {kibana-image}
     ports:
       - "5601:5601"
     networks:
@@ -359,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"
@@ -382,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/_versions/main/guides/elasticsearch-dev-services.adoc b/_versions/main/guides/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/_versions/main/guides/elasticsearch.adoc b/_versions/main/guides/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