Merge branch 'SDC-440-monitoring-view' into 'master'

https://support.astron.nl/jira/browse/SDC-440 See merge request !166

Merge branch 'SDC-440-monitoring-view' into 'master'
19aeaa8a · Nico Vermaas · 5eff19aa · a3150294 · 5eff19aa · 19aeaa8a
Commit 19aeaa8a authored 3 years ago by Nico Vermaas
--- a/atdb/atdb/static/taskdatabase/alta_logo.jpg
+++ b/atdb/atdb/static/taskdatabase/alta_logo.jpg
--- a/atdb/atdb/static/taskdatabase/grafana_logo.jpg
+++ b/atdb/atdb/static/taskdatabase/grafana_logo.jpg
--- a/atdb/atdb/static/taskdatabase/ldvlogo.png
+++ b/atdb/atdb/static/taskdatabase/ldvlogo.png
--- a/atdb/atdb/static/taskdatabase/ldvlogo_small.png
+++ b/atdb/atdb/static/taskdatabase/ldvlogo_small.png
--- 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;

--- a/atdb/atdb/static/taskdatabase/surfsara.jpg
+++ b/atdb/atdb/static/taskdatabase/surfsara.jpg
--- a/atdb/taskdatabase/static/taskdatabase/grafana_logo.jpg
+++ b/atdb/taskdatabase/static/taskdatabase/grafana_logo.jpg
--- 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;

--- a/atdb/taskdatabase/static/taskdatabase/surfsara.jpg
+++ b/atdb/taskdatabase/static/taskdatabase/surfsara.jpg
--- 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 %}

--- 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>

--- a/atdb/taskdatabase/templates/taskdatabase/monitoring.html
+++ b/atdb/taskdatabase/templates/taskdatabase/monitoring.html
+{% 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">
+              &nbsp;
+              <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>&nbsp;
+<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>&nbsp;
+          </div>
+            &nbsp;
+        </div>
+</div>
+{% endblock %}
--- 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'),

--- 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"