From 00c79f65fbb19d423715bffb92888fd3ca8b95a6 Mon Sep 17 00:00:00 2001 From: Matt Pollard Date: Tue, 12 Sep 2023 15:34:27 +0200 Subject: [PATCH] Restructure administrative articles after removal of "Configuring your enterprise" (#42165) Co-authored-by: Laura Coursen --- .../accessing-the-administrative-shell-ssh.md | 1 + .../command-line-utilities.md | 1 + .../index.md | 14 ++++++++++ .../about-the-management-console.md | 3 ++- .../accessing-the-management-console.md | 4 ++- .../index.md | 8 +++--- ...naging-access-to-the-management-console.md | 4 ++- .../site-admin-dashboard.md | 1 + ...ooting-access-to-the-management-console.md | 4 ++- ...nabling-and-scheduling-maintenance-mode.md | 1 + .../configuring-maintenance-mode/index.md | 13 ++++++++++ .../administering-your-instance/index.md | 9 +++---- content/admin/configuration/index.md | 1 - content/admin/guides.md | 26 +++++++++---------- .../index.md | 2 +- .../index.md | 2 +- .../about-system-logs.md | 1 + .../accessing-the-monitor-dashboard.md | 1 + .../configuring-collectd.md | 1 + ...ting-a-health-check-for-your-enterprise.md | 1 + .../index.md | 4 ++- .../monitoring-using-snmp.md | 3 ++- .../recommended-alert-thresholds.md | 1 + .../setting-up-external-monitoring.md | 1 + .../index.md | 2 +- ...ing-pre-receive-hooks-on-your-instance.md} | 5 ++-- .../about-the-site-admin-dashboard.md | 2 +- 27 files changed, 82 insertions(+), 34 deletions(-) rename content/admin/administering-your-instance/{ => administering-your-instance-from-the-command-line}/accessing-the-administrative-shell-ssh.md (98%) rename content/admin/administering-your-instance/{ => administering-your-instance-from-the-command-line}/command-line-utilities.md (99%) create mode 100644 content/admin/administering-your-instance/administering-your-instance-from-the-command-line/index.md rename content/admin/{configuration/administering-your-instance-from-the-management-console => administering-your-instance/administering-your-instance-from-the-web-ui}/about-the-management-console.md (97%) rename content/admin/{configuration/administering-your-instance-from-the-management-console => administering-your-instance/administering-your-instance-from-the-web-ui}/accessing-the-management-console.md (90%) rename content/admin/{configuration/administering-your-instance-from-the-management-console => administering-your-instance/administering-your-instance-from-the-web-ui}/index.md (71%) rename content/admin/{configuration/administering-your-instance-from-the-management-console => administering-your-instance/administering-your-instance-from-the-web-ui}/managing-access-to-the-management-console.md (97%) rename content/admin/administering-your-instance/{ => administering-your-instance-from-the-web-ui}/site-admin-dashboard.md (99%) rename content/admin/{configuration/administering-your-instance-from-the-management-console => administering-your-instance/administering-your-instance-from-the-web-ui}/troubleshooting-access-to-the-management-console.md (94%) rename content/admin/administering-your-instance/{ => configuring-maintenance-mode}/enabling-and-scheduling-maintenance-mode.md (99%) create mode 100644 content/admin/administering-your-instance/configuring-maintenance-mode/index.md rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/about-system-logs.md (97%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/accessing-the-monitor-dashboard.md (96%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/configuring-collectd.md (97%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/generating-a-health-check-for-your-enterprise.md (95%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/index.md (87%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/monitoring-using-snmp.md (98%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/recommended-alert-thresholds.md (96%) rename content/admin/monitoring-managing-and-updating-your-instance/{monitoring-your-appliance => monitoring-your-instance}/setting-up-external-monitoring.md (94%) rename content/admin/policies/enforcing-policy-with-pre-receive-hooks/{managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md => managing-pre-receive-hooks-on-your-instance.md} (93%) diff --git a/content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh.md similarity index 98% rename from content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh.md index 64ba973dd5dd..e9a6d6780de6 100644 --- a/content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh.md @@ -12,6 +12,7 @@ redirect_from: - /enterprise/admin/configuration/accessing-the-administrative-shell-ssh - /admin/configuration/accessing-the-administrative-shell-ssh - /admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh + - /admin/administering-your-instance/accessing-the-administrative-shell-ssh intro: '{% data reusables.enterprise_site_admin_settings.about-ssh-access %}' versions: ghes: '*' diff --git a/content/admin/administering-your-instance/command-line-utilities.md b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md similarity index 99% rename from content/admin/administering-your-instance/command-line-utilities.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md index 82d8b7116566..a80ff105526f 100644 --- a/content/admin/administering-your-instance/command-line-utilities.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md @@ -8,6 +8,7 @@ redirect_from: - /enterprise/admin/configuration/command-line-utilities - /admin/configuration/command-line-utilities - /admin/configuration/configuring-your-enterprise/command-line-utilities + - /admin/administering-your-instance/command-line-utilities versions: ghes: '*' type: reference diff --git a/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/index.md b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/index.md new file mode 100644 index 000000000000..043ab6f680a5 --- /dev/null +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/index.md @@ -0,0 +1,14 @@ +--- +title: Administering your instance from the command line +intro: 'You can use the administrative shell (SSH) and command-line utilities to perform administrative tasks for {% data variables.location.product_location %}.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise +children: + - /accessing-the-administrative-shell-ssh + - /command-line-utilities +shortTitle: Command line +--- + diff --git a/content/admin/configuration/administering-your-instance-from-the-management-console/about-the-management-console.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console.md similarity index 97% rename from content/admin/configuration/administering-your-instance-from-the-management-console/about-the-management-console.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console.md index 1d6ee904b3ef..48bfb5b396aa 100644 --- a/content/admin/configuration/administering-your-instance-from-the-management-console/about-the-management-console.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console.md @@ -1,7 +1,8 @@ --- title: About the Management Console -shortTitle: About intro: '{% data reusables.enterprise_site_admin_settings.management-console-overview %}' +redirect_from: + - /admin/configuration/administering-your-instance-from-the-management-console/about-the-management-console versions: ghes: '*' type: overview diff --git a/content/admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console.md similarity index 90% rename from content/admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console.md index 69fcd197d86b..77f4c4faa8ce 100644 --- a/content/admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console.md @@ -1,7 +1,9 @@ --- title: Accessing the Management Console -shortTitle: Access +shortTitle: Access Management Console intro: 'You can access the {% data variables.enterprise.management_console %} {% ifversion ghes < 3.8 %}using the {% data variables.enterprise.management_console %} password{% elsif enterprise-management-console-multi-user-auth %}as the root site administrator or a {% data variables.enterprise.management_console %} user{% endif %}.' +redirect_from: + - /admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console versions: ghes: '*' type: how_to diff --git a/content/admin/configuration/administering-your-instance-from-the-management-console/index.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/index.md similarity index 71% rename from content/admin/configuration/administering-your-instance-from-the-management-console/index.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/index.md index c1c5e8d17e70..08d9cafffb9b 100644 --- a/content/admin/configuration/administering-your-instance-from-the-management-console/index.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/index.md @@ -1,6 +1,6 @@ --- -title: Administering your instance from the Management Console -intro: 'You can use the {% data variables.enterprise.management_console %} to perform administrative tasks for {% data variables.location.product_location %}. ' +title: Administering your instance from the web UI +intro: 'To perform administrative tasks for {% data variables.location.product_location %}, you can use the {% data variables.enterprise.management_console %} and site admin dashboard.' redirect_from: - /admin/configuration/configuring-your-enterprise/accessing-the-management-console - /enterprise/admin/articles/about-the-management-console @@ -12,6 +12,7 @@ redirect_from: - /enterprise/admin/installation/accessing-the-management-console - /enterprise/admin/configuration/accessing-the-management-console - /admin/configuration/accessing-the-management-console + - /admin/configuration/administering-your-instance-from-the-management-console versions: ghes: '*' type: how_to @@ -22,6 +23,7 @@ children: - /managing-access-to-the-management-console - /accessing-the-management-console - /troubleshooting-access-to-the-management-console -shortTitle: Management Console + - /site-admin-dashboard +shortTitle: Web UI --- diff --git a/content/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md similarity index 97% rename from content/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md index 4286c6dbf0fe..3fe0287d10a5 100644 --- a/content/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md @@ -1,7 +1,9 @@ --- title: Managing access to the Management Console -shortTitle: Manage access +shortTitle: Manage Management Console access intro: '{% ifversion enterprise-management-console-multi-user-auth %}You can increase the security of {% data variables.location.product_location %} by creating or deleting {% data variables.enterprise.management_console %} users. As the root site administrator, you {% else %}You {% endif %}can access the {% data variables.enterprise.management_console %} as well as configure {% data variables.enterprise.management_console %} authentication rate limits.' +redirect_from: + - /admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console versions: ghes: '*' type: how_to diff --git a/content/admin/administering-your-instance/site-admin-dashboard.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md similarity index 99% rename from content/admin/administering-your-instance/site-admin-dashboard.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md index 376966772dc6..26cd70cbb397 100644 --- a/content/admin/administering-your-instance/site-admin-dashboard.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard.md @@ -7,6 +7,7 @@ redirect_from: - /enterprise/admin/configuration/site-admin-dashboard - /admin/configuration/site-admin-dashboard - /admin/configuration/configuring-your-enterprise/site-admin-dashboard + - /admin/administering-your-instance/site-admin-dashboard versions: ghes: '*' ghae: '*' diff --git a/content/admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console.md similarity index 94% rename from content/admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console.md rename to content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console.md index 2c2c6705e33c..e512e36c8d64 100644 --- a/content/admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console.md +++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console.md @@ -1,7 +1,9 @@ --- title: Troubleshooting access to the Management Console -shortTitle: Troubleshoot +shortTitle: Troubleshoot Management Console intro: 'You can troubleshoot access problems for the {% data variables.enterprise.management_console %}.' +redirect_from: + - /admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console versions: ghes: '*' type: how_to diff --git a/content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md b/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md similarity index 99% rename from content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md rename to content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md index 99a53bc0914d..981b3aa9b4d6 100644 --- a/content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md +++ b/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md @@ -12,6 +12,7 @@ redirect_from: - /enterprise/admin/configuration/enabling-and-scheduling-maintenance-mode - /admin/configuration/enabling-and-scheduling-maintenance-mode - /admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode + - /admin/administering-your-instance/enabling-and-scheduling-maintenance-mode versions: ghes: '*' type: how_to diff --git a/content/admin/administering-your-instance/configuring-maintenance-mode/index.md b/content/admin/administering-your-instance/configuring-maintenance-mode/index.md new file mode 100644 index 000000000000..ea6945129b3f --- /dev/null +++ b/content/admin/administering-your-instance/configuring-maintenance-mode/index.md @@ -0,0 +1,13 @@ +--- +title: Configuring maintenance mode +intro: 'To control availability of {% data variables.location.product_location %} during maintenance, you can configure maintenance mode.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise +children: + - /enabling-and-scheduling-maintenance-mode +shortTitle: Maintenance mode +--- + diff --git a/content/admin/administering-your-instance/index.md b/content/admin/administering-your-instance/index.md index 054081a0be62..56f1ed769652 100644 --- a/content/admin/administering-your-instance/index.md +++ b/content/admin/administering-your-instance/index.md @@ -1,7 +1,7 @@ --- title: Administering your instance shortTitle: Administer your instance -intro: 'You can administer your instance using SSH and command-line utilities.' +intro: 'You can administer your instance using the {% data variables.enterprise.management_console %}, site admin dashboard, SSH, and command-line utilities.' versions: ghes: '*' ghae: '*' @@ -9,8 +9,7 @@ type: how_to topics: - Enterprise children: - - /accessing-the-administrative-shell-ssh - - /enabling-and-scheduling-maintenance-mode - - /site-admin-dashboard - - /command-line-utilities + - /administering-your-instance-from-the-web-ui + - /administering-your-instance-from-the-command-line + - /configuring-maintenance-mode --- diff --git a/content/admin/configuration/index.md b/content/admin/configuration/index.md index f1d74666333d..8ef88d7434cd 100644 --- a/content/admin/configuration/index.md +++ b/content/admin/configuration/index.md @@ -13,7 +13,6 @@ versions: topics: - Enterprise children: - - /administering-your-instance-from-the-management-console - /configuring-user-applications-for-your-enterprise - /hardening-security-for-your-enterprise - /configuring-network-settings diff --git a/content/admin/guides.md b/content/admin/guides.md index f06f29c0f1a9..9f0e977fce06 100644 --- a/content/admin/guides.md +++ b/content/admin/guides.md @@ -38,8 +38,8 @@ includeGuides: - /admin/identity-and-access-management/using-cas-for-enterprise-iam/using-cas - /admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap - /admin/identity-and-access-management/using-saml-for-enterprise-iam - - /admin/administering-your-instance/accessing-the-administrative-shell-ssh - - /admin/configuration/administering-your-instance-from-the-management-console + - /admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui - /admin/configuration/configuring-network-settings/configuring-a-hostname - /admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance - /admin/configuration/configuring-network-settings/configuring-built-in-firewall-rules @@ -55,7 +55,7 @@ includeGuides: - /admin/configuration/connecting-your-enterprise-account-to-github-enterprise-cloud - /admin/configuration/hardening-security-for-your-enterprise/configuring-ssh-connections-to-your-instance - /admin/configuration/hardening-security-for-your-enterprise/configuring-host-keys-for-your-instance - - /admin/administering-your-instance/enabling-and-scheduling-maintenance-mode + - /admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode - /admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise - /admin/configuration/hardening-security-for-your-enterprise/enabling-private-mode - /admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation @@ -64,20 +64,20 @@ includeGuides: - /admin/overview/initializing-github-ae - /admin/configuration/configuring-network-settings/network-ports - /admin/configuration/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list - - /admin/administering-your-instance/site-admin-dashboard + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/site-admin-dashboard - /admin/configuration/hardening-security-for-your-enterprise/troubleshooting-tls-errors - /admin/configuration/configuring-network-settings/using-github-enterprise-server-with-a-load-balancer - /admin/monitoring-managing-and-updating-your-instance/configuring-high-availability/about-high-availability-configuration - - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/accessing-the-monitor-dashboard + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/accessing-the-monitor-dashboard - /admin/monitoring-managing-and-updating-your-instance/configuring-high-availability/creating-a-high-availability-replica - /admin/monitoring-managing-and-updating-your-instance/configuring-clustering/differences-between-clustering-and-high-availability-ha - /admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/enabling-automatic-update-checks - /admin/monitoring-managing-and-updating-your-instance/configuring-high-availability/initiating-a-failover-to-your-replica-appliance - - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/recommended-alert-thresholds - - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/setting-up-external-monitoring + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/recommended-alert-thresholds + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/setting-up-external-monitoring - /admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/upgrade-requirements - /admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server - - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/about-system-logs + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/about-system-logs - /support/learning-about-github-support/about-github-support - /admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise - /admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled @@ -103,7 +103,7 @@ includeGuides: - /admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise - /admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise - /admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise - - /admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance + - /admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-your-instance - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-ssh-keys - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-users-across-your-enterprise - /admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise @@ -138,9 +138,9 @@ includeGuides: - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users - /admin/overview/creating-an-enterprise-account - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization - - /admin/configuration/administering-your-instance-from-the-management-console/about-the-management-console - - /admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console - - /admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console - - /admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console + - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console --- diff --git a/content/admin/monitoring-activity-in-your-enterprise/index.md b/content/admin/monitoring-activity-in-your-enterprise/index.md index 753c6e4d106f..229bc2361787 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/index.md +++ b/content/admin/monitoring-activity-in-your-enterprise/index.md @@ -13,5 +13,5 @@ children: - /reviewing-audit-logs-for-your-enterprise - /exploring-user-activity-in-your-enterprise - /analyzing-how-your-team-works-with-server-statistics -shortTitle: Monitor activity +shortTitle: Monitor user activity --- diff --git a/content/admin/monitoring-managing-and-updating-your-instance/index.md b/content/admin/monitoring-managing-and-updating-your-instance/index.md index c6b6408b5716..f77742afada1 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/index.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/index.md @@ -9,7 +9,7 @@ versions: topics: - Enterprise children: - - /monitoring-your-appliance + - /monitoring-your-instance - /updating-the-virtual-machine-and-physical-resources - /configuring-clustering - /configuring-high-availability diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/about-system-logs.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/about-system-logs.md similarity index 97% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/about-system-logs.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/about-system-logs.md index 03583dac988b..246e907f04f6 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/about-system-logs.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/about-system-logs.md @@ -11,6 +11,7 @@ topics: - Security redirect_from: - /admin/enterprise-management/monitoring-your-appliance/about-system-logs + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/about-system-logs --- ## System logs diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/accessing-the-monitor-dashboard.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/accessing-the-monitor-dashboard.md similarity index 96% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/accessing-the-monitor-dashboard.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/accessing-the-monitor-dashboard.md index 8684343a7d64..6286e2da081b 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/accessing-the-monitor-dashboard.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/accessing-the-monitor-dashboard.md @@ -6,6 +6,7 @@ redirect_from: - /enterprise/admin/enterprise-management/accessing-the-monitor-dashboard - /admin/enterprise-management/accessing-the-monitor-dashboard - /admin/enterprise-management/monitoring-your-appliance/accessing-the-monitor-dashboard + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/accessing-the-monitor-dashboard versions: ghes: '*' type: how_to diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/configuring-collectd.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/configuring-collectd.md similarity index 97% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/configuring-collectd.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/configuring-collectd.md index a08d99dc34e0..c01f440109dc 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/configuring-collectd.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/configuring-collectd.md @@ -7,6 +7,7 @@ redirect_from: - /enterprise/admin/enterprise-management/configuring-collectd - /admin/enterprise-management/configuring-collectd - /admin/enterprise-management/monitoring-your-appliance/configuring-collectd + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/configuring-collectd versions: ghes: '*' type: how_to diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md similarity index 95% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md index 2b6867ca4ae8..87e9e4e69edf 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/generating-a-health-check-for-your-enterprise.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md @@ -13,6 +13,7 @@ topics: product: '{% data reusables.gated-features.generated-health-checks %}' redirect_from: - /admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/generating-a-health-check-for-your-enterprise --- {% note %} diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/index.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/index.md similarity index 87% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/index.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/index.md index 2526d667884a..0c27a2661c2b 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/index.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/index.md @@ -1,5 +1,5 @@ --- -title: Monitoring your appliance +title: Monitoring your instance intro: 'As use of {% data variables.location.product_location %} increases over time, the utilization of system resources, like CPU, memory, and storage will also increase. You can configure monitoring and alerting so that you''re aware of potential issues before they become critical enough to negatively impact application performance or availability.' redirect_from: - /enterprise/admin/guides/installation/system-resource-monitoring-and-alerting @@ -7,6 +7,7 @@ redirect_from: - /enterprise/admin/installation/monitoring-your-github-enterprise-server-appliance - /enterprise/admin/enterprise-management/monitoring-your-appliance - /admin/enterprise-management/monitoring-your-appliance + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance versions: ghes: '*' topics: @@ -19,4 +20,5 @@ children: - /monitoring-using-snmp - /about-system-logs - /generating-a-health-check-for-your-enterprise +shortTitle: Monitor your instance --- diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/monitoring-using-snmp.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/monitoring-using-snmp.md similarity index 98% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/monitoring-using-snmp.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/monitoring-using-snmp.md index a64f38660ad1..236662705b2e 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/monitoring-using-snmp.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/monitoring-using-snmp.md @@ -6,7 +6,8 @@ redirect_from: - /enterprise/admin/articles/monitoring-using-snmp - /enterprise/admin/enterprise-management/monitoring-using-snmp - /admin/enterprise-management/monitoring-using-snmp - - /admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp + - /admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/monitoring-using-snmp versions: ghes: '*' type: how_to diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/recommended-alert-thresholds.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/recommended-alert-thresholds.md similarity index 96% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/recommended-alert-thresholds.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/recommended-alert-thresholds.md index 5d17129af9d0..a8a03d06df0c 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/recommended-alert-thresholds.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/recommended-alert-thresholds.md @@ -8,6 +8,7 @@ redirect_from: - /enterprise/admin/enterprise-management/recommended-alert-thresholds - /admin/enterprise-management/recommended-alert-thresholds - /admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/recommended-alert-thresholds versions: ghes: '*' type: reference diff --git a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/setting-up-external-monitoring.md b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/setting-up-external-monitoring.md similarity index 94% rename from content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/setting-up-external-monitoring.md rename to content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/setting-up-external-monitoring.md index 805509356929..ae8a2fcc859a 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/setting-up-external-monitoring.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/monitoring-your-instance/setting-up-external-monitoring.md @@ -6,6 +6,7 @@ redirect_from: - /enterprise/admin/enterprise-management/setting-up-external-monitoring - /admin/enterprise-management/setting-up-external-monitoring - /admin/enterprise-management/monitoring-your-appliance/setting-up-external-monitoring + - /admin/monitoring-managing-and-updating-your-instance/monitoring-your-appliance/setting-up-external-monitoring versions: ghes: '*' type: how_to diff --git a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/index.md b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/index.md index 9f28fb8f548d..773fcb94892a 100644 --- a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/index.md +++ b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/index.md @@ -12,7 +12,7 @@ children: - /about-pre-receive-hooks - /creating-a-pre-receive-hook-environment - /creating-a-pre-receive-hook-script - - /managing-pre-receive-hooks-on-the-github-enterprise-server-appliance + - /managing-pre-receive-hooks-on-your-instance shortTitle: Policy with pre-receive hooks --- diff --git a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-your-instance.md similarity index 93% rename from content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md rename to content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-your-instance.md index af4fe17e2e75..cfe69c38cb42 100644 --- a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md +++ b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-your-instance.md @@ -1,11 +1,12 @@ --- -title: Managing pre-receive hooks on the GitHub Enterprise Server appliance -intro: 'Configure how people will use pre-receive hooks within their {% data variables.product.prodname_ghe_server %} appliance.' +title: Managing pre-receive hooks on your instance +intro: 'Configure how people will use pre-receive hooks on {% data variables.location.product_location %}.' redirect_from: - /enterprise/admin/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance - /enterprise/admin/guides/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-appliance - /enterprise/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance - /admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance + - /admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance versions: ghes: '*' type: how_to diff --git a/data/reusables/enterprise_site_admin_settings/about-the-site-admin-dashboard.md b/data/reusables/enterprise_site_admin_settings/about-the-site-admin-dashboard.md index 31c34efe2cde..59bb88e770b7 100644 --- a/data/reusables/enterprise_site_admin_settings/about-the-site-admin-dashboard.md +++ b/data/reusables/enterprise_site_admin_settings/about-the-site-admin-dashboard.md @@ -1 +1 @@ -You can use the site admin dashboard to manage users, organizations, and repositories in your enterprise directly in {% data variables.product.product_name %}. +You can use the site admin dashboard to manage users, organizations, and repositories on {% data variables.location.product_location %}.