qaapi域名替换成holmes

tke/java.sh

@@ -19,7 +19,8 @@ else
 fi
 echo 172.20.3.11 sentry.quantgroups.com >> /etc/hosts
 
-dubboPort=`curl -s -m 5 curl 'http://qaapi.liangkebang.com/k8s/service/details' -H 'cluster: qa' -H 'content-type: application/json;charset=UTF-8'  --data-binary "{\"serviceName\":\"${SYSTEM_NAME}\",\"namespace\":\"${NAMESPACE}\",\"type\":\"java\",\"key\":\"port_20880\"}"`
+# dubboPort=`curl -s -m 5 curl 'http://qaapi.liangkebang.com/k8s/service/details' -H 'cluster: qa' -H 'content-type: application/json;charset=UTF-8'  --data-binary "{\"serviceName\":\"${SYSTEM_NAME}\",\"namespace\":\"${NAMESPACE}\",\"type\":\"java\",\"key\":\"port_20880\"}"`
+dubboPort=`curl -s -m 5 "http://holmes.liangkebang.com/k8s/service/detail?namespace=${NAMESPACE}&serviceType=java&serviceName=${SYSTEM_NAME}"`
 if [[ ${#dubboPort} == 5 ]];then
   echo dubboPort
   echo $dubboPort
@@ -56,9 +57,14 @@ echo "unset NAMESPACE" >>  ~/.bashrc
 echo "alias log='cd logs;tail -500f *log';" >> ~/.bashrc
 source ~/.bashrc
 
-startCmd=`curl -s -m 5 "http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=start_command"`
-if [[ "$startCmd" == ""  ||  "$startCmd" =~ '0001' ]]; then 
-    echo "获取start_command异常，请检查 http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=start_command" 
+# startCmd=`curl -s -m 5 "http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=start_command"`
+# if [[ "$startCmd" == ""  ||  "$startCmd" =~ '0001' ]]; then 
+#     echo "获取start_command异常，请检查 http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=start_command" 
+#     exit -1
+# fi
+startCmd=`curl -s -m 5 "http://holmes.liangkebang.com/docker/project/get_info?projectName=${SYSTEM_NAME}&key=start_command"`
+if [[ "$startCmd" == "" ]]; then 
+    echo "获取start_command异常，请检查 http://holmes.liangkebang.com/docker/project/get_info?projectName=${SYSTEM_NAME}&key=start_command" 
     exit -1
 fi
 

tke/ui.sh

@@ -8,10 +8,16 @@ echo "NAMESPACE is $NAMESPACE"
 
 # 运行qa工具
 echo "SYSTEM_NAME is $SYSTEM_NAME"
-host=`curl -s -m 5 "http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=host_name"`
+# host=`curl -s -m 5 "http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=host_name"`
+# echo "host: ${host}"
+# if [[ "$host" == ""  ||  "$host" =~ '0001' ]]; then 
+#     echo "获取host异常，请检查 http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=host_name" 
+#     exit -1
+# fi
+host=`curl -s -m 5 "http://holmes.liangkebang.com/docker/project/get_info?projectName=${SYSTEM_NAME}&key=host_name"`
 echo "host: ${host}"
-if [[ "$host" == ""  ||  "$host" =~ '0001' ]]; then 
-    echo "获取host异常，请检查 http://qaapi.liangkebang.com/proconfig/get_info?system_name=${SYSTEM_NAME}&key=host_name" 
+if [[ "$host" == "" ]]; then 
+    echo "获取host异常，请检查 http://holmes.liangkebang.com/docker/project/get_info?projectName=${SYSTEM_NAME}&key=host_name" 
     exit -1
 fi