From c6dd35484dabde93e31cba5537cc5cac32cb53ae Mon Sep 17 00:00:00 2001
From: Ubuntu <phyer@sina.com>
Date: Sun, 2 Feb 2025 12:08:01 +0800
Subject: [PATCH] update
---
efk/elasticsearch-deployment.yaml | 9 +++++++++
efk/init.sh | 10 ++++++++++
efk/kibana-deployment.yaml | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/efk/elasticsearch-deployment.yaml b/efk/elasticsearch-deployment.yaml
index a99d80c..929b974 100644
--- a/efk/elasticsearch-deployment.yaml
+++ b/efk/elasticsearch-deployment.yaml
@@ -32,6 +32,15 @@ spec:
secretKeyRef:
name: elasticsearch-secret
key: elastic_password
+ - name: ES_JAVA_OPTS
+ value: "-Xms2g -Xmx2g" # 设置 JVM 堆大小为 2GB
+ resources: # 增加资源限制
+ requests:
+ memory: "2Gi"
+ cpu: "1"
+ limits:
+ memory: "4Gi"
+ cpu: "2"
volumeMounts:
- name: data-volume
mountPath: /usr/share/elasticsearch/data
diff --git a/efk/init.sh b/efk/init.sh
index 8e599c3..e25c5ee 100644
--- a/efk/init.sh
+++ b/efk/init.sh
@@ -1,3 +1,10 @@
+
+
+cd /home/ubuntu/k8sCongfigs/traefik
+microk8s.kubectl apply -f traefik_role.yaml
+microk8s.kubectl apply -f traefik_role.yaml
+microk8s.kubectl apply -f traefik_roleBind.yaml
+
cd /home/ubuntu/k8sCongfigs/efk
sudo su
// 准备 es 配置
@@ -14,6 +21,7 @@ microk8s.kubectl apply -f elasticsearch-service.yaml
// 这个时候正在创建elasticsearch的pod，需要拉取镜像，大概1个多小时，如果有离线的直接导入离线的镜像
sleep 3600
./createSecure_passwd_forES.sh
+./createFluentdAccoutnIn.sh
microk8s.kubectl apply -f fluentd-configMap.yaml
microk8s.kubectl apply -f fluentd-daemonset.yaml
@@ -25,6 +33,8 @@ microk8s.kubectl apply -f kibana-deployment.yaml
microk8s.kubectl apply -f kibana-ingress.yaml
microk8s.kubectl apply -f kibana-service.yaml
+./refreshTokenForKibana.sh
+
diff --git a/efk/kibana-deployment.yaml b/efk/kibana-deployment.yaml
index a65dbcc..0bce0a6 100644
--- a/efk/kibana-deployment.yaml
+++ b/efk/kibana-deployment.yaml
@@ -30,4 +30,4 @@ spec:
- name: XPACK_REPORTING_ENCRYPTIONKEY
value: "yet_another_secure_random_string_of_32_characters"
- name: ELASTICSEARCH_SERVICEACCOUNTTOKEN
- value: "AAEAAWVsYXN0aWMva2liYW5hL215LXRva2VuOlZycER6YktPU2Qtb0xXM1hHQ2ZtUnc"
+ value: "AAEAAWVsYXN0aWMva2liYW5hL215LXRva2VuOmlnZWdqMGp5UWI2ODVaZzZaMElVVmc"