diff --git a/apps/accounts/api/account/pam_dashboard.py b/apps/accounts/api/account/pam_dashboard.py index 79a922065..35378de37 100644 --- a/apps/accounts/api/account/pam_dashboard.py +++ b/apps/accounts/api/account/pam_dashboard.py @@ -37,7 +37,7 @@ class PamDashboardApi(APIView): @staticmethod def get_account_risk_data(_all, query_params): agg_map = { - 'total_privileged_accounts': ('long_time_no_login_count', Q(risk='long_time_no_login')), + 'total_long_time_no_login_accounts': ('long_time_no_login_count', Q(risk='long_time_no_login')), 'total_new_found_accounts': ('new_found_count', Q(risk='new_found')), 'total_group_changed_accounts': ('group_changed_count', Q(risk='group_changed')), 'total_sudo_changed_accounts': ('sudo_changed_count', Q(risk='sudo_changed')), @@ -74,7 +74,7 @@ class PamDashboardApi(APIView): 'total_privileged_accounts': ('privileged_count', Count('id', filter=Q(privileged=True))), 'total_connectivity_ok_accounts': ('connectivity_ok_count', Count('id', filter=Q(connectivity='ok'))), 'total_secret_reset_accounts': ('secret_reset_count', Count('id', filter=Q(secret_reset=True))), - 'total_unavailable_accounts': ('unavailable_count', Count('id', filter=Q(is_active=False))), + 'total_valid_accounts': ('valid_count', Count('id', filter=Q(is_active=True))), 'total_week_add_accounts': ('week_add_count', Count('id', filter=Q(date_created__gte=local_monday()))), } @@ -105,7 +105,6 @@ class PamDashboardApi(APIView): 'total_count_gathered_account_automation': GatherAccountsAutomation, 'total_count_push_account_automation': PushAccountAutomation, 'total_count_backup_account_automation': BackupAccountAutomation, - 'total_count_risk_account': AccountRisk, 'total_count_integration_application': IntegrationApplication, } diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index aa852c53f..8fe48308d 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -855,7 +855,6 @@ "Password": "Password", "PasswordAndSSHKey": "Password & SSH key", "PasswordChangeLog": "Password change", - "PasswordExpired": "Password expired", "PasswordPlaceholder": "Please enter password", "PasswordRecord": "Password record", "PasswordRule": "Password rules", @@ -1423,7 +1422,6 @@ "LongTimeNoLogin": "Long time no login", "UnmanagedAccount": "Unmanaged account", "UnavailableAccount": "Unavailable account", - "WeakPassword": "Weak password", "EmptyPassword": "Empty password", "LongTimeNoChangeSecret": "The password has not been changed for a long time", "LongTimeNoVerify": "Long time no verify", @@ -1434,5 +1432,29 @@ "CopyToAsset": "Copy to asset", "MoveToAsset": "Move to asset", "Cloud": "Cloud", - "Device": "Device" + "Device": "Device", + "NoLoginLongTime": "No login for long time", + "NewAccountsFound": "New accounts found", + "GroupChanged": "Group changed", + "SudoChanged": "Sudo changed", + "AuthorizedKeysChanged": "Authorized keys changed", + "AccountDeleted": "Account deleted", + "PasswordExpired": "Password expired", + "LongTimePassword": "Long time password", + "WeakPassword": "Weak password", + "LeakedPassword": "Leaked password", + "RepeatedPassword": "Repeated password", + "PasswordError": "Password error", + "NoAdminAccount": "No admin account", + "ProportionOfAccountTypes": "Account type proportion", + "CurrentStatus": "Current Status", + "ChangeSecretTaskStatus": "Secret Change Task Status", + "TaskCount": "Task Count", + "ScheduledTaskCount": "Scheduled Task Count", + "TaskExecutionCount": "Task Execution Count", + "SuccessCount": "Success Count", + "FailCount": "Failure Count", + "ChangeSecretFailAccounts": "Secret Change Failed Accounts", + "OngoingPwdChange": "Ongoing Secret Change", + "AccountResult": "Account Success/Failure" } \ No newline at end of file diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 4718a9731..7bea1f827 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -8,7 +8,7 @@ "AccessIP": "IP 白名单", "AccessKey": "访问密钥", "Account": "账号", - "AccountAmount": "账号数量", + "AccountAmount": "账号数", "AccountBackup": "账号备份", "AccountBackupCreate": "创建账号备份", "AccountBackupDetail": "账号备份详情", @@ -849,7 +849,6 @@ "Password": "密码", "PasswordAndSSHKey": "认证设置", "PasswordChangeLog": "改密日志", - "PasswordExpired": "密码过期了", "PasswordPlaceholder": "请输入密码", "PasswordRecord": "密码记录", "PasswordRule": "密码规则", @@ -1420,7 +1419,6 @@ "LongTimeNoLogin": "长期未登录账号", "UnmanagedAccount": "未托管账号", "UnavailableAccount": "不可用账号", - "WeakPassword": "弱密码", "EmptyPassword": "空密码", "LongTimeNoChangeSecret": "长时间未改密", "LongTimeNoVerify": "长时间未验证", @@ -1433,5 +1431,29 @@ "Host": "主机", "Cloud": "云", "Device": "网络设备", - "Other": "其他" + "Other": "其他", + "NoLoginLongTime": "长时间未登录", + "NewAccountsFound": "发现新账户", + "GroupChanged": "组已更改", + "SudoChanged": "Sudo已更改", + "AuthorizedKeysChanged": "授权密钥已更改", + "AccountDeleted": "账户已删除", + "PasswordExpired": "密码过期", + "LongTimePassword": "长期使用的密码", + "WeakPassword": "弱密码", + "LeakedPassword": "泄露密码", + "RepeatedPassword": "重复密码", + "PasswordError": "密码错误", + "NoAdminAccount": "无管理员账户", + "ProportionOfAccountTypes": "账号类型占比", + "CurrentStatus": "当前状态", + "ChangeSecretTaskStatus": "改密任务执行状态", + "TaskCount": "任务数", + "ScheduledTaskCount": "定时任务数", + "TaskExecutionCount": "任务执行数", + "SuccessCount": "成功数", + "FailCount": "失败数", + "ChangeSecretFailAccounts": "改密失败账号", + "OngoingPwdChange": "当前正在改密情况", + "AccountResult": "账号成功/失败情况" } \ No newline at end of file