From f84e22499cc90c551455f8b13ab7c98df4dfc43e Mon Sep 17 00:00:00 2001
From: cklogic <chuanzyz@sina.com>
Date: Thu, 6 Jun 2024 13:00:44 +0800
Subject: [PATCH] feat: Support Password Access for ElasticSearch

---
 conf/service_conf.yaml         | 2 ++
 docker/.env                    | 5 +++--
 docker/docker-compose-base.yml | 8 ++++----
 docker/service_conf.yaml       | 2 ++
 rag/utils/es_conn.py           | 2 ++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/conf/service_conf.yaml b/conf/service_conf.yaml
index c548b38c12..792404a6c0 100644
--- a/conf/service_conf.yaml
+++ b/conf/service_conf.yaml
@@ -15,6 +15,8 @@ minio:
   host: 'minio:9000'
 es:
   hosts: 'http://es01:9200'
+  username: 'elastic'
+  password: 'infini_rag_flow'
 redis:
   db: 1
   password: 'infini_rag_flow'
diff --git a/docker/.env b/docker/.env
index 47fcd78b9b..745b9d8b37 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,12 +1,13 @@
 # Version of Elastic products
 STACK_VERSION=8.11.3
 
-# Set the cluster name
-CLUSTER_NAME=rag_flow
 
 # Port to expose Elasticsearch HTTP API to the host
 ES_PORT=1200
 
+# Set the Elasticsearch password
+ELASTIC_PASSWORD=infini_rag_flow
+
 # Port to expose Kibana to the host
 KIBANA_PORT=6601
 
diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
index 1757407398..9e649a283e 100644
--- a/docker/docker-compose-base.yml
+++ b/docker/docker-compose-base.yml
@@ -8,12 +8,12 @@ services:
       - ${ES_PORT}:9200
     environment:
       - node.name=es01
-      - cluster.name=${CLUSTER_NAME}
-      - cluster.initial_master_nodes=es01
       - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
       - bootstrap.memory_lock=false
-      - xpack.security.enabled=false
-      - cluster.max_shards_per_node=4096
+      - discovery.type=single-node
+      - xpack.security.enabled=true
+      - xpack.security.http.ssl.enabled=false
+      - xpack.security.transport.ssl.enabled=false
       - TZ=${TIMEZONE}
     mem_limit: ${MEM_LIMIT}
     ulimits:
diff --git a/docker/service_conf.yaml b/docker/service_conf.yaml
index 63ce16de32..778f0f0c16 100644
--- a/docker/service_conf.yaml
+++ b/docker/service_conf.yaml
@@ -15,6 +15,8 @@ minio:
   host: 'minio:9000'
 es:
   hosts: 'http://es01:9200'
+  username: 'elastic'
+  password: 'infini_rag_flow'
 redis:
   db: 1
   password: 'infini_rag_flow'
diff --git a/rag/utils/es_conn.py b/rag/utils/es_conn.py
index 78f2346056..8b07be312c 100644
--- a/rag/utils/es_conn.py
+++ b/rag/utils/es_conn.py
@@ -28,6 +28,8 @@ def conn(self):
             try:
                 self.es = Elasticsearch(
                     settings.ES["hosts"].split(","),
+                    basic_auth=(settings.ES["username"], settings.ES["password"]) if "username" in settings.ES and "password" in settings.ES else None,
+                    verify_certs=False,
                     timeout=600
                 )
                 if self.es: