kirby/updates-dashboard-front
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Working dev env in docker

Browse Source
This commit is contained in:
kirby
2023-04-05 11:40:58 +02:00
parent b68f11b8cd
commit 9de772b27d
18 changed files with 142 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dashboard/admin.py
View File

@@ -1,5 +1,5 @@
from django.contrib import admin
from .models import Os, ServerStatus, Server, PackageStatus, Team
from .models import Os, ServerStatus, Server, PackageStatus
class OsAdmin(admin.ModelAdmin):
@@ -10,4 +10,3 @@ admin.site.register(Os, OsAdmin)
admin.site.register(ServerStatus)
admin.site.register(PackageStatus)
admin.site.register(Server)
admin.site.register(Team)

8
app/dashboard/fixtures/teams.yaml
View File

@@ -1,8 +0,0 @@
# This is initial data for prod teams
- model: dashboard.team
pk: null
fields: {
name: System,
color: pink
}

23
app/dashboard/models.py
View File

@@ -32,32 +32,9 @@ class Os(models.Model):
class Group(models.Model):
name = models.CharField(max_length=50, unique=True)
full_name = models.CharField(max_length=50, null=True)
def __str__(self):
if self.full_name:
return self.full_name
else:
return self.name
class Team(models.Model):
name = models.CharField(max_length=20)
color = models.CharField(max_length=20, unique=True)
def __str__(self):
return self.name
class Server(models.Model):
hostname = models.CharField(max_length=200, unique=True)
os = models.ForeignKey(Os, null=True, related_name="servers", on_delete=models.SET_NULL)
group = models.ForeignKey(Group, null=True, blank=True, related_name="groups", on_delete=models.SET_NULL)
team = models.ForeignKey(Team, null=True, related_name="teams", on_delete=models.SET_NULL)
def __str__(self):
return self.hostname

2
app/dashboard/templates/os-statistics.html
View File

@@ -20,7 +20,7 @@
<table id="os-list" class="table table-bordered table-hover table-striped">
<thead>
<tr>
<th>Hostname</th>
<th>Distribution</th>
<th>Number</th>
<th>Percentage</th>
</tr>

9
app/dashboard/urls.py
View File

@@ -19,12 +19,6 @@ urlpatterns = [
re_path(r'^server-list/(?P<year>[0-9]{4})/(?P<month>[0-9]{1,2})/(?P<day>[0-9]{1,2})/?$',
views.server_list,
name='server-list-by-date'),
re_path(r'^server-list/(?P<group>[a-z0-9\-_]*)/(?P<year>[0-9]{4})/(?P<month>[0-9]{1,2})/(?P<day>[0-9]{1,2})/?$',
views.server_list,
name='server-list-by-group'),
re_path(r'^server-list/team/(?P<team>[a-z]*)/(?P<year>[0-9]{4})/(?P<month>[0-9]{1,2})/(?P<day>[0-9]{1,2})/?$',
views.server_list,
name='server-list-by-team'),
# package list
re_path(r'^packages/?$',
@@ -69,9 +63,6 @@ urlpatterns = [
re_path(r'^manage-packages/upload_csv_results_packages',
views.upload_csv_results_packages,
name='upload_csv_results_packages'),
# re_path(r'^manage/update-groups/?$',
# views.update_groups,
# name='update_groups'),
# manage packages
re_path(r'^manage-packages/?$',

29
app/dashboard/views.py
View File

@@ -16,7 +16,7 @@ from django.core.cache import cache
from django.db import IntegrityError
from django.contrib.auth.decorators import login_required
# project
from .models import Os, Group, Server, ServerStatus, PackageStatus, Team, Document_Servers, Document_Packages
from .models import Os, Server, ServerStatus, PackageStatus, Document_Servers, Document_Packages
from .forms import DocumentForm
@@ -36,7 +36,7 @@ def index(request):
## -----------------------------------------------------------------------------
@login_required
def server_list(request, year=None, month=None, day=None, group=None, team=None):
def server_list(request, year=None, month=None, day=None):
# TODO: use date.today?
now = datetime.now()
if not year or not month or not day:
@@ -64,24 +64,11 @@ def server_list(request, year=None, month=None, day=None, group=None, team=None)
next_result_date = next_result.date
results_date = current_date
if group:
group = get_object_or_404(Group, name=group)
status_list = ServerStatus.objects.filter(date=current_date, server__group=group).order_by('server__hostname')
if previous_result and not status_list:
status_list = ServerStatus.objects.filter(date=previous_result_date, server__group=group).order_by('server__hostname')
results_date = previous_result_date
elif team:
team = get_object_or_404(Team, color=team)
status_list = ServerStatus.objects.filter(date=current_date, server__team=team).order_by('server__hostname')
if previous_result and not status_list:
status_list = ServerStatus.objects.filter(date=previous_result_date, server__team=team).order_by('server__hostname')
results_date = previous_result_date
else:
# status_list = ServerStatus.objects.filter(date=current_date).order_by('server__hostname')
status_list = ServerStatus.objects.filter(date=current_date).order_by('server__hostname').select_related('server', 'server__group', 'server__os')
if previous_result and not status_list:
status_list = ServerStatus.objects.filter(date=previous_result_date).order_by('server__hostname').select_related('server', 'server__group', 'server__os')
results_date = previous_result_date
# status_list = ServerStatus.objects.filter(date=current_date).order_by('server__hostname')
status_list = ServerStatus.objects.filter(date=current_date).order_by('server__hostname').select_related('server', 'server__os')
if previous_result and not status_list:
status_list = ServerStatus.objects.filter(date=previous_result_date).order_by('server__hostname').select_related('server', 'server__os')
results_date = previous_result_date
if not status_list:
return render(request, 'generic.html', {
@@ -90,7 +77,6 @@ def server_list(request, year=None, month=None, day=None, group=None, team=None)
return render(request, 'server-list.html',
{
'group': group,
'status_list': status_list,
'results_date': results_date,
'previous_result_date': previous_result_date,
@@ -332,7 +318,6 @@ def purge_all(request):
ServerStatus.objects.all().delete()
Os.objects.all().delete()
PackageStatus.objects.all().delete()
Group.objects.all().delete()
content = "<div class='alert alert-danger' role='alert'>Everything has been purged.</div>"