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

chore: cleanup #27

Merged
merged 2 commits into from
Sep 1, 2023
+115 −75
Merged

chore: cleanup #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e5b042
chore: cleanup
mdebarros Sep 1, 2023
19a2d1e
removed unecessary env var
mdebarros Sep 1, 2023
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
16 changes: 16 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,27 @@ CENTRAL_LEDGER_VERSION=v17.0.3
## CL snapshot release with included fix: JSON.stringify disabled in logResponse function
# CENTRAL_LEDGER_VERSION=v17.0.4-snapshot.0

## Testing & Sims
TEST_SIMULATOR_VERSION=v11.1.3
TEST_TTK_SVC_VERSION=v16.1.1
TEST_TTK_UI_VERSION=v15.3.0
TEST_TTK_CLI_VERSION=v1.2.0
TEST_CALLBACK_HAND_SVC_VERSION=local

## Dependencies
DEP_KAFKA_VERSION=3.5.0
DEP_KAfKA_UI_VERSION=latest
DEP_MYSQL_VERSION=8.0
DEP_MONGO_VERSION=6.0.5
DEP_KOWL_VERSION=v1.4.0

## Monitoring Docker Image Versions
GRAFANA_VERSION=10.0.2
GRAFANA_RENDERER_VERSION=3.7.1
PROMETHEUS_VERSION=v2.45.0
NODE_EXPORTER_VERSION=latest
MYSQLD_EXPORTER_VERSION=v0.15.0
KAFKA_EXPORTER_VERSION=latest
CADVISER_VERSION=latest

## Load Docker Image Versions
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

**/results/**

**/reports/**

automate_perf.env
16 changes: 7 additions & 9 deletions docker-compose-monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ services:
# - node.hostname == ${HOSTNAME}

node-exporter:
image: quay.io/prometheus/node-exporter:latest
image: quay.io/prometheus/node-exporter:${NODE_EXPORTER_VERSION}
volumes:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
Expand Down Expand Up @@ -141,7 +141,7 @@ services:
- ./docker/renderer/config.json:/usr/src/app/config.json

mysqlexporter-als:
image: prom/mysqld-exporter:v0.15.0
image: prom/mysqld-exporter:${MYSQLD_EXPORTER_VERSION}
# ports:
# - "9104:9104"
networks:
Expand All @@ -156,7 +156,7 @@ services:
- als-test

mysqlexporter-cl:
image: prom/mysqld-exporter:v0.15.0
image: prom/mysqld-exporter:${MYSQLD_EXPORTER_VERSION}
# ports:
# - "9104:9104"
networks:
Expand All @@ -171,7 +171,7 @@ services:
- transfers-test

kafka-exporter:
image: danielqsj/kafka-exporter:latest
image: danielqsj/kafka-exporter:${KAFKA_EXPORTER_VERSION}
ports:
- "9308:9308"
networks:
Expand All @@ -180,14 +180,12 @@ services:
command:
- --kafka.server=kafka:9092

## Debug utilities
kafka-debug-console:
# image: quay.io/cloudhut/kowl:v1.4.0
image: docker.redpanda.com/redpandadata/console:latest
kafka-mon-ui:
image: docker.redpanda.com/redpandadata/console:${DEP_KAfKA_UI_VERSION}
deploy:
replicas: 1
restart: on-failure
hostname: kafka-debug-console
hostname: kafka-mon-ui
ports:
- "9080:8080"
networks:
Expand Down
58 changes: 29 additions & 29 deletions docker-compose-perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ services:
- als-test

mysql-als:
image: mysql/mysql-server
image: mysql/mysql-server:${DEP_MYSQL_VERSION}
env_file:
- .env
- perf.env
Expand Down Expand Up @@ -432,7 +432,7 @@ services:
- transfers-test

# objstore:
# image: mongo:6.0.5
# image: mongo:${DEP_MONGO_VERSION}
# container_name: objstore
# ports:
# - "27017:27017"
Expand All @@ -456,7 +456,7 @@ services:
container_name: kafka-provisioning
networks:
- mojaloop-net
image: docker.io/bitnami/kafka:3.4.0
image: docker.io/bitnami/kafka:${DEP_KAFKA_VERSION}
env_file:
- perf.env
depends_on:
Expand Down Expand Up @@ -491,7 +491,7 @@ services:
kafka:
networks:
- mojaloop-net
image: docker.io/bitnami/kafka:3.4.0
image: docker.io/bitnami/kafka:${DEP_KAFKA_VERSION}
container_name: kafka
# ports:
# - "9092:9092"
Expand Down Expand Up @@ -525,7 +525,7 @@ services:
- transfers-test

mysql-cl:
image: mysql/mysql-server
image: mysql/mysql-server:${DEP_MYSQL_VERSION}
container_name: mysql-cl
# ports:
# - "3306:3306"
Expand Down Expand Up @@ -636,7 +636,7 @@ services:

## Testing Toolkit
mojaloop-testing-toolkit:
image: mojaloop/ml-testing-toolkit:v16.1.1
image: mojaloop/ml-testing-toolkit:${TEST_TTK_SVC_VERSION}
env_file:
- .env
- perf.env
Expand Down Expand Up @@ -666,7 +666,7 @@ services:
- transfers-test

mojaloop-testing-toolkit-ui:
image: mojaloop/ml-testing-toolkit-ui:v15.3.0
image: mojaloop/ml-testing-toolkit-ui:${TEST_TTK_UI_VERSION}
env_file:
- .env
- perf.env
Expand All @@ -687,7 +687,7 @@ services:
- transfers-test

ttk-provisioning-als:
image: mojaloop/ml-testing-toolkit-client-lib:v1.2.0
image: mojaloop/ml-testing-toolkit-client-lib:${TEST_TTK_CLI_VERSION}
env_file:
- .env
- perf.env
Expand All @@ -711,7 +711,7 @@ services:
- ttk-provisioning-als

ttk-provisioning-transfers:
image: mojaloop/ml-testing-toolkit-client-lib:v1.2.0
image: mojaloop/ml-testing-toolkit-client-lib:${TEST_TTK_CLI_VERSION}
env_file:
- .env
- perf.env
Expand Down Expand Up @@ -749,7 +749,7 @@ services:
- ttk-provisioning-transfers

callback-handler-svc-oracle-sim:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -759,7 +759,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -782,7 +782,7 @@ services:
- als-test

callback-handler-svc-cl-sim:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -792,7 +792,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -816,7 +816,7 @@ services:
- transfers-test

sim-perffsp1:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -826,7 +826,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -852,7 +852,7 @@ services:
- 8dfsp

sim-perffsp2:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -862,7 +862,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -888,7 +888,7 @@ services:
- 8dfsp

sim-perffsp3:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -898,7 +898,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -919,7 +919,7 @@ services:
- 8dfsp

sim-perffsp4:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -929,7 +929,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -950,7 +950,7 @@ services:
- 8dfsp

sim-perffsp5:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -960,7 +960,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -980,7 +980,7 @@ services:
- 8dfsp

sim-perffsp6:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -990,7 +990,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -1010,7 +1010,7 @@ services:
- 8dfsp

sim-perffsp7:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -1020,7 +1020,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand All @@ -1040,7 +1040,7 @@ services:
- 8dfsp

sim-perffsp8:
image: mojaloop/callback-handler-svc:local
image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
deploy:
mode: replicated
replicas: 1
Expand All @@ -1050,7 +1050,7 @@ services:
build:
context: ./packages/callback-handler-svc
cache_from:
- mojaloop/callback-handler-svc:local
- mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
# ports:
# - "3001:3001"
networks:
Expand Down
Loading