Skip to content
Snippets Groups Projects
Commit 759eac14 authored by Christian Boettcher's avatar Christian Boettcher
Browse files

Merge branch 'main' of gitlab.jsc.fz-juelich.de:eflows4hpc-wp2/data-logistics-service

parents d3d1b112 ef92d374
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 10
− 0
View file @ 759eac14
...@@ -118,6 +118,16 @@ light-deploy-testing: ...@@ -118,6 +118,16 @@ light-deploy-testing:
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml' - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml'
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL"
force-light-deploy-testing: # for deploying images generated on other branches to testing - can only be done by logged in and authorized users
stage: deploy
when: manual
<<: *ssh_setup
environment: Testing
script:
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "cd /home/airflow/data-logistics-service && git stash && git stash clear && git checkout main && git checkout -f $CI_COMMIT_TAG && git pull --all"
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml'
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL"
full-deploy-production: full-deploy-production:
......
config/airflow.cfg
+ 269
− 126
View file @ 759eac14
This diff is collapsed.
dockers/docker-compose.yaml
+ 24
− 45
View file @ 759eac14
...@@ -24,9 +24,11 @@ ...@@ -24,9 +24,11 @@
# The following variables are supported: # The following variables are supported:
# #
# AIRFLOW_IMAGE_NAME - Docker image name used to run Airflow. # AIRFLOW_IMAGE_NAME - Docker image name used to run Airflow.
# Default: apache/airflow:2.2.1 # Default: apache/airflow:2.5.1
# AIRFLOW_UID - User ID in Airflow containers # AIRFLOW_UID - User ID in Airflow containers
# Default: 50000 # Default: 50000
# AIRFLOW_PROJ_DIR - Base path to which all the files will be volumed.
# Default: .
# Those configurations are useful mostly in case of standalone testing/running Airflow in test/try-out mode # Those configurations are useful mostly in case of standalone testing/running Airflow in test/try-out mode
# #
# _AIRFLOW_WWW_USER_USERNAME - Username for the administrator account (if requested). # _AIRFLOW_WWW_USER_USERNAME - Username for the administrator account (if requested).
...@@ -49,24 +51,26 @@ x-airflow-common: ...@@ -49,24 +51,26 @@ x-airflow-common:
environment: environment:
&airflow-common-env &airflow-common-env
AIRFLOW__CORE__EXECUTOR: CeleryExecutor AIRFLOW__CORE__EXECUTOR: CeleryExecutor
AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@postgres/airflow
AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@postgres/airflow AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@postgres/airflow
AIRFLOW__CELERY__RESULT_BACKEND: db+postgresql://airflow:airflow@postgres/airflow AIRFLOW__CELERY__RESULT_BACKEND: db+postgresql://airflow:airflow@postgres/airflow
AIRFLOW__CELERY__BROKER_URL: redis://:@redis:6379/0 AIRFLOW__CELERY__BROKER_URL: redis://:@redis:6379/0
AIRFLOW__CORE__FERNET_KEY: ${AIRFLOW__CORE__FERNET_KEY} AIRFLOW__CORE__FERNET_KEY: ${AIRFLOW__CORE__FERNET_KEY}
AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'true' AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'true'
AIRFLOW__CORE__LOAD_EXAMPLES: 'false' AIRFLOW__CORE__LOAD_EXAMPLES: 'false'
AIRFLOW__API__AUTH_BACKEND: 'airflow.api.auth.backend.basic_auth' AIRFLOW__API__AUTH_BACKENDS: 'airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session'
AIRFLOW__SECRETS__BACKEND_KWARGS: ${AIRFLOW__SECRETS__BACKEND_KWARGS} AIRFLOW__SECRETS__BACKEND_KWARGS: ${AIRFLOW__SECRETS__BACKEND_KWARGS}
AIRFLOW__SECRETS__BACKEND: ${AIRFLOW__SECRETS__BACKEND} AIRFLOW__SECRETS__BACKEND: ${AIRFLOW__SECRETS__BACKEND}
OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID} OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
OAUTH_METADATA_URL: ${OAUTH_METADATA_URL} OAUTH_METADATA_URL: ${OAUTH_METADATA_URL}
OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET}
# _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-} # _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-}
_PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-}
volumes: volumes:
- ./dags:/opt/airflow/dags - ${AIRFLOW_PROJ_DIR:-.}/dags:/opt/airflow/dags
- ./config/airflow.cfg:/opt/airflow/airflow.cfg - ./config/airflow.cfg:/opt/airflow/airflow.cfg
- /persistent_data/logs:/opt/airflow/logs - ${AIRFLOW_PROJ_DIR:-.}/logs:/opt/airflow/logs
- ./plugins:/opt/airflow/plugins - ${AIRFLOW_PROJ_DIR:-.}/plugins:/opt/airflow/plugins
user: "${AIRFLOW_UID:-50000}:0" user: "${AIRFLOW_UID:-50000}:0"
depends_on: depends_on:
&airflow-common-depends-on &airflow-common-depends-on
...@@ -76,7 +80,6 @@ x-airflow-common: ...@@ -76,7 +80,6 @@ x-airflow-common:
condition: service_healthy condition: service_healthy
services: services:
reverse-proxy: reverse-proxy:
image: "jwilder/nginx-proxy:alpine" image: "jwilder/nginx-proxy:alpine"
container_name: "reverse-proxy" container_name: "reverse-proxy"
...@@ -117,7 +120,7 @@ services: ...@@ -117,7 +120,7 @@ services:
- postgres-db-volume:/var/lib/postgresql/data - postgres-db-volume:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "airflow"] test: ["CMD", "pg_isready", "-U", "airflow"]
interval: 60s interval: 10s
retries: 5 retries: 5
restart: always restart: always
...@@ -127,23 +130,21 @@ services: ...@@ -127,23 +130,21 @@ services:
- 6379 - 6379
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "ping"] test: ["CMD", "redis-cli", "ping"]
interval: 60s interval: 10s
timeout: 30s timeout: 30s
retries: 50 retries: 50
restart: always restart: always
airflow-webserver: airflow-webserver:
<<: *airflow-common <<: *airflow-common
command: webserver
ports:
- 7001:8080
environment: environment:
<<: *airflow-common-env <<: *airflow-common-env
VIRTUAL_HOST: datalogistics.eflows4hpc.eu VIRTUAL_HOST: datalogistics.eflows4hpc.eu
LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu
VIRTUAL_PORT: 8080 VIRTUAL_PORT: 8080
command: webserver
ports:
- 8080:8080
healthcheck: healthcheck:
test: ["CMD", "curl", "--fail", "http://localhost:8080/health"] test: ["CMD", "curl", "--fail", "http://localhost:8080/health"]
interval: 60s interval: 60s
...@@ -176,7 +177,7 @@ services: ...@@ -176,7 +177,7 @@ services:
test: test:
- "CMD-SHELL" - "CMD-SHELL"
- 'celery --app airflow.executors.celery_executor.app inspect ping -d "celery@$${HOSTNAME}"' - 'celery --app airflow.executors.celery_executor.app inspect ping -d "celery@$${HOSTNAME}"'
interval: 30s interval: 60s
timeout: 10s timeout: 10s
retries: 5 retries: 5
environment: environment:
...@@ -186,10 +187,11 @@ services: ...@@ -186,10 +187,11 @@ services:
DUMB_INIT_SETSID: "0" DUMB_INIT_SETSID: "0"
restart: always restart: always
volumes: volumes:
- ./dags:/opt/airflow/dags - ${AIRFLOW_PROJ_DIR:-.}/dags:/opt/airflow/dags
- ./config/airflow.cfg:/opt/airflow/airflow.cfg - ./config/airflow.cfg:/opt/airflow/airflow.cfg
- /persistent_data/logs:/opt/airflow/logs - ${AIRFLOW_PROJ_DIR:-.}/logs:/opt/airflow/logs
- ./tmp/:/work/ - ${AIRFLOW_PROJ_DIR:-.}/plugins:/opt/airflow/plugins
- ./tmp/:/work/
depends_on: depends_on:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
airflow-init: airflow-init:
...@@ -200,14 +202,9 @@ services: ...@@ -200,14 +202,9 @@ services:
command: triggerer command: triggerer
healthcheck: healthcheck:
test: ["CMD-SHELL", 'airflow jobs check --job-type TriggererJob --hostname "$${HOSTNAME}"'] test: ["CMD-SHELL", 'airflow jobs check --job-type TriggererJob --hostname "$${HOSTNAME}"']
interval: 60s interval: 10s
timeout: 10s timeout: 10s
retries: 5 retries: 5
environment:
<<: *airflow-common-env
# Required to handle warm shutdown of the celery workers properly
# See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation
DUMB_INIT_SETSID: "0"
restart: always restart: always
depends_on: depends_on:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
...@@ -228,12 +225,13 @@ services: ...@@ -228,12 +225,13 @@ services:
environment: environment:
<<: *airflow-common-env <<: *airflow-common-env
_AIRFLOW_DB_UPGRADE: 'true' _AIRFLOW_DB_UPGRADE: 'true'
#_AIRFLOW_WWW_USER_CREATE: 'true' _AIRFLOW_WWW_USER_CREATE: 'true'
_AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME:-airflow} _AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME:-airflow}
_AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow} _AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow}
_PIP_ADDITIONAL_REQUIREMENTS: ''
user: "0:0" user: "0:0"
volumes: volumes:
- .:/sources - ${AIRFLOW_PROJ_DIR:-.}:/sources
airflow-cli: airflow-cli:
<<: *airflow-common <<: *airflow-common
...@@ -248,24 +246,6 @@ services: ...@@ -248,24 +246,6 @@ services:
- -c - -c
- airflow - airflow
airflow-setup:
<<: *airflow-common
environment:
<<: *airflow-common-env
CONNECTION_CHECK_MAX_COUNT: "0"
entrypoint: /bin/bash
command:
- -c
- |
exec /entrypoint airflow variables import /opt/airflow/variables.json
echo "Variables added"
volumes:
- ./dockers/variables.json:/opt/airflow/variables.json
depends_on:
<<: *airflow-common-depends-on
airflow-init:
condition: service_completed_successfully
volumes: volumes:
postgres-db-volume: postgres-db-volume:
external: true external: true
...@@ -276,4 +256,3 @@ volumes: ...@@ -276,4 +256,3 @@ volumes:
html: html:
vhost: vhost:
dhparam: dhparam:
dockers/eflows-airflow.docker
+ 7
− 6
View file @ 759eac14
FROM apache/airflow:2.2.5 FROM apache/airflow:slim-2.5.3-python3.8
USER root USER root
RUN apt update && apt install git -y && apt clean && rm -rf /var/lib/apt/lists/* RUN apt update && apt install git -y && apt clean && rm -rf /var/lib/apt/lists/*
COPY ./templates/main.html /home/airflow/.local/lib/python3.7/site-packages/airflow/www/templates/airflow/main.html COPY ./templates/main.html /home/airflow/.local/lib/python3.8/site-packages/airflow/www/templates/airflow/main.html
COPY ./templates/navbar_right.html /home/airflow/.local/lib/python3.7/site-packages/airflow/www/templates/appbuilder/navbar_right.html COPY ./templates/navbar_right.html /home/airflow/.local/lib/python3.8/site-packages/airflow/www/templates/appbuilder/navbar_right.html
COPY ./templates/img/BMBF_gefoerdert_2017_en.jpg /home/airflow/.local/lib/python3.7/site-packages/airflow/www/static/BMBF_gefoerdert_2017_en.jpg COPY ./templates/img/BMBF_gefoerdert_2017_en.jpg /home/airflow/.local/lib/python3.8/site-packages/airflow/www/static/BMBF_gefoerdert_2017_en.jpg
USER airflow USER airflow
ENV SQLALCHEMY_SILENCE_UBER_WARNING=1
RUN pip --version && python -m pip install --upgrade pip RUN pip --version && python -m pip install --upgrade pip
ADD requirements.txt /requirements.txt ADD requirements.txt /requirements.txt
RUN pip install -r /requirements.txt RUN pip install --no-cache-dir -r /requirements.txt
\ No newline at end of file
requirements.txt
+ 6
− 0
View file @ 759eac14
...@@ -2,9 +2,15 @@ requests ...@@ -2,9 +2,15 @@ requests
urllib3 urllib3
plyvel plyvel
webdavclient3 webdavclient3
boto3==1.24.32
apache-airflow[celery]==2.5.3
apache-airflow[redis]==2.5.3
apache-airflow-providers-ssh apache-airflow-providers-ssh
apache-airflow-providers-http apache-airflow-providers-http
apache-airflow-providers-sftp apache-airflow-providers-sftp
apache-airflow-providers-hashicorp
apache-airflow-providers-postgres
apache-airflow-providers-celery
--index-url https://gitlab.jsc.fz-juelich.de/api/v4/projects/4405/packages/pypi/simple --index-url https://gitlab.jsc.fz-juelich.de/api/v4/projects/4405/packages/pypi/simple
airflow-datacat-integration>=0.1.4 airflow-datacat-integration>=0.1.4
flask-oidc flask-oidc
......
templates/main.html
+ 142
− 136
View file @ 759eac14
{# {#
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
distributed with this work for additional information distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the KIND, either express or implied. See the License for the
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
#} #}
{% extends 'appbuilder/baselayout.html' %}
{% from 'airflow/_messages.html' import show_message %}
{% block page_title -%}
{% if title is defined -%}
{{ title }} - {{ appbuilder.app_name }}
{% else -%}
{{ appbuilder.app_name }}
{% endif%}
{% endblock %}
{% block head_meta %}
{{ super() }}
{% if scheduler_job is defined and (scheduler_job and scheduler_job.is_alive()) %}
<meta name="is_scheduler_running" content="True">
{% endif %}
{% endblock %}
{% extends 'appbuilder/baselayout.html' %}
{% from 'airflow/_messages.html' import show_message %} {% block messages %}
{% include 'appbuilder/flash.html' %}
{% if scheduler_job is defined and (not scheduler_job or not scheduler_job.is_alive()) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The scheduler does not appear to be running.
{% if scheduler_job %}
Last heartbeat was received
<time class="scheduler-last-heartbeat"
title="{{ scheduler_job.latest_heartbeat.isoformat() }}"
datetime="{{ scheduler_job.latest_heartbeat.isoformat() }}"
data-datetime-convert="false"
>{{ macros.datetime_diff_for_humans(scheduler_job.latest_heartbeat) }}</time>.
{% endif %}
</p>
<p>The DAGs list may not update, and new tasks will not be scheduled.</p>
{% endcall %}
{% endif %}
{% if triggerer_job is defined and (not triggerer_job or not triggerer_job.is_alive()) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The triggerer does not appear to be running.
{% if triggerer_job %}
Last heartbeat was received
<time class="scheduler-last-heartbeat"
title="{{ triggerer_job.latest_heartbeat.isoformat() }}"
datetime="{{ triggerer_job.latest_heartbeat.isoformat() }}"
data-datetime-convert="false"
>{{ macros.datetime_diff_for_humans(triggerer_job.latest_heartbeat) }}</time>.
{% endif %}
</p>
<p>Triggers will not run, and any deferred operator will remain deferred until it times out and fails.</p>
{% endcall %}
{% endif %}
{% endblock %}
{% block page_title -%} {% block footer %}
{% if title is defined -%} {% if not current_user.is_anonymous %}
{{ title }} - {{ appbuilder.app_name }} {% set version_label = 'Version' %}
{% else -%} <!-- Use a wrapper div to detach the footer from the content -> just nice to have -->
{{ appbuilder.app_name }} <div style="padding-bottom: 1rem !important; visibility: hidden !important; flex-grow: 1 !important; -ms-flex-direction: column !important; display: flex !important;
{% endif%} flex-direction: column !important;">
.
</div>
<footer class="footer" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/02/Barra-gris-footer.png) !important; height: auto; color: #575756 !important; background-repeat: no-repeat !important; background-size: cover !important; margin-top: auto !important;">
<div class="container p-0" style="padding: 0px !important">
<div class="p-0 w-100" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/01/barra-3-color-8.png) !important; width: 100%; height: 15px; background-repeat: no-repeat !important; background-size: cover !important; padding: 0px; !important"></div>
<div class="row mt-2 px-3" style="margin-top: 0.5rem; padding-right: 1rem;">
<div class="col-lg-5 col-12 d-inlign-flex">
<p class="m-3 text-center align-self-center" style="-ms-flex-item-align: center !important; align-self: center !important; margin: 1rem !important">
<a href="https://www.eFlows4HPC.eu">
<img src="https://eflows4hpc.eu/wp-content/uploads/2021/02/logo-blanc_1-1.svg" alt="eFlows4HPC Logo" title="eFlows4HPC" style="height: auto; max-height: 70px;" class="m-4 align-self-center"/>
</a>
<a href="https://twitter.com/eFlows4HPC"><i class="fa fa-twitter-square m-4 fa-2x" style="color: white"></i></a>
<a href="https://www.linkedin.com/company/eflows4hpc/"><i class="fa fa-linkedin-square mr-4 fa-2x" style="color: white"></i></a>
<a href="https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/"><i class="fa fa-github-square mr-4 fa-2x" style="color: white"></i></a>
</p>
</div>
<div class="col-lg-2 col-6 d-inlign-flex">
<p class="text-center align-self-center">
<img loading="lazy" src="{{ url_for('static', filename='BMBF_gefoerdert_2017_en.jpg') }}" alt="Funded by BMBF" style="max-height:100px">
</p>
</div>
<div class="col-lg-5 col-12 d-inlign-flex">
<p class="m-2 align-self-center" style="color: white; -ms-flex-item-align: center !important; align-self: center !important; margin: 0.5rem;">
<span class="mr-3 mt-1 float-left" style="float: left !important; margin-right: 1rem; margin-top: 0.25rem ">
<img loading="lazy" src="https://eflows4hpc.eu/wp-content/uploads/2021/01/bandera-8.png" alt="" style="max-width:52px; max-height:34px;">
</span>
<small style="display: flow-root">
This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.
<br>
The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway.
<strong>
<a style="color: #f39200" href="https://www.fz-juelich.de/portal/EN/Service/LegalNotice/_node.html">Impressum</a>
</strong>
<br>
The project has received funding from German Federal Ministry of Education and Research agreement no. 16GPC016K.
</small>
<div class="row mt-4 pl-5" style="margin-top: 1.5rem; padding-left: 3rem !important; ">
<p style="border-top: 1px solid darkgray;"><small>This service is based on Apache Airflow {{ version_label }}: {% if airflow_version %}<a href="https://pypi.python.org/pypi/apache-airflow/{{ airflow_version }}" target="_blank">v{{ airflow_version }}</a>{% else %} N/A{% endif %}</small></p>
</div>
</p>
</div>
</div>
</div>
</footer>
{% endif %}
{% endblock %} {% endblock %}
{% block head_css %} {% block head_css %}
...@@ -50,107 +144,9 @@ ...@@ -50,107 +144,9 @@
<link rel="icon" type="image/png" href="{{ url_for('static', filename='pin_32.png') }}"> <link rel="icon" type="image/png" href="{{ url_for('static', filename='pin_32.png') }}">
{% endblock %} {% endblock %}
{% block messages %}
{% include 'appbuilder/flash.html' %}
{% if scheduler_job is defined and (not scheduler_job or not scheduler_job.is_alive()) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The scheduler does not appear to be running.
{% if scheduler_job %}
Last heartbeat was received
<time class="scheduler-last-heartbeat"
title="{{ scheduler_job.latest_heartbeat.isoformat() }}"
datetime="{{ scheduler_job.latest_heartbeat.isoformat() }}"
data-datetime-convert="false"
>{{ macros.datetime_diff_for_humans(scheduler_job.latest_heartbeat) }}</time>.
{% endif %}
</p>
<p>The DAGs list may not update, and new tasks will not be scheduled.</p>
{% endcall %}
{% endif %}
{% if triggerer_job is defined and (not triggerer_job or not triggerer_job.is_alive()) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The triggerer does not appear to be running.
{% if triggerer_job %}
Last heartbeat was received
<time class="scheduler-last-heartbeat"
title="{{ triggerer_job.latest_heartbeat.isoformat() }}"
datetime="{{ triggerer_job.latest_heartbeat.isoformat() }}"
data-datetime-convert="false"
>{{ macros.datetime_diff_for_humans(triggerer_job.latest_heartbeat) }}</time>.
{% endif %}
</p>
<p>Triggers will not run, and any deferred operator will remain deferred until it times out and fails.</p>
{% endcall %}
{% endif %}
{% endblock %}
{% block footer %}
{% if not current_user.is_anonymous %}
{% set version_label = 'Version' %}
<!-- Use a wrapper div to detach the footer from the content -> just nice to have -->
<div style="padding-bottom: 1rem !important; visibility: hidden !important; flex-grow: 1 !important; -ms-flex-direction: column !important; display: flex !important;
flex-direction: column !important;">
.
</div>
<footer class="footer" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/02/Barra-gris-footer.png) !important; height: auto; color: #575756 !important; background-repeat: no-repeat !important; background-size: cover !important; margin-top: auto !important;">
<div class="container p-0" style="padding: 0px !important">
<div class="p-0 w-100" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/01/barra-3-color-8.png) !important; width: 100%; height: 15px; background-repeat: no-repeat !important; background-size: cover !important; padding: 0px; !important"></div>
<div class="row mt-2 px-3" style="margin-top: 0.5rem; padding-right: 1rem;">
<div class="col-lg-5 col-12 d-inlign-flex">
<p class="m-3 text-center align-self-center" style="-ms-flex-item-align: center !important; align-self: center !important; margin: 1rem !important">
<a href="https://www.eFlows4HPC.eu">
<img src="https://eflows4hpc.eu/wp-content/uploads/2021/02/logo-blanc_1-1.svg" alt="eFlows4HPC Logo" title="eFlows4HPC" style="height: auto; max-height: 70px;" class="m-4 align-self-center"/>
</a>
<a href="https://twitter.com/eFlows4HPC"><i class="fa fa-twitter-square m-4 fa-2x" style="color: white"></i></a>
<a href="https://www.linkedin.com/company/eflows4hpc/"><i class="fa fa-linkedin-square mr-4 fa-2x" style="color: white"></i></a>
<a href="https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/"><i class="fa fa-github-square mr-4 fa-2x" style="color: white"></i></a>
</p>
</div>
<div class="col-lg-2 col-6 d-inlign-flex">
<p class="text-center align-self-center">
<img loading="lazy" src="{{ url_for('static', filename='BMBF_gefoerdert_2017_en.jpg') }}" alt="Funded by BMBF" style="max-height:100px">
</p>
</div>
<div class="col-lg-5 col-12 d-inlign-flex">
<p class="m-2 align-self-center" style="color: white; -ms-flex-item-align: center !important; align-self: center !important; margin: 0.5rem;">
<span class="mr-3 mt-1 float-left" style="float: left !important; margin-right: 1rem; margin-top: 0.25rem ">
<img loading="lazy" src="https://eflows4hpc.eu/wp-content/uploads/2021/01/bandera-8.png" alt="" style="max-width:52px; max-height:34px;">
</span>
<small style="display: flow-root">
This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.
<br>
The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway.
<strong>
<a style="color: #f39200" href="https://www.fz-juelich.de/portal/EN/Service/LegalNotice/_node.html">Impressum</a>
</strong>
<br>
The project has received funding from German Federal Ministry of Education and Research agreement no. 16GPC016K.
</small>
<div class="row mt-4 pl-5" style="margin-top: 1.5rem; padding-left: 3rem !important; ">
<p style="border-top: 1px solid darkgray;"><small>This service is based on Apache Airflow {{ version_label }}: {% if airflow_version %}<a href="https://pypi.python.org/pypi/apache-airflow/{{ airflow_version }}" target="_blank">v{{ airflow_version }}</a>{% else %} N/A{% endif %}</small></p>
</div>
</p>
</div>
</div>
</div>
</footer>
{% endif %}
{% endblock %}
{% block tail_js %} {% block tail_js %}
{{ super() }} {{ super() }}
<script>
// below variables are used in main.js
// keep as var, changing to const or let breaks other code
var Airflow = {
serverTimezone: '{{ server_timezone }}',
defaultUITimezone: '{{ default_ui_timezone }}',
};
var hostName = '{{ hostname }}';
var csrfToken = '{{ csrf_token() }}';
$('time[title]').tooltip();
</script>
<!-- CUSTOM FOOTER SCRIPT --> <!-- CUSTOM FOOTER SCRIPT -->
<!-- Calculate the size of the dynamic footer to make sure that it doesn't cover the content of the page. Helps also on mobile devices. --> <!-- Calculate the size of the dynamic footer to make sure that it doesn't cover the content of the page. Helps also on mobile devices. -->
<script> <script>
...@@ -170,15 +166,25 @@ ...@@ -170,15 +166,25 @@
footerAlign(); footerAlign();
}); });
</script> </script>
<!--[if IE ]>
<script src="{{ url_for_asset('ie.js') }}"></script> <script>
<![endif]--> // below variables are used in main.js
<script src="{{ url_for_asset('moment.js') }}"></script> // keep as var, changing to const or let breaks other code
<script src="{{ url_for_asset('main.js') }}"></script> var Airflow = {
<script src="{{ url_for_asset('bootstrap-datetimepicker.min.js') }}"></script> serverTimezone: '{{ server_timezone }}',
<script src="{{ url_for_asset('bootstrap3-typeahead.min.js') }}"></script> defaultUITimezone: '{{ default_ui_timezone }}',
};
{% if analytics_tool is defined and analytics_tool %} var hostName = '{{ hostname }}';
{% include "analytics/" + analytics_tool + ".html" %} var csrfToken = '{{ csrf_token() }}';
{% endif %} $('time[title]').tooltip();
{% endblock %} </script>
<script src="{{ url_for_asset('moment.js') }}"></script>
<script src="{{ url_for_asset('main.js') }}"></script>
<script src="{{ url_for_asset('bootstrap-datetimepicker.min.js') }}"></script>
<script src="{{ url_for_asset('bootstrap3-typeahead.min.js') }}"></script>
{% if analytics_tool is defined and analytics_tool %}
{% include "analytics/" + analytics_tool + ".html" %}
{% endif %}
{% endblock %}
\ No newline at end of file
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