Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use es as default trace store in test scene #592

Merged
merged 1 commit into from
Aug 8, 2023
Merged

refactor: use es as default trace store in test scene #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified scripts/docker/bin/health.sh
100644 → 100755
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test/scenes/common/base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
4 changes: 2 additions & 2 deletions test/scenes/scene-default/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ holoinsight:
storage:
elasticsearch:
enable: true
hosts: tatris
port: 6060
hosts: es
port: 9200
security:
whiteHosts: server

Expand Down
21 changes: 1 addition & 20 deletions test/scenes/scene-default/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -96,6 +76,7 @@ services:
extends:
file: ../common/base.yaml
service: agent-image
pull_policy: always
volumes:
- share:/share
entrypoint:
Expand Down