diff --git a/efk_cluster/kibana-cluster.yaml b/efk_cluster/kibana-cluster.yaml index 1cf1544..36d900e 100644 --- a/efk_cluster/kibana-cluster.yaml +++ b/efk_cluster/kibana-cluster.yaml @@ -22,14 +22,7 @@ spec: - containerPort: 5601 env: - name: ELASTICSEARCH_HOSTS - value: "http://elasticsearch-0.elasticsearch-service.efk.svc.cluster.local:9200" # 直接连接 master 节点 - - name: ELASTICSEARCH_USERNAME - value: "elastic" - - name: ELASTICSEARCH_PASSWORD - valueFrom: - secretKeyRef: - name: elasticsearch-secret - key: elastic_password + value: "http://elasticsearch-0-0.elasticsearch-service.efk.svc.cluster.local:9200" # 直接连接 master 节点 - name: XPACK_SECURITY_ENCRYPTIONKEY value: "a_secure_random_string_of_32_characters" - name: XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY @@ -37,5 +30,4 @@ spec: - name: XPACK_REPORTING_ENCRYPTIONKEY value: "yet_another_secure_random_string_of_32_characters" - name: ELASTICSEARCH_SERVICEACCOUNTTOKEN - value: "AAEAAWVsYXN0aWMva2liYW5hL215" - + value: "AAEAAWVsYXN0aWMva2liYW5hL215LXRva2VuOkRkYWM1ZDY2VG9XLUdvTmxfQnhvM2c" diff --git a/efk_cluster/kibana-deployment.yaml_tmp b/efk_cluster/kibana-deployment.yaml_tmp index bdca028..4ff2b1c 100644 --- a/efk_cluster/kibana-deployment.yaml_tmp +++ b/efk_cluster/kibana-deployment.yaml_tmp @@ -22,7 +22,7 @@ spec: - containerPort: 5601 env: - name: ELASTICSEARCH_HOSTS - value: "http://elasticsearch.efk.svc.cluster.local:9200" + value: "http://elasticsearch-0-0.elasticsearch-service.efk.svc.cluster.local:9200" # 直接连接 master 节点 - name: XPACK_SECURITY_ENCRYPTIONKEY value: "a_secure_random_string_of_32_characters" - name: XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY diff --git a/efk_cluster/refreshTokenForKibana.sh b/efk_cluster/refreshTokenForKibana.sh index 6f5f964..4f30b87 100755 --- a/efk_cluster/refreshTokenForKibana.sh +++ b/efk_cluster/refreshTokenForKibana.sh @@ -14,6 +14,6 @@ microk8s.kubectl delete deployment kibana -n efk # 更新 Kibana Deployment YAML 文件 cd $(pwd) # 将 token 设置为环境变量 -sed "s/##TOKEN##/$TOKEN/" kibana-deployment.yaml_tmp >kibana-deployment.yaml +sed "s/##TOKEN##/$TOKEN/" kibana-deployment.yaml_tmp >kibana-cluster.yaml # 删除并重新应用 Kibana Deployment -microk8s.kubectl apply -f kibana-deployment.yaml +microk8s.kubectl apply -f kibana-cluster.yaml