Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
environment:
- "discovery.type=single-node"
- "xpack.security.enabled=false"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
ulimits:
memlock:
soft: -1
Expand All @@ -16,6 +16,7 @@ services:
ports:
- "9200:9200"
- "9300:9300"
restart: unless-stopped
kibana:
container_name: kb-container
image: docker.elastic.co/kibana/kibana:7.16.1
Expand Down
8 changes: 4 additions & 4 deletions config/devnet/2-mx-exchange-service/.env
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ REDIS_DB=0
#MongoDB
MONGODB_URL=mongodb://localhost:27018
MONGODB_DATABASE=development
MONGODB_USERNAME=admin
MONGODB_PASSWORD=admin
MONGODB_USERNAME=admin_1234
MONGODB_PASSWORD=admin_1234

#Elasticsearch server to use for logging. Optional
ELASTICSEARCH_URL="https://testnet-index.multiversx.com"
Expand Down Expand Up @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false
TIMESCALEDB_URL="localhost"
TIMESCALEDB_PORT=5432
TIMESCALEDB_DATABASE="postgres"
TIMESCALEDB_USERNAME="postgres"
TIMESCALEDB_PASSWORD="postgres"
TIMESCALEDB_USERNAME="postgres_1234"
TIMESCALEDB_PASSWORD="postgres_1234"
8 changes: 4 additions & 4 deletions config/devnet/2-mx-exchange-service/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ services:
environment:
HOSTNAME: rabbitmq
RABBITMQ_NODENAME: rabbitmq
RABBITMQ_DEFAULT_USER: "guest"
RABBITMQ_DEFAULT_PASS: "guest"
RABBITMQ_DEFAULT_USER: "guest_1234"
RABBITMQ_DEFAULT_PASS: "guest_1234"
volumes:
- /var/lib/rabbitmq
ports:
Expand All @@ -25,8 +25,8 @@ services:
image: mongo:latest
environment:
- MONGODB_DATABASE=development
- MONGO_INITDB_ROOT_USERNAME=admin
- MONGO_INITDB_ROOT_PASSWORD=admin
- MONGO_INITDB_ROOT_USERNAME=admin_1234
- MONGO_INITDB_ROOT_PASSWORD=admin_1234
ports:
- "27018:27017"
timescaledb:
Expand Down
21 changes: 19 additions & 2 deletions config/devnet/2-mx-exchange-service/timescaledb.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Overwritted by mvx-api-deployer
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CommonAppModule } from 'src/common.app.module';
Expand All @@ -16,6 +15,15 @@ import {
SumHourly,
TokenBurnedWeekly,
XExchangeAnalyticsEntity,
TokenCandlesMinute,
TokenCandlesHourly,
TokenCandlesDaily,
PairFirstTokenCandlesMinute,
PairFirstTokenCandlesHourly,
PairFirstTokenCandlesDaily,
PairSecondTokenCandlesMinute,
PairSecondTokenCandlesHourly,
PairSecondTokenCandlesDaily,
} from './entities/timescaledb.entities';
import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';

Expand All @@ -33,7 +41,7 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
username: apiConfig.getTimescaleDbUsername(),
password: apiConfig.getTimescaleDbPassword(),
applicationName: 'xExchangeService',
ssl: false,
ssl: true,
entities: ['dist/**/*.entities.{ts,js}'],
}),
inject: [ApiConfigService],
Expand All @@ -49,6 +57,15 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
PriceCandleMinute,
PriceCandleHourly,
PriceCandleDaily,
TokenCandlesMinute,
TokenCandlesHourly,
TokenCandlesDaily,
PairFirstTokenCandlesMinute,
PairFirstTokenCandlesHourly,
PairFirstTokenCandlesDaily,
PairSecondTokenCandlesMinute,
PairSecondTokenCandlesHourly,
PairSecondTokenCandlesDaily,
]),
],
providers: [TimescaleDBQueryService, TimescaleDBWriteService],
Expand Down
2 changes: 1 addition & 1 deletion config/devnet/3-mx-api-service/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
image: mongo:latest
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: secret
MONGO_INITDB_ROOT_PASSWORD: secret_1234
ports:
- 27017:27017

Expand Down
3 changes: 2 additions & 1 deletion config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
environment:
- "discovery.type=single-node"
- "xpack.security.enabled=false"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
ulimits:
memlock:
soft: -1
Expand All @@ -16,6 +16,7 @@ services:
ports:
- "9200:9200"
- "9300:9300"
restart: unless-stopped
kibana:
container_name: kb-container
image: docker.elastic.co/kibana/kibana:7.16.1
Expand Down
8 changes: 4 additions & 4 deletions config/mainnet/2-mx-exchange-service/.env
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ REDIS_DB=0
#MongoDB
MONGODB_URL=mongodb://localhost:27018
MONGODB_DATABASE=development
MONGODB_USERNAME=admin
MONGODB_PASSWORD=admin
MONGODB_USERNAME=admin_1234
MONGODB_PASSWORD=admin_1234

#Elasticsearch server to use for logging. Optional
ELASTICSEARCH_URL="https://testnet-index.multiversx.com"
Expand Down Expand Up @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false
TIMESCALEDB_URL="localhost"
TIMESCALEDB_PORT=5432
TIMESCALEDB_DATABASE="postgres"
TIMESCALEDB_USERNAME="postgres"
TIMESCALEDB_PASSWORD="postgres"
TIMESCALEDB_USERNAME="postgres_1234"
TIMESCALEDB_PASSWORD="postgres_1234"
12 changes: 6 additions & 6 deletions config/mainnet/2-mx-exchange-service/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ services:
environment:
HOSTNAME: rabbitmq
RABBITMQ_NODENAME: rabbitmq
RABBITMQ_DEFAULT_USER: "guest"
RABBITMQ_DEFAULT_PASS: "guest"
RABBITMQ_DEFAULT_USER: "guest_1234"
RABBITMQ_DEFAULT_PASS: "guest_1234"
volumes:
- /var/lib/rabbitmq
ports:
Expand All @@ -25,8 +25,8 @@ services:
image: mongo:latest
environment:
- MONGODB_DATABASE=development
- MONGO_INITDB_ROOT_USERNAME=admin
- MONGO_INITDB_ROOT_PASSWORD=admin
- MONGO_INITDB_ROOT_USERNAME=admin_1234
- MONGO_INITDB_ROOT_PASSWORD=admin_1234
ports:
- "27018:27017"
timescaledb:
Expand All @@ -35,7 +35,7 @@ services:
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres_1234
POSTGRES_USER: postgres_1234
TIMESCALEDB_TELEMETRY: off
PGDATA: /var/lib/postgresql/data/pgdata
21 changes: 19 additions & 2 deletions config/mainnet/2-mx-exchange-service/timescaledb.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Overwritted by mvx-api-deployer
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CommonAppModule } from 'src/common.app.module';
Expand All @@ -16,6 +15,15 @@ import {
SumHourly,
TokenBurnedWeekly,
XExchangeAnalyticsEntity,
TokenCandlesMinute,
TokenCandlesHourly,
TokenCandlesDaily,
PairFirstTokenCandlesMinute,
PairFirstTokenCandlesHourly,
PairFirstTokenCandlesDaily,
PairSecondTokenCandlesMinute,
PairSecondTokenCandlesHourly,
PairSecondTokenCandlesDaily,
} from './entities/timescaledb.entities';
import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';

Expand All @@ -33,7 +41,7 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
username: apiConfig.getTimescaleDbUsername(),
password: apiConfig.getTimescaleDbPassword(),
applicationName: 'xExchangeService',
ssl: false,
ssl: true,
entities: ['dist/**/*.entities.{ts,js}'],
}),
inject: [ApiConfigService],
Expand All @@ -49,6 +57,15 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
PriceCandleMinute,
PriceCandleHourly,
PriceCandleDaily,
TokenCandlesMinute,
TokenCandlesHourly,
TokenCandlesDaily,
PairFirstTokenCandlesMinute,
PairFirstTokenCandlesHourly,
PairFirstTokenCandlesDaily,
PairSecondTokenCandlesMinute,
PairSecondTokenCandlesHourly,
PairSecondTokenCandlesDaily,
]),
],
providers: [TimescaleDBQueryService, TimescaleDBWriteService],
Expand Down
1 change: 1 addition & 0 deletions scripts/2-observing-squad.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ObsSquad_Prepare_Environment() {
sed -i "s/^ENVIRONMENT=\".*\"/ENVIRONMENT=\"$NETWORK\"/" "$config_file"
sed -i "s|^CUSTOM_HOME=.*|CUSTOM_HOME=\"$HOME\"|" "$config_file"
sed -i "s/^CUSTOM_USER=.*$/CUSTOM_USER=\"$USERNAME\"/" "$config_file"
sed -i "s/^OVERRIDE_PROXYVER=.*$/OVERRIDE_PROXYVER=tags/v1.1.57/" "$config_file"

}

Expand Down