Merge branch 'release-1.0.1' into 'main'

README.md

@@ -26,6 +26,10 @@ Filebeat 负责数据采集
 
     bash start-and-init.sh
 
+###默认地址
+
+    http://localhost:15601/app/discover
+
 ###日志查看
 
     docker-compose logs --tail=100 elasticsearch

init-kibana.sh

@@ -60,11 +60,25 @@ function notHealth() {
   fi
 }
 
+function checkELKRunning(){
+  if [ "$(docker ps | grep -c 'docker-elk' )" -lt 1 ]; then
+    red "==============="
+    red "ELK not running"
+    red "==============="
+    exit 1
+  fi
+}
+
+checkELKRunning
 start=$(date +%s)
 while notHealth; do
   end=$(date +%s)
-  take=$((end - start))
+  take=$((100 - (end - start)  ))
   red "Kibana not ready yet, waiting... time: $take"
+  if [ "$take" -lt 0 ]; then
+      red "time out, please check ELK status"
+      exit 1
+  fi
   sleep 1s
 done
 green "======================================="

start.sh

@@ -23,10 +23,16 @@ function checkAllPort() {
 }
 
 function start(){
-  docker-compose up -d
+  if docker-compose up -d; then
     green "==============="
     green "start succeed"
     green "==============="
+  else
+    red "==============="
+    red "start failed"
+    red "==============="
+    exit 1
+  fi
 }
 
 function checkPS(){