Skip to content
Snippets Groups Projects
Commit e1118e56 authored by Bert Palm's avatar Bert Palm :bug:
Browse files

use new scripts instead of main.py

parent 553f4ea8
No related branches found
No related tags found
1 merge request!222Cleanup3000
......@@ -560,13 +560,8 @@ services:
MINIO_URL: "${MINIO_HOST}"
MINIO_ACCESS_KEY: "${MINIO_ROOT_USER}"
MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD}"
S3MAP_DB_URL: "postgresql://\
${S3MAP_POSTGRES_USER}:\
${S3MAP_POSTGRES_PASS}@\
${S3MAP_POSTGRES_HOST}/\
${S3MAP_POSTGRES_DB}"
command:
- create-thing-in-minio
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "minio_setup.py"]
# Summary
......@@ -602,8 +597,8 @@ services:
${CREATEDB_POSTGRES_DATABASE}"
SMS_URL: "${SMS_URL}"
CV_URL: "${CV_URL}"
command:
- create-thing-in-postgres
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "db_setup.py"]
worker-frost-setup:
......@@ -626,7 +621,8 @@ services:
MQTT_CLEAN_SESSION: "${MQTT_CLEAN_SESSION}"
MQTT_QOS: "${MQTT_QOS}"
TOMCAT_PROXY_URL: "${TOMCAT_PROXY_URL}"
entrypoint: ["python3", "frost_handler.py"]
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "frost_setup.py"]
# brief: Add user to mqtt_auth DB, so they are allowed to use mqtt
......@@ -652,8 +648,8 @@ services:
${CREATEDB_POSTGRES_PASSWORD}@\
${CREATEDB_POSTGRES_HOST}/\
${CREATEDB_POSTGRES_DATABASE}"
command:
- create-mqtt-user
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "mqtt_user_setup.py"]
worker-grafana-dashboard:
......@@ -677,8 +673,8 @@ services:
GRAFANA_USER: "${GRAFANA_USER}"
GRAFANA_PASSWORD: "${GRAFANA_PASSWORD}"
GRAFANA_DEFAULT_DATASOURCE_SSLMODE: "${GRAFANA_DEFAULT_DATASOURCE_SSLMODE}"
command:
- create-thing-in-grafana
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "grafana_dashboard_setup.py"]
# =================================================================
......@@ -702,15 +698,11 @@ services:
MQTT_CLIENT_ID: file-ingest
MQTT_CLEAN_SESSION: "${MQTT_CLEAN_SESSION}"
MQTT_QOS: "${MQTT_QOS}"
TOPIC_DATA_PARSED: "${TOPIC_DATA_PARSED}"
MINIO_SECURE: "${MINIO_SECURE}"
MINIO_URL: "${MINIO_HOST}"
MINIO_ACCESS_KEY: "${MINIO_ROOT_USER}"
MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD}"
S3MAP_DB_URL: "postgresql://\
${S3MAP_POSTGRES_USER}:\
${S3MAP_POSTGRES_PASS}@\
${S3MAP_POSTGRES_HOST}/\
${S3MAP_POSTGRES_DB}"
CONFIGDB_DSN: "postgresql://\
${CONFIGDB_USER}:\
${CONFIGDB_PASSWORD}@\
......@@ -718,11 +710,7 @@ services:
${CONFIGDB_PORT}/\
${CONFIGDB_DB}"
DB_API_BASE_URL: "${DB_API_BASE_URL}"
DATABASE_HOST: "${CREATEDB_POSTGRES_HOST}"
DATABASE_NAME: "${CREATEDB_POSTGRES_DATABASE}"
TOPIC_DATA_PARSED: "${TOPIC_DATA_PARSED}"
command:
- schedule-parser-job
entrypoint: ["python3", "parse_file_data.py"]
worker-run-qaqc:
......@@ -773,14 +761,14 @@ services:
MQTT_CLIENT_ID: mqtt-ingest
MQTT_CLEAN_SESSION: "${MQTT_CLEAN_SESSION}"
MQTT_QOS: "${MQTT_QOS}"
command:
- parse-mqtt-data
- --target-uri
- "postgresql://\
${CREATEDB_POSTGRES_USER}:\
${CREATEDB_POSTGRES_PASSWORD}@\
${CREATEDB_POSTGRES_HOST}/\
${CREATEDB_POSTGRES_DATABASE}"
CONFIGDB_DSN: "postgresql://\
${CONFIGDB_USER}:\
${CONFIGDB_PASSWORD}@\
${CONFIGDB_HOST}:\
${CONFIGDB_PORT}/\
${CONFIGDB_DB}"
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "parse_mqtt_data.py"]
worker-crontab-setup:
......@@ -800,10 +788,10 @@ services:
MQTT_CLIENT_ID: crontab-setup
MQTT_CLEAN_SESSION: "${MQTT_CLEAN_SESSION}"
MQTT_QOS: "${MQTT_QOS}"
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "crontab_setup.py"]
volumes:
- ./cron/crontab.txt:/tmp/cron/crontab.txt
command:
- update-sftp-crontab
# =================================================================
# other worker
......@@ -830,8 +818,8 @@ services:
GRAFANA_USER: "${GRAFANA_USER}"
GRAFANA_PASSWORD: "${GRAFANA_PASSWORD}"
ALLOWED_VOS: "${ALLOWED_VOS}"
command:
- create-grafana-user
DB_API_BASE_URL: "${DB_API_BASE_URL}"
entrypoint: ["python3", "grafana_user_setup.py"]
cron-scheduler:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment