From d6dfdc3796a4ea26762bf76c6022ef07bac9af52 Mon Sep 17 00:00:00 2001
From: root <root@curious.host.com>
Date: Wed, 17 Sep 2025 08:40:47 +0000
Subject: [PATCH] =?UTF-8?q?[#1]=20=E4=BF=AE=E6=94=B9es/kibana=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=B4=A6=E5=8F=B7=E7=9A=84uid=E5=92=8Cgid=EF=BC=8C=20?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E7=AE=97=E5=8A=9B=E5=B9=B3=E5=8F=B0=E6=8C=82?=
 =?UTF-8?q?=E8=BD=BD=E7=9B=AE=E5=BD=95=EF=BC=9B=E5=A2=9E=E5=8A=A0=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98ip=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/log/elasticsearch/build/Dockerfile             |  5 +++++
 src/log/elasticsearch/build/start-es-supervised.sh | 11 ++++++++++-
 src/log/kibana/build/Dockerfile                    |  5 +++++
 src/log/kibana/build/start-kibana-supervised.sh    |  8 +++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/log/elasticsearch/build/Dockerfile b/src/log/elasticsearch/build/Dockerfile
index 28717f5..c914153 100644
--- a/src/log/elasticsearch/build/Dockerfile
+++ b/src/log/elasticsearch/build/Dockerfile
@@ -29,6 +29,11 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 # 创建 supervisor 日志目录
 RUN mkdir -p /var/log/supervisor
 
+# 修改elasticsearch用户的UID和GID
+RUN usermod -u 2133 elasticsearch && \
+    groupmod -g 2015 elasticsearch && \
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+
 # 复制 supervisor 配置文件
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
diff --git a/src/log/elasticsearch/build/start-es-supervised.sh b/src/log/elasticsearch/build/start-es-supervised.sh
index f88151c..f2cbd75 100644
--- a/src/log/elasticsearch/build/start-es-supervised.sh
+++ b/src/log/elasticsearch/build/start-es-supervised.sh
@@ -16,6 +16,15 @@ fi
 
 ln -sf /private/argus/log/elasticsearch /usr/share/elasticsearch/data
 
+# 记录容器ip地址
+DOMAIN=es.log.argus.com
+IP=`ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}'`
+echo current IP: ${IP}
+echo ${IP} > /private/argus/etc/${DOMAIN}
+
+# 更新dns，执行
+/private/argus/etc/update-dns.sh
+
 echo "[INFO] Data directory linked: /usr/share/elasticsearch/data -> /private/argus/log/elasticsearch"
 
 # 设置环境变量（ES配置通过docker-compose传递）
@@ -24,4 +33,4 @@ export ES_JAVA_OPTS="${ES_JAVA_OPTS:-"-Xms512m -Xmx512m"}"
 echo "[INFO] Starting Elasticsearch process..."
 
 # 启动原始的Elasticsearch entrypoint
-exec /usr/local/bin/docker-entrypoint.sh elasticsearch
\ No newline at end of file
+exec /usr/local/bin/docker-entrypoint.sh elasticsearch
diff --git a/src/log/kibana/build/Dockerfile b/src/log/kibana/build/Dockerfile
index 740757b..c130ab8 100644
--- a/src/log/kibana/build/Dockerfile
+++ b/src/log/kibana/build/Dockerfile
@@ -29,6 +29,11 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 # 创建 supervisor 日志目录
 RUN mkdir -p /var/log/supervisor
 
+# 修改kibana用户的UID和GID
+RUN usermod -u 2133 kibana && \
+    groupmod -g 2015 kibana && \
+    chown -R kibana:kibana /usr/share/kibana
+
 # 复制 supervisor 配置文件
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
diff --git a/src/log/kibana/build/start-kibana-supervised.sh b/src/log/kibana/build/start-kibana-supervised.sh
index 44b3515..6b2e5dd 100644
--- a/src/log/kibana/build/start-kibana-supervised.sh
+++ b/src/log/kibana/build/start-kibana-supervised.sh
@@ -18,6 +18,12 @@ ln -sf /private/argus/log/kibana /usr/share/kibana/data
 
 echo "[INFO] Data directory linked: /usr/share/kibana/data -> /private/argus/log/kibana"
 
+# 记录容器ip地址
+DOMAIN=kibana.log.argus.com
+IP=`ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}'`
+echo current IP: ${IP}
+echo ${IP} > /private/argus/etc/${DOMAIN}
+
 # 设置环境变量
 export ELASTICSEARCH_HOSTS="${ELASTICSEARCH_HOSTS:-"http://es:9200"}"
 
@@ -30,4 +36,4 @@ echo "[INFO] Starting background post-start configuration..."
 echo "[INFO] Starting Kibana process..."
 
 # 启动原始的Kibana entrypoint
-exec /usr/local/bin/kibana-docker
\ No newline at end of file
+exec /usr/local/bin/kibana-docker