diff --git a/atdb/atdb/static/taskdatabase/alta_logo.jpg b/atdb/atdb/static/taskdatabase/alta_logo.jpg deleted file mode 100644 index e99572c661d5c9a857ff8339e990f6dce6645a79..0000000000000000000000000000000000000000 Binary files a/atdb/atdb/static/taskdatabase/alta_logo.jpg and /dev/null differ diff --git a/atdb/atdb/static/taskdatabase/grafana_logo.jpg b/atdb/atdb/static/taskdatabase/grafana_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..66b5a3df2b34ea76955a495b3c8b344be16dec73 Binary files /dev/null and b/atdb/atdb/static/taskdatabase/grafana_logo.jpg differ diff --git a/atdb/atdb/static/taskdatabase/ldvlogo.png b/atdb/atdb/static/taskdatabase/ldvlogo.png deleted file mode 100644 index 35d6c9bd9d35a1c65808723b3e34dbfa6989f2e2..0000000000000000000000000000000000000000 Binary files a/atdb/atdb/static/taskdatabase/ldvlogo.png and /dev/null differ diff --git a/atdb/atdb/static/taskdatabase/ldvlogo_small.png b/atdb/atdb/static/taskdatabase/ldvlogo_small.png deleted file mode 100644 index 14989c31e2a47e13fb4d083ad33fd105c35d3c9f..0000000000000000000000000000000000000000 Binary files a/atdb/atdb/static/taskdatabase/ldvlogo_small.png and /dev/null differ diff --git a/atdb/atdb/static/taskdatabase/style.css b/atdb/atdb/static/taskdatabase/style.css index dfee76d2636c48f07e7c7772b4b598bc30567d60..ee9a90de00bfd84a01d5ab509ef43a9c4ba7648e 100644 --- a/atdb/atdb/static/taskdatabase/style.css +++ b/atdb/atdb/static/taskdatabase/style.css @@ -29,6 +29,9 @@ TD { background-color: lightgreen; } +.modal-content { + overflow: scroll !important; +} .error,.failed,.staging_failed,.processed_failed,.scrubbed_failed,.stored_failed,.archived_failed { color: red; diff --git a/atdb/atdb/static/taskdatabase/surfsara.jpg b/atdb/atdb/static/taskdatabase/surfsara.jpg new file mode 100644 index 0000000000000000000000000000000000000000..afd2be7e0e17bd98c8fee1fc93c454000dd99369 Binary files /dev/null and b/atdb/atdb/static/taskdatabase/surfsara.jpg differ diff --git a/atdb/taskdatabase/static/taskdatabase/grafana_logo.jpg b/atdb/taskdatabase/static/taskdatabase/grafana_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..66b5a3df2b34ea76955a495b3c8b344be16dec73 Binary files /dev/null and b/atdb/taskdatabase/static/taskdatabase/grafana_logo.jpg differ diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css index 16ae77f8a8bc35fa0191e7e9f42f3600e31349f9..4ab2414d0961470c36178438b9ff0adeeae20353 100644 --- a/atdb/taskdatabase/static/taskdatabase/style.css +++ b/atdb/taskdatabase/static/taskdatabase/style.css @@ -33,6 +33,10 @@ TD { background-color: lightgreen; } +.modal-content { + overflow: scroll !important; +} + .error,.failed,.staging_failed,.processed_failed,.scrubbed_failed,.stored_failed,.archived_failed { color: red; font-weight: bold; diff --git a/atdb/taskdatabase/static/taskdatabase/surfsara.jpg b/atdb/taskdatabase/static/taskdatabase/surfsara.jpg new file mode 100644 index 0000000000000000000000000000000000000000..afd2be7e0e17bd98c8fee1fc93c454000dd99369 Binary files /dev/null and b/atdb/taskdatabase/static/taskdatabase/surfsara.jpg differ diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html index 1318e15cbcfc3adb83242709b7d28b327e6debe4..fbeea95e660f70d021a472afc9deca3d1761c423 100644 --- a/atdb/taskdatabase/templates/taskdatabase/base.html +++ b/atdb/taskdatabase/templates/taskdatabase/base.html @@ -22,13 +22,15 @@ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous"> <link href="{% static 'fontawesome_free/css/all.min.css' %}" rel="stylesheet" type="text/css"> + <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet"> + <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script> + <link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/> <link rel="icon" href="{% static 'favicon.ico' %}"> - <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet"> - <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script> {% block extra_js %}{% endblock %} + </head> <body onload="readFromLocalStorage('search_box')"> <nav class="navbar navbar-expand-lg navbar-light bg-light"> @@ -49,6 +51,8 @@ <li><a class="nav-link" href="{% url 'query' %}">Query</a></li> + <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li> + <li><a class="nav-link" href="{% url 'diagram' %}">Diagram</a></li> {% if user.is_superuser %} diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 46e8953fcc7101c85f4bfe3e630146e81be2f2f6..e30537197560dd26faba1ed256d2b5d48093fe71 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (25 jan 2021 - 10:00) + <p class="footer"> Version 1.0.0 (25 jan 2021 - 12:00) </div> diff --git a/atdb/taskdatabase/templates/taskdatabase/monitoring.html b/atdb/taskdatabase/templates/taskdatabase/monitoring.html new file mode 100644 index 0000000000000000000000000000000000000000..c2593e289a58c14747330a6b479632cb66be5b3e --- /dev/null +++ b/atdb/taskdatabase/templates/taskdatabase/monitoring.html @@ -0,0 +1,24 @@ +{% extends 'taskdatabase/base.html' %} +{% load static %} + +{% block myBlock %} + +<div class="hiking-container container-fluid"> + <div class="col-sm-6 col-md-8 col-lg-12"> + + <div class="thumbnail"> + + <h5>These monitoring services live at SURF-SARA and will open a new browser window.</h5> + +<a href="https://jobsview.grid.surfsara.nl/grafana/d/i289WluZz/spider?orgId=1&from=now-6h&to=now-5m" + class="btn btn-info btn-lg" role="button" target="_blank"><img src="{% static 'taskdatabase/grafana_logo.jpg' %}" height="40" alt=""> Spider (Grafana)</a> + +<a href="https://ganglia.grid.surfsara.nl/dcache.php?vo=Lofar&r=day" + class="btn btn-info btn-lg" role="button" target="_blank"><img src="{% static 'taskdatabase/surfsara.jpg' %}" height="40" alt=""> dCache (Ganglia)</a> + </div> + + </div> + +</div> +{% endblock %} + diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py index 7b1eddb4eac96e1707b4ebd05aeb4bb10ab8418d..13c728f53b4fdd1b6e2b10462b1828da120f481f 100644 --- a/atdb/taskdatabase/urls.py +++ b/atdb/taskdatabase/urls.py @@ -25,8 +25,10 @@ urlpatterns = [ path('workflow_details/<id>/', views.WorkflowDetails, name='workflow-details'), path('query/', views.QueryView.as_view(), name='query'), # path('dashboard/', views.DashboardView.as_view(), name='dashboard'), - path('config/', views.ShowConfig, name='config'), + + path('monitoring/', views.MonitoringView.as_view(), name='monitoring'), path('diagram/', views.DiagramView.as_view(), name='diagram'), + path('config/', views.ShowConfig, name='config'), # --- REST API --- path('tasks/', views.TaskListViewAPI.as_view(), name='tasks-api'), diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 38cb65e75699efb5185e872fb4f81a9793603a3c..08e2b895944725b4c5dd3afedce20030ebd143bb 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -325,6 +325,11 @@ def WorkflowDetails(request, id): return render(request, "taskdatabase/details/workflow_details.html", {'workflow': workflow}) +class MonitoringView(ListView): + model = Task + template_name = "taskdatabase/monitoring.html" + + class DiagramView(ListView): model = Task template_name = "taskdatabase/diagram.html"