github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: audit dashboard (#9486) 

Co-authored-by: feng <1304903146@qq.com>
pull/9490/head
fit2bot 2023-02-09 17:17:35 +08:00 committed by GitHub
parent 015ac4fbb6
commit 5401b1cdf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/audits/api.py
View File

@ -129,9 +129,11 @@ class PasswordChangeLogViewSet(ListModelMixin, JMSGenericViewSet):
ordering = ['-datetime'] ordering = ['-datetime']
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset()
if not current_org.is_root():
users = current_org.get_members() users = current_org.get_members()
queryset = super().get_queryset().filter( queryset = queryset.filter(
user__in=[user.__str__() for user in users] user__in=[str(user) for user in users]
) )
return queryset return queryset

10
apps/jumpserver/api.py
View File

@ -19,7 +19,7 @@ from orgs.utils import current_org
from ops.const import JobStatus from ops.const import JobStatus
from ops.models import Job, JobExecution from ops.models import Job, JobExecution
from common.utils import lazyproperty from common.utils import lazyproperty
from audits.models import UserLoginLog, PasswordChangeLog, OperateLog from audits.models import UserLoginLog, PasswordChangeLog, OperateLog, FTPLog
from audits.const import LoginStatusChoices from audits.const import LoginStatusChoices
from common.utils.timezone import local_now, local_zero_hour from common.utils.timezone import local_now, local_zero_hour
from orgs.caches import OrgResourceStatisticsCache from orgs.caches import OrgResourceStatisticsCache
@ -38,13 +38,13 @@ class DateTimeMixin:
def days(self): def days(self):
query_params = self.request.query_params query_params = self.request.query_params
count = query_params.get('days') count = query_params.get('days')
count = int(count) if count else 0 count = int(count) if count else 1
return count return count
@property @property
def days_to_datetime(self): def days_to_datetime(self):
days = self.days days = self.days
if days == 0: if days == 1:
t = local_zero_hour() t = local_zero_hour()
else: else:
t = local_now() - timezone.timedelta(days=days) t = local_now() - timezone.timedelta(days=days)
@ -109,7 +109,7 @@ class DateTimeMixin:
@lazyproperty @lazyproperty
def ftp_logs_queryset(self): def ftp_logs_queryset(self):
t = self.days_to_datetime t = self.days_to_datetime
queryset = OperateLog.objects.filter(datetime__gte=t) queryset = FTPLog.objects.filter(date_start__gte=t)
queryset = self.get_logs_queryset(queryset, 'user') queryset = self.get_logs_queryset(queryset, 'user')
return queryset return queryset
@ -297,7 +297,7 @@ class DatesLoginMetricMixin:
@lazyproperty @lazyproperty
def user_login_amount(self): def user_login_amount(self):
return self.login_logs_queryset.values('username').distinct().count() return self.login_logs_queryset.values('username').count()
@lazyproperty @lazyproperty
def operate_logs_amount(self): def operate_logs_amount(self):