From ce3b8b7c121c6989aca115854c099c293b9ec7c9 Mon Sep 17 00:00:00 2001
From: neo <1100909+neowu@users.noreply.github.com>
Date: Mon, 5 Aug 2024 14:55:26 +0800
Subject: [PATCH] increase log processor batch, update docker example image
 version

Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
---
 docker/es/docker-compose.yml                              | 4 ++--
 docker/log/docker-compose.yml                             | 6 +++---
 docker/mongo/docker-compose.yml                           | 4 ++--
 docker/redis/docker-compose.yml                           | 4 ++--
 ext/log-processor/src/main/java/core/LogProcessorApp.java | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/es/docker-compose.yml b/docker/es/docker-compose.yml
index 15af19d3e..0c47e1e08 100644
--- a/docker/es/docker-compose.yml
+++ b/docker/es/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
     volumes:
     - ./log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties
     ports:
@@ -15,7 +15,7 @@ services:
     - xpack.ml.enabled=false
     - ingest.geoip.downloader.enabled=false
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.14.1
+    image: docker.elastic.co/kibana/kibana:8.14.3
     ports:
     - 5601:5601
     environment:
diff --git a/docker/log/docker-compose.yml b/docker/log/docker-compose.yml
index d45f4d2b0..8e5763fb5 100644
--- a/docker/log/docker-compose.yml
+++ b/docker/log/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
     ports:
     - 9200:9200
     environment:
@@ -11,7 +11,7 @@ services:
     - xpack.ml.enabled=false
     - ingest.geoip.downloader.enabled=false
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.14.1
+    image: docker.elastic.co/kibana/kibana:8.14.3
     ports:
     - 5601:5601
     environment:
@@ -29,7 +29,7 @@ services:
     depends_on:
     - elasticsearch
   kafka:
-    image: apache/kafka:3.7.1
+    image: apache/kafka:3.8.0
     ports:
     - 9092:9092
     - 1099:1099
diff --git a/docker/mongo/docker-compose.yml b/docker/mongo/docker-compose.yml
index 9577c2130..46f1c85f2 100644
--- a/docker/mongo/docker-compose.yml
+++ b/docker/mongo/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   mongo:
-    image: mongo:6
-    command: [ "--dbpath", "/data/db", "--enableFreeMonitoring", "off", "--timeStampFormat", "iso8601-utc" ]
+    image: mongo:7
+    command: [ "--dbpath", "/data/db", "--timeStampFormat", "iso8601-utc" ]
     ports:
     - "27017:27017"
 
diff --git a/docker/redis/docker-compose.yml b/docker/redis/docker-compose.yml
index 877fdbcc5..c2d4a955a 100644
--- a/docker/redis/docker-compose.yml
+++ b/docker/redis/docker-compose.yml
@@ -1,10 +1,10 @@
 services:
   redis-1:
-    image: redis
+    image: redis:7.4
     ports:
     - 6379
   redis-2:
-    image: redis
+    image: redis:7.4
     ports:
     - 6379
 #  envoy:
diff --git a/ext/log-processor/src/main/java/core/LogProcessorApp.java b/ext/log-processor/src/main/java/core/LogProcessorApp.java
index 2b7e95493..e94243eda 100644
--- a/ext/log-processor/src/main/java/core/LogProcessorApp.java
+++ b/ext/log-processor/src/main/java/core/LogProcessorApp.java
@@ -76,8 +76,8 @@ private void configureIndexOption() {
     private void configureKafka(Forwarders forwarders) {
         kafka().uri(requiredProperty("sys.kafka.uri"));
         kafka().concurrency(2);
-        kafka().minPoll(1024 * 1024, Duration.ofMillis(500));           // try to get at least 1M message
-        kafka().maxPoll(2000, 3 * 1024 * 1024);     // get 3M message at max
+        kafka().minPoll(1024 * 1024, Duration.ofMillis(500));          // try to get at least 1M message
+        kafka().maxPoll(3000, 3 * 1024 * 1024);         // get 3M message at max
 
         kafka().subscribe(LogTopics.TOPIC_ACTION_LOG, ActionLogMessage.class, bind(new ActionLogMessageHandler(forwarders.action)));
         kafka().subscribe(LogTopics.TOPIC_STAT, StatMessage.class, bind(StatMessageHandler.class));