From cda6343e120de97bbde1bd46dbaf55c10b24c450 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Fri, 30 Oct 2020 14:14:59 +0100 Subject: [PATCH] misc: add sorting on tenant --- logtracker/journal/forms.py | 1 + logtracker/journal/views.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/logtracker/journal/forms.py b/logtracker/journal/forms.py index ecc32c1..37e3fe8 100644 --- a/logtracker/journal/forms.py +++ b/logtracker/journal/forms.py @@ -6,6 +6,7 @@ from logtracker.journal.models import Entry class EntriesForm(forms.Form): host = forms.MultipleChoiceField(required=False) + tenant = forms.MultipleChoiceField(required=False) _systemd_unit = forms.MultipleChoiceField(required=False) priority = forms.ChoiceField(required=False, choices=reversed([(i, i) for i in range(1, 8)])) since = forms.DateTimeField(required=False, initial=datetime.datetime.now() - datetime.timedelta(days=settings.LOGTRACKER_HISTORY)) diff --git a/logtracker/journal/views.py b/logtracker/journal/views.py index 6967551..bf3af27 100644 --- a/logtracker/journal/views.py +++ b/logtracker/journal/views.py @@ -27,9 +27,10 @@ class APIEntriesList(LoginRequiredMixin, View): lines = None since = self.request.GET.get('since') host = self.request.GET.getlist('host') + tenant = self.request.GET.getlist('tenant') _systemd_unit = self.request.GET.getlist('_systemd_unit') priority = self.request.GET.get('priority') - return Entry.objects.extract(since=since, host=host, lines=lines, _systemd_unit=_systemd_unit, priority=priority) + return Entry.objects.extract(since=since, host=host, lines=lines, tenant=tenant, _systemd_unit=_systemd_unit, priority=priority) def get(self, request, *args, **kwargs): queryset = self.get_queryset()