Merge branch 'test-sever' into 'main'

docker-compose.yml

@@ -13,11 +13,11 @@ services:
         read_only: true
       - "./elasticsearch/data:/usr/share/elasticsearch/data"
     ports:
-      - "$ES_PORT1:9200"
-      - "$ES_PORT2:9300"
+      - "127.0.0.1:$ES_PORT1:9200"
+      - "127.0.0.1:$ES_PORT2:9300"
     environment:
-      ES_JAVA_OPTS: "-Xmx1024m -Xms1024m"
-      ELASTIC_PASSWORD: changeme
+      ES_JAVA_OPTS: "-Xmx2048m -Xms2048m"
+      ELASTIC_PASSWORD: Qeus@ge23eM
       # Use single node discovery in order to disable production mode and avoid bootstrap checks.
       # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
       discovery.type: single-node

elasticsearch/config/elasticsearch.yml

@@ -9,7 +9,7 @@ cluster.max_shards_per_node: 30000
 ## X-Pack settings
 ## see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-xpack.html
 #
-xpack.license.self_generated.type: trial
+xpack.license.self_generated.type: basic
 xpack.monitoring.history.duration: 3d
-xpack.security.enabled: false
+xpack.security.enabled: true
 xpack.monitoring.collection.enabled: true

kibana/config/kibana.yml

@@ -10,6 +10,6 @@ monitoring.ui.container.elasticsearch.enabled: true
 ## X-Pack security credentials
 #
 elasticsearch.username: elastic
-elasticsearch.password: changeme
+elasticsearch.password: Qeus@ge23eM
 
 # i18n.locale: "zh-CN"

logstash/config/logstash.yml

@@ -9,4 +9,4 @@ xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
 #
 xpack.monitoring.enabled: true
 xpack.monitoring.elasticsearch.username: elastic
-xpack.monitoring.elasticsearch.password: changeme
+xpack.monitoring.elasticsearch.password: Qeus@ge23eM

logstash/pipeline/logstash.conf

@@ -127,5 +127,7 @@ output {
 	elasticsearch{
 		index => "%{[env]}-%{[service][program]}-%{[service][version]}-%{[service][name]}-%{+YYYY.MM}-000000"
 	        hosts => ["elasticsearch:9200"]
+		user => "elastic"
+	        password => "Qeus@ge23eM"
         }
 }