diff --git a/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md index da02e124d0..c71ffe30f5 100644 --- a/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md @@ -32,14 +32,6 @@ Data for GitHub's [trending page][] is calculated into daily, weekly, and monthl [trending page]: https://github.com/blog/1585-explore-what-is-trending-on-github -## Audit log - -{% data variables.product.product_name %} keeps a running log of audited actions that you can query. - -By default, the audit log shows you a list of all audited actions in reverse chronological order. You can filter this list by entering key-value pairs in the **Query** text box and then clicking **Search**, as explained in "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise)." - -For more information on audit logging in general, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise)." For a full list of audited actions, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise)." - ## Reports If you need to get information on the users, organizations, and repositories in {% data variables.location.product_location %}, you would ordinarily fetch JSON data through the [GitHub API](/rest). Unfortunately, the API may not provide all of the data that you want and it requires a bit of technical expertise to use. The site admin dashboard offers a **Reports** section as an alternative, making it easy for you to download CSV reports with most of the information that you are likely to need for users, organizations, and repositories. @@ -180,19 +172,3 @@ For example, the following words are reserved, among others: - `support` For the full list or reserved words, navigate to "Reserved logins" in the site admin dashboard. - -## Dormant users - -Here you can see and suspend inactive users on {% data variables.location.product_location %}. {% ifversion not ghae %}For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users)".{% endif %} - -A user account is considered to be inactive ("dormant") when it: - -- Has existed for longer than the dormancy threshold that's set for {% data variables.location.product_location %}. -- Has not generated any activity within that time period. -- Is not a site administrator. - -{% data reusables.enterprise_site_admin_settings.dormancy-threshold %} For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users#configuring-the-dormancy-threshold)." - -## Suspended users - -Here you can see all of the users who have been suspended on {% data variables.location.product_location %}, and [initiate an SSH key audit](/admin/user-management/managing-users-in-your-enterprise/auditing-ssh-keys). diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md index 1235293232..af4e9c7601 100644 --- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md @@ -25,11 +25,17 @@ topics: {% ifversion ghec %} When assessing user dormancy, we only consider organizations, repositories, or sign-on events that are associated with the enterprise. For example, a user who has recently commented on an issue in a public repository outside of the enterprise may be considered dormant, while a user who has commented on an issue in a public repository within the enterprise will not be considered dormant. - -The report includes both enterprise members and outside collaborators. {% endif %} -{% ifversion ghes or ghae %} +A user account is considered to be dormant if the user {% ifversion ghec or ghae %} hasn't performed any of the previous activities in the past 90 days.{% elsif ghes %} meets the following criteria: + +- The user's account has existed for longer than the dormancy threshold {% data variables.location.product_location %}. +- The user hasn't performed any of the previous activities within the dormancy threshold. +- The user is not a site administrator for the instance. + +You can customize the dormancy threshold for {% data variables.location.product_location %}.{% endif %} + +Dormancy applies to both enterprise members and outside collaborators. ## Viewing dormant users @@ -38,7 +44,6 @@ The report includes both enterprise members and outside collaborators. {% data reusables.enterprise_site_admin_settings.access-settings %} 1. In the left sidebar, click **Dormant users**.{% ifversion ghes %} 1. To suspend all the dormant users in this list, at the top of the page, click **Suspend all**. -{% endif %} ## Determining whether a user account is dormant @@ -57,7 +62,6 @@ The report includes both enterprise members and outside collaborators. {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.options-tab %} 1. Under "Dormancy threshold", select the dropdown menu, and click the desired dormancy threshold. - {% endif %} {% ifversion ghec %} @@ -69,5 +73,4 @@ The report includes both enterprise members and outside collaborators. 1. Scroll to "Other." 1. Optionally, to generate a new report, next to "Dormant Users", click **New report**. 1. Under "Recent reports", next to the report you want to download, click {% octicon "download" aria-hidden="true" %} **Download**. - {% endif %} diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md index 6eb45045e0..666fd435cc 100644 --- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md @@ -20,6 +20,8 @@ topics: - User account shortTitle: Manage user suspension --- +## About suspended users + If employees leave the company, you can suspend their {% data variables.product.prodname_ghe_server %} accounts to open up user licenses in your {% data variables.product.prodname_enterprise %} license while preserving the issues, comments, repositories, gists, and other data they created. Suspended users cannot sign into your instance, nor can they push or pull code. When you suspend a user, the change takes effect immediately with no notification to the user. If the user attempts to pull or push to a repository, they'll receive this error: @@ -27,7 +29,8 @@ When you suspend a user, the change takes effect immediately with no notificatio ```shell $ git clone git@[hostname]:john-doe/test-repo.git Cloning into 'test-repo'... -ERROR: Your account is suspended. Please check with your installation administrator. +ERROR: Your account is suspended. Please check with +your installation administrator. fatal: The remote end hung up unexpectedly ``` @@ -39,7 +42,13 @@ Before suspending site administrators, you must demote them to regular users. Fo {% endtip %} -## Suspending a user from the user admin dashboard +## Viewing suspended users in the site admin dashboard + +{% data reusables.enterprise_site_admin_settings.access-settings %} +1. In the left sidebar, click **Suspended users**. +1. A list of suspened users displays. + +## Suspending a user from the site admin dashboard {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.search-user %} @@ -49,7 +58,7 @@ Before suspending site administrators, you must demote them to regular users. Fo 1. In the "Log reason" field, type a reason to suspend the user. 1. Click **Suspend**. -## Unsuspending a user from the user admin dashboard +## Unsuspending a user from the site admin dashboard As when suspending a user, unsuspending a user takes effect immediately. The user will not be notified. diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md index f5079ddbf6..4927766858 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md @@ -29,6 +29,11 @@ topics: {% data reusables.audit_log.audit-log-search-list-info-about-action %} +{% ifversion ghes %}Site administrators can review the audit log for an instance, which contains a wider range of events including system administrative events. To access the instance-level audit log: + +{% data reusables.enterprise_site_admin_settings.access-settings %} +1. In the left menu, click **Audit log**.{% endif %} + In addition to viewing your audit log, you can monitor activity in your enterprise in other ways, such as {% ifversion ghes or ghae %}viewing push logs and {% endif %}managing global webhooks. For more information, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/exploring-user-activity)." You can also use the audit log, and other tools, to monitor the actions taken in response to security alerts. For more information, see "[AUTOTITLE](/code-security/getting-started/auditing-security-alerts)." ## Using your audit logs