Skip to content

Commit

Permalink
Merge branch 'main' of github.com:m-cmp/mc-observability
Browse files Browse the repository at this point in the history
  • Loading branch information
ish-hcc committed Nov 7, 2024
2 parents 0b3a1ec + 4ccb90e commit 35faee5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
3 changes: 0 additions & 3 deletions java-module/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ services:
- internal_network
- external_network
volumes:
- ../python/scheduler/airflow-home:/usr/local/airflow
- /etc/localtime:/etc/localtime:ro
command: >
/bin/bash -c "
Expand All @@ -312,12 +311,10 @@ services:
airflow users create --username admin --password admin --email [email protected] --firstname admin --lastname admin --role Admin
# Import variables & Make connections
# airflow variables import -a overwrite /usr/local/airflow/airflow_variables.json
airflow variables set --description 'O11Y Manger API BASE URL' API_BASE_URL http://mc-o11y-manager:18080/api/o11y
airflow connections add --conn-type http --conn-host mc-o11y-insight-service --conn-schema http --conn-port 9001 api_base_url
airflow connections add --conn-type mysql --conn-host mariadb --conn-schema mc_observability --conn-login mc-agent --conn-password mc-agent --conn-port 3306 mcmp_db
airflow connections add --conn-type http --conn-host mc-manager --conn-port 18080 o11y-manager
airflow connections add --conn-type influxdb --conn-host mc-o11y-influx --conn-port 8086 --conn-schema downsampling --conn-login mc-agent --conn-password mc-agent influxdb
# Reload & Run dags
Expand Down
3 changes: 3 additions & 0 deletions python/scheduler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ ENV AIRFLOW_HOME='/usr/local/airflow'
# Set wd
WORKDIR /usr/local/airflow

# Copy local Airflow files to image
COPY ./airflow-home /usr/local/airflow

# Sleep forever
CMD sleep infinity

Check warning on line 26 in python/scheduler/Dockerfile

View workflow job for this annotation

GitHub Actions / Publish a container image

JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals

JSONArgsRecommended: JSON arguments recommended for CMD to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/
Empty file.
2 changes: 2 additions & 0 deletions python/scheduler/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ pyarrow==16.1.0
numpy==1.24.4
pandas==2.0.3
influxdb==5.3.2
WTForms==2.3.3
simple-dag-editor==0.1.1

0 comments on commit 35faee5

Please sign in to comment.