From 704004360e777267c6ecbb2af4e6a109790f3185 Mon Sep 17 00:00:00 2001
From: xzchaoo <xzchaoo@gmail.com>
Date: Tue, 8 Aug 2023 19:38:38 +0800
Subject: [PATCH] refactor: use es as default trace store

---
 scripts/docker/bin/health.sh                  |  0
 test/scenes/common/base.yaml                  |  1 +
 test/scenes/scene-default/application.yaml    |  4 ++--
 test/scenes/scene-default/docker-compose.yaml | 21 +------------------
 4 files changed, 4 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 scripts/docker/bin/health.sh

diff --git a/scripts/docker/bin/health.sh b/scripts/docker/bin/health.sh
old mode 100644
new mode 100755
diff --git a/test/scenes/common/base.yaml b/test/scenes/common/base.yaml
index c3d4eb178..4332ef0e4 100644
--- a/test/scenes/common/base.yaml
+++ b/test/scenes/common/base.yaml
@@ -105,6 +105,7 @@ services:
     - ./collector-config.yml:/config/config.yml
   agent-image:
     image: ${agent_image:-holoinsight/agent:latest}
+    pull_policy: always
     volumes:
     - ./agent.yaml:/temp/agent.yaml
     entrypoint: [ "true" ]
diff --git a/test/scenes/scene-default/application.yaml b/test/scenes/scene-default/application.yaml
index 634ecd6db..adc266bf0 100644
--- a/test/scenes/scene-default/application.yaml
+++ b/test/scenes/scene-default/application.yaml
@@ -31,8 +31,8 @@ holoinsight:
   storage:
     elasticsearch:
       enable: true
-      hosts: tatris
-      port: 6060
+      hosts: es
+      port: 9200
   security:
     whiteHosts: server
 
diff --git a/test/scenes/scene-default/docker-compose.yaml b/test/scenes/scene-default/docker-compose.yaml
index 543f541a5..d7fa36eef 100644
--- a/test/scenes/scene-default/docker-compose.yaml
+++ b/test/scenes/scene-default/docker-compose.yaml
@@ -11,17 +11,6 @@ services:
     extends:
       file: ../common/base.yaml
       service: phpmyadmin
-#  mongo:
-#    extends:
-#      file: ../common/base.yaml
-#      service: mongo
-#  mongo-express:
-#    extends:
-#      file: ../common/base.yaml
-#      service: mongo-express
-#    depends_on:
-#      mongo:
-#        condition: service_healthy
   ceresdb:
     extends:
       file: ../common/base.yaml
@@ -37,11 +26,6 @@ services:
     extends:
       file: ../common/base.yaml
       service: es
-  # tatris
-  tatris:
-    extends:
-      file: ../common/base.yaml
-      service: tatris
   kibana:
     extends:
       file: ../common/base.yaml
@@ -70,14 +54,10 @@ services:
     depends_on:
       mysql-data-init:
         condition: service_completed_successfully
-#      mongo:
-#        condition: service_healthy
       ceresdb:
         condition: service_healthy
       es:
         condition: service_healthy
-      tatris:
-        condition: service_healthy
     volumes:
     - ./application.yaml:/home/admin/application.yaml:ro
     - share:/share
@@ -96,6 +76,7 @@ services:
     extends:
       file: ../common/base.yaml
       service: agent-image
+    pull_policy: always
     volumes:
     - share:/share
     entrypoint: