https://support.astron.nl/jira/browse/SDC-499

add service monitor to monitoring page

atdb/taskdatabase/admin.py

 from django.contrib import admin
-from .models import Status, Task, Workflow, LogEntry, Configuration, Job, PostProcessingRule
+from .models import Status, Task, Workflow, LogEntry, Configuration, Job, PostProcessingRule, Monitor
 
 admin.site.register(Status)
 admin.site.register(Task)
@@ -8,3 +8,4 @@ admin.site.register(LogEntry)
 admin.site.register(Configuration)
 admin.site.register(Job)
 admin.site.register(PostProcessingRule)
+admin.site.register(Monitor)
\ No newline at end of file

atdb/taskdatabase/models.py

@@ -126,13 +126,22 @@ class PostProcessingRule(models.Model):
     workflow_to_process = models.ForeignKey(Workflow, related_name='to_process', on_delete=models.SET_NULL, null=True, blank=True)
     workflow_to_apply = models.ForeignKey(Workflow, related_name='to_apply',on_delete=models.SET_NULL, null=True, blank=True)
 
+    # the representation of the value in the REST API
+    def __str__(self):
+        return str(self.aggregation_key)+' - '+str(self.trigger_status)
+
+
 
 class Monitor(models.Model):
     name = models.CharField(max_length=50, default="unknown")
     type = models.CharField(max_length=20, default="ldv-service", null=True, blank=True)
     timestamp = models.DateTimeField(default=datetime.utcnow, blank=True)
     hostname = models.CharField(max_length=50, default="unknown")
-    process_id = models.IntegerField(null=True)
+    process_id = models.IntegerField(null=True, blank=True)
     description = models.CharField(max_length=255, blank=True, null=True)
-    status = models.CharField(max_length=50, default="defining", null=True)
+    status = models.CharField(max_length=50, default="ok", null=True)
     metadata = models.JSONField(null=True, blank=True)
+
+    # the representation of the value in the REST API
+    def __str__(self):
+        return str(self.name)+' - '+str(self.timestamp) + ' - ' + self.status

atdb/taskdatabase/services/algorithms.py

@@ -201,6 +201,30 @@ def convert_config_to_html(querylist):
     return results
 
 
+def convert_monitor_to_html(monitor_data):
+    results = ""
+    try:
+        for record in monitor_data:
+            # iterate through the dict of key/values
+            key = record.name
+            value = record.status
+            filter = record.description
+            line = '<tr class="' + record.status + '" >'
+            line += "<td><b>" + str(record.name) + "</b></td>"
+            line += "<td>" + str(record.hostname) + "</td>"
+            line += "<td>" + str(record.status) + "</td>"
+            line += "<td>" + str(record.timestamp) + "</td>"
+            line += "<td>" + str(record.process_id) + "</td>"
+            line += "<td>" + str(record.description) + "</td>"
+            line += "</tr>"
+
+            results = results + line
+    except:
+        results = "<tr><td>no data</td></tr>"
+
+    return results
+
+
 # aggregate information from the tasks table per workflow per status
 def aggregate_resources_tasks(selection):
     workflow_results = []

atdb/taskdatabase/static/taskdatabase/style.css

@@ -33,9 +33,6 @@ TD {
   background-color: lightgreen;
 }
 
-.modal-content {
-    overflow: scroll !important;
-}
 
 .error,.failed,.staging_failed,.processed_failed,.scrubbed_failed,.stored_failed,.archived_failed {
   color: red;
@@ -52,8 +49,6 @@ TD {
   font-style: italic;
 }
 
-
-
 .processing,.processing_copying {
  font-weight: bold;
  background-color: lightyellow;
@@ -120,3 +115,7 @@ p.title {
 .modal-dialog .modal-lg {
     max-width: 75% !important;
 }
+
+.modal-content {
+    overflow: scroll !important;
+}
\ No newline at end of file

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -80,7 +80,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1.0.0 (27 jan 2021 - 15:00)
+    <p class="footer"> Version 1.0.0 (28 jan 2021 - 14:00)
 
 </div>
 

atdb/taskdatabase/templates/taskdatabase/monitoring.html

@@ -5,20 +5,30 @@
 
 <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>
+          <div class="thumbnail">
+               <h5>Health and Status of the LDV services.</h5>
 
+               <table class="table table-striped">
+                   <th>LDV-Service</th><th>Host</th><th>Status</th><th>Timestamp</th><th>Working on</th><th>Description</th>
+                   <tbody>
+                      {{ monitor_results | safe }}
+                    </tbody>
+               </table>
+          </div>
+        <hr>
+          <div class="thumbnail">
+              <h5>External monitoring services live at SURF-SARA.</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>
+{% include 'taskdatabase/localstorage_scripts.html' %}
 {% endblock %}
 

atdb/taskdatabase/urls.py

@@ -26,7 +26,8 @@ urlpatterns = [
     path('query/', views.QueryView.as_view(), name='query'),
     # path('dashboard/', views.DashboardView.as_view(), name='dashboard'),
 
-    path('monitoring/', views.MonitoringView.as_view(), name='monitoring'),
+    # path('monitoring/', views.MonitoringView.as_view(), name='monitoring'),
+    path('monitoring/', views.ShowMonitoring, name='monitoring'),
     path('diagram/', views.DiagramView.as_view(), name='diagram'),
     path('config/', views.ShowConfig, name='config'),
 

atdb/taskdatabase/views.py

@@ -328,9 +328,14 @@ def WorkflowDetails(request, id):
 
 
 class MonitoringView(ListView):
-    model = Task
+    model = Monitor
     template_name = "taskdatabase/monitoring.html"
 
+def ShowMonitoring(request):
+    monitor_data = Monitor.objects.all()
+
+    monitor_results = algorithms.convert_monitor_to_html(monitor_data)
+    return render(request, "taskdatabase/monitoring.html", {'monitor_results': monitor_results})
 
 class DiagramView(ListView):
     model = Task