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

perf: Account automation report

pull/15860/head
feng 2025-08-18 16:42:49 +08:00 committed by feng626
parent 96020fa6b4
commit c1c5025fbb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/rbac/const.py
View File

@ -145,7 +145,7 @@ only_system_permissions = (
('rbac', 'orgrole', 'delete,add,change', 'orgrole'), ('rbac', 'orgrole', 'delete,add,change', 'orgrole'),
('orgs', 'organization', '*', '*'), ('orgs', 'organization', '*', '*'),
('xpack', 'license', '*', '*'), ('xpack', 'license', '*', '*'),
('settings', 'setting', '*', '*'), ('settings', 'setting', 'add,change,delete', '*'),
('tickets', '*', '*', '*'), ('tickets', '*', '*', '*'),
('ops', 'celerytask', 'view', 'taskmonitor'), ('ops', 'celerytask', 'view', 'taskmonitor'),
('terminal', 'terminal', '*', '*'), ('terminal', 'terminal', '*', '*'),

1
apps/rbac/tree.py
View File

@ -33,6 +33,7 @@ view_nodes_data = [
app_nodes_data = [ app_nodes_data = [
{'id': 'users', 'view': 'view_console'}, {'id': 'users', 'view': 'view_console'},
{'id': 'assets', 'view': 'view_console'}, {'id': 'assets', 'view': 'view_console'},
{'id': 'accounts', 'name': _('Accounts'), 'view': 'view_console'},
{'id': 'perms', 'view': 'view_console'}, {'id': 'perms', 'view': 'view_console'},
{'id': 'terminal', 'name': _('Session audits'), 'view': 'view_audit'}, {'id': 'terminal', 'name': _('Session audits'), 'view': 'view_audit'},
{'id': 'audits', 'view': 'view_audit'}, {'id': 'audits', 'view': 'view_audit'},

11
apps/reports/api/accouts/automation.py
View File

@ -3,6 +3,7 @@
from collections import defaultdict from collections import defaultdict
from django.http import JsonResponse from django.http import JsonResponse
from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from rest_framework.views import APIView from rest_framework.views import APIView
@ -45,15 +46,19 @@ class AccountAutomationApi(DateRangeMixin, APIView):
def get_execution_metrics(self): def get_execution_metrics(self):
executions = AutomationExecution.objects.filter(type__in=AutomationTypes.values) executions = AutomationExecution.objects.filter(type__in=AutomationTypes.values)
filtered_queryset = self.filter_by_date_range(executions, 'date_start') qs = self.filter_by_date_range(executions, 'date_start')
types = set() types = set()
data = defaultdict(lambda: defaultdict(int)) data = defaultdict(lambda: defaultdict(int))
for t, tp in filtered_queryset.values_list('date_start', 'type'): for obj in qs:
tp = obj.type
if not tp: if not tp:
continue continue
types.add(tp) types.add(tp)
date_str = str(t.date())
dt = obj.date_start
dt_local = timezone.localtime(dt)
date_str = str(dt_local.date())
data[date_str][tp] += 1 data[date_str][tp] += 1
tp_map = defaultdict(list) tp_map = defaultdict(list)

2
apps/reports/api/users/user.py
View File

@ -63,8 +63,6 @@ class UserReportApi(DateRangeMixin, APIView):
for obj in qs: for obj in qs:
dt = obj.datetime dt = obj.datetime
if dt is None:
continue
dt_local = timezone.localtime(dt) dt_local = timezone.localtime(dt)
hour = dt_local.hour hour = dt_local.hour
metrics[buckets[hour // 6]] += 1 metrics[buckets[hour // 6]] += 1