Skip to content

Updates to server_status and monitor_queues #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didayolo merged 2 commits into from
Sep 2, 2024
Merged

Updates to server_status and monitor_queues #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f21c7a
server_status and monitor_queues pages secured
ihsaan-ullah Aug 21, 2024
d3396e4
Update monitor_queues.html
ihsaan-ullah Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/apps/pages/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def get_context_data(self, *args, **kwargs):
page = self.request.GET.get('page', 1)
submissions_per_page = 50

# Get all submissions
qs = Submission.objects.all()
# Start with an empty queryset
qs = Submission.objects.none()

# Only if user is authenticated
if self.request.user.is_authenticated:
Expand All @@ -67,12 +67,12 @@ def get_context_data(self, *args, **kwargs):
# and
# submissions running on queue which belongs to this user
if not self.request.user.is_superuser:
qs = qs.filter(
qs = Submission.objects.filter(
Q(owner=self.request.user) |
Q(phase__competition__queue__isnull=False, phase__competition__queue__owner=self.request.user)
)
else:
qs = qs.none() # This returns an empty queryset
else:
qs = Submission.objects.all()

# Filter out child submissions i.e. submission has no parent
if not show_child_submissions:
Expand Down
82 changes: 49 additions & 33 deletions src/templates/pages/monitor_queues.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,61 @@
{% endblock %}

{% block content %}
<div class="ui container">
<h1>Monitor queues</h1>
<div id="external_monitors" class="ui two column grid">
<div class="column">
<div class="ui fluid card">
<a class="image" href="{{ RABBITMQ_MANAGEMENT_URL}}" target="_blank">
<img class="ui large image" src="/static/img/RabbitMQ.png">
</a>
<div class="content">
<a class="header" href="{{ RABBITMQ_MANAGEMENT_URL }}" target="_blank">RabbitMQ</a>
<div class="meta">
This page allows admins to view connections, queued messages, message rates, channels,
exchanges, and other administrative features relating to RabbitMQ e.g. Creating users,
adding v-hosts, and creating policies.
{% if user.is_authenticated %}
{% if user.is_superuser %}
<div class="ui container">
<h1>Monitor queues</h1>
<div id="external_monitors" class="ui two column grid">
<div class="column">
<div class="ui fluid card">
<a class="image" href="{{ RABBITMQ_MANAGEMENT_URL}}" target="_blank">
<img class="ui large image" src="/static/img/RabbitMQ.png">
</a>
<div class="content">
<a class="header" href="{{ RABBITMQ_MANAGEMENT_URL }}" target="_blank">RabbitMQ</a>
<div class="meta">
This page allows admins to view connections, queued messages, message rates, channels,
exchanges, and other administrative features relating to RabbitMQ e.g. Creating users,
adding v-hosts, and creating policies.
</div>
</div>
</div>
</div>
</div>
</div>
<div class="column">
<div class="ui fluid card">
<a class="image" href="{{ FLOWER_URL }}" target="_blank">
<img class="ui large image" src="/static/img/Flower.png">
</a>
<div class="content">
<a class="header" href="{{ FLOWER_URL }}" target="_blank">Flower</a>
<div class="meta">
Flower is a powerful web-based Celery monitoring tool designed to keep track of our
tasks.
Admins may view the state of which tasks were run, with what arguments, and many more
features. Here you may also view which queues your celery workers are consuming, and the
state of any tasks in them. At last, there is also a great monitoring page for viewing
the
systemic impact of your workers.
<div class="column">
<div class="ui fluid card">
<a class="image" href="{{ FLOWER_URL }}" target="_blank">
<img class="ui large image" src="/static/img/Flower.png">
</a>
<div class="content">
<a class="header" href="{{ FLOWER_URL }}" target="_blank">Flower</a>
<div class="meta">
Flower is a powerful web-based Celery monitoring tool designed to keep track of our
tasks.
Admins may view the state of which tasks were run, with what arguments, and many more
features. Here you may also view which queues your celery workers are consuming, and the
state of any tasks in them. At last, there is also a great monitoring page for viewing
the
systemic impact of your workers.
</div>
</div>
</div>
</div>
</div>
</div>
{% else %}
<div class="ui container">
<div class="ui red message">
You do not have access to this page!
</div>
</div>
{% endif %}
{% else %}
<div class="ui container">
<div class="ui yellow message">
<a href="{% url 'accounts:login' %}">Log In</a> or
<a href="{% url 'accounts:signup' %}">Sign Up</a> to view this page
</div>
</div>
</div>

{% endif %}

{% endblock %}
149 changes: 79 additions & 70 deletions src/templates/pages/server_status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,81 +5,90 @@
{% endblock %}

{% block content %}
<div class="ui container">
<h1>Recent Submissions</h1>
<label>
<input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show child submissions
</label>
<span class="ui mini circular icon button"
data-tooltip="Child submissions are created when a competition has multiple tasks (one child for each task)."
data-position="top center">
<i class="question icon"></i>
</span>
<table class="ui table">
<thead>
<th>Competition</th>
<th>Submission PK</th>
{% if show_child_submissions %}
<th>Parent PK</th>
{% endif %}
<th>Size</th>
<th>Submitter</th>
<th>Queue</th>
<th>Ingestion Hostname</th>
<th>Scoring Hostname</th>
<th>Submitted at</th>
<th>Status</th>
</thead>
<tbody>
{% if not submissions %}
<tr class="center aligned">
<td colspan="100%"><em>No submissions, yet!</em></td>
</tr>
{% if user.is_authenticated %}
<div class="ui container">
<h1>Recent Submissions</h1>
<label>
<input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show child submissions
</label>
<span class="ui mini circular icon button"
data-tooltip="Child submissions are created when a competition has multiple tasks (one child for each task)."
data-position="top center">
<i class="question icon"></i>
</span>
<table class="ui table">
<thead>
<th>Competition</th>
<th>Submission PK</th>
{% if show_child_submissions %}
<th>Parent PK</th>
{% endif %}
{% for submission in submissions %}
<tr>
<td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
<td>{{ submission.pk }}</td>
{% if show_child_submissions %}
<td>{{ submission.parent.pk }}</td>
<th>Size</th>
<th>Submitter</th>
<th>Queue</th>
<th>Ingestion Hostname</th>
<th>Scoring Hostname</th>
<th>Submitted at</th>
<th>Status</th>
</thead>
<tbody>
{% if not submissions %}
<tr class="center aligned">
<td colspan="100%"><em>No submissions, yet!</em></td>
</tr>
{% endif %}
<td>{{ submission.file_size }}</td>
<td><a target="_blank" href="/profiles/user/{{ submission.owner.username }}">{{ submission.owner_display_name }}</a></td>
<td>{{ submission.competition_queue }}</td>
<td>{{ submission.ingestion_worker_hostname }}</td>
<td>{{ submission.scoring_worker_hostname }}</td>
<td>{{ submission.created_when|timesince }} ago</td>
<td>{{ submission.status }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% for submission in submissions %}
<tr>
<td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
<td>{{ submission.pk }}</td>
{% if show_child_submissions %}
<td>{{ submission.parent.pk }}</td>
{% endif %}
<td>{{ submission.file_size }}</td>
<td><a target="_blank" href="/profiles/user/{{ submission.owner.username }}">{{ submission.owner_display_name }}</a></td>
<td>{{ submission.competition_queue }}</td>
<td>{{ submission.ingestion_worker_hostname }}</td>
<td>{{ submission.scoring_worker_hostname }}</td>
<td>{{ submission.created_when|timesince }} ago</td>
<td>{{ submission.status }}</td>
</tr>
{% endfor %}
</tbody>
</table>

<!-- Pagination Div -->
{% if is_paginated %}
<div class="pagination-nav">
{% if submissions.has_previous %}
<span class="float-left">
<a class="ui button" href="?page=1{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">First</a>
<a class="ui button" href="?page={{ submissions.previous_page_number }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Previous</a>
</span>
{% endif %}

<span class="center">
Page {{ submissions.number }} of {{ paginator.num_pages }}
</span>


{% if submissions.has_next %}
<span class="float-right">
<a class="ui button" href="?page={{ submissions.next_page_number }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Next</a>
<a class="ui button" href="?page={{ paginator.num_pages }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Last</a>
</span>
{% endif %}
<!-- Pagination Div -->
{% if is_paginated %}
<div class="pagination-nav">
{% if submissions.has_previous %}
<span class="float-left">
<a class="ui button" href="?page=1{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">First</a>
<a class="ui button" href="?page={{ submissions.previous_page_number }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Previous</a>
</span>
{% endif %}
<span class="center">
Page {{ submissions.number }} of {{ paginator.num_pages }}
</span>
{% if submissions.has_next %}
<span class="float-right">
<a class="ui button" href="?page={{ submissions.next_page_number }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Next</a>
<a class="ui button" href="?page={{ paginator.num_pages }}{% if show_child_submissions %}&show_child_submissions={{ show_child_submissions }}{% endif %}">Last</a>
</span>
{% endif %}

</div>
{% endif %}
</div>
{% else %}
<div class="ui container">
<div class="ui yellow message">
<a href="{% url 'accounts:login' %}">Log In</a> or
<a href="{% url 'accounts:signup' %}">Sign Up</a> to view this page
</div>
</div>
{% endif %}
</div>
{% endif %}
<script>
document.addEventListener("DOMContentLoaded", function() {
const checkbox = document.getElementById("show_child_checkbox");
Expand Down