Commit a37f450a authored by Federico Sismondi's avatar Federico Sismondi

Merge branch 'lora_node_info_hanlder' into 'master'

Lora node info hanlder

See merge request !9
parents c47c3f7c 16211803
......@@ -119,3 +119,10 @@ UPDATE|
+----------------------+
```
## Useful mysql queries for DB querying
```mysql-sql
SELECT time_index, entity_id, soilMoisture FROM mtcarouge.etflowerbed ORDER BY time_index DESC limit 100;
```
This diff is collapsed.
......@@ -55,7 +55,7 @@ def get_data_from_weather_service():
url=URL_weather_service,
timeout=90,
)
except (requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError):
except (requests.exceptions.ReadTimeout, requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError):
logger.info('Could not weather reach service')
return None
try:
......
......@@ -84,7 +84,7 @@ services:
environment:
- DEBUG=idm:*
- IDM_DB_HOST=mysql-db
- IDM_DB_PASS_FILE=/run/secrets/my_secret_data
- IDM_DB_PASS_FILE=/run/secrets/db_password
- IDM_DB_USER=root
- IDM_HOST=http://5.53.108.182:${KEYROCK_PORT}
- IDM_PORT=${KEYROCK_PORT}
......@@ -95,7 +95,7 @@ services:
- IDM_ADMIN_EMAIL=alice-the-admin@test.com
- IDM_ADMIN_PASS=test
secrets:
- my_secret_data
- db_password
healthcheck:
test: curl --fail -s http://localhost:${KEYROCK_PORT}/version || exit 1
start_period: 40s
......@@ -203,13 +203,13 @@ services:
default:
ipv4_address: 172.18.1.6
environment:
- "MYSQL_ROOT_PASSWORD_FILE=/run/secrets/my_secret_data"
- "MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_password"
- "MYSQL_ROOT_HOST=172.18.1.5" # Allow Keyrock to access this database
volumes:
- mysql-db:/var/lib/mysql
- ./mysql-data:/docker-entrypoint-initdb.d/:ro
secrets:
- my_secret_data
- db_password
# Quantum Leap - historical data manager
quantumleap:
......@@ -320,6 +320,9 @@ services:
- FLASK_RUN_PORT=80
- COLLECTION_DIR=/code/raw_data
- ORION_HOST=orion
- LORA_PLATFORM_SECRET_FILE=/run/secrets/lora_platform_auth_header
secrets:
- lora_platform_auth_header
expose:
- 80
volumes:
......@@ -334,6 +337,7 @@ services:
timeout: 10s
retries: 3
# - + - + - + - + - + - + - + - + - + - + - + - + - +
# Docker configs #
# - + - + - + - + - + - + - + - + - + - + - + - + - +
......@@ -354,5 +358,7 @@ volumes:
crate-storage: ~
secrets:
my_secret_data:
db_password:
file: secrets
lora_platform_auth_header:
file: secret_carouge_lora
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment