Merge pull request github#34505 from github/repo-sync

Repo sync

Author: docs-bot

assets/images/help/desktop/configure-custom-editor.png

@@ -24,37 +24,39 @@ shortTitle: Recommended alert thresholds
 
 ## About recommended alert thresholds
 
-You can configure external monitoring systems to alert you to storage, CPU, and memory usage that may cause problems with {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/admin/enterprise-management/monitoring-your-appliance/setting-up-external-monitoring)."
+You can configure external monitoring systems to alert you to storage, CPU, and memory usage that may cause problems with {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/admin/enterprise-management/monitoring-your-appliance/setting-up-external-monitoring)" and "[AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/accessing-the-monitor-dashboard)."
 
 ## Monitoring storage
 
 We recommend that you monitor both the root and user storage devices and configure an alert with values that allow for ample response time when available disk space is low.
 
 | Severity | Threshold |
 | -------- | --------- |
-| **Warning** | Disk use exceeds 70% of total available |
-| **Critical** | Disk use exceeds 85% of total available |
+| **Warning** | Disk use exceeds 60% of total available |
+| **Critical** | Disk use exceeds 75% of total available |
 
 You can adjust these values based on the total amount of storage allocated, historical growth patterns, and expected time to respond. We recommend over-allocating storage resources to allow for growth and prevent the downtime required to allocate additional storage.
 
 ## Monitoring CPU and load average usage
 
-Although it is normal for CPU usage to fluctuate based on resource-intense Git operations, we recommend configuring an alert for abnormally high CPU utilization, as prolonged spikes can mean your instance is under-provisioned. We recommend monitoring the fifteen-minute system load average for values nearing or exceeding the number of CPU cores allocated to the virtual machine.
+Although it is normal for CPU usage to fluctuate based on resource-intense Git operations, we recommend configuring an alert for abnormally high CPU utilization, as prolonged spikes can mean your instance is under-provisioned. Additionally, we recommend monitoring CPU utilization during a regular work week when the instance is in a healthy state to establish a baseline that can be used as a reference.
 
 | Severity | Threshold |
 | -------- | --------- |
-| **Warning** | Fifteen minute load average exceeds 1x CPU cores |
-| **Critical** | Fifteen minute load average exceeds 2x CPU cores |
+| **Warning** | 20% above the baseline |
+| **Critical** | 40% above the baseline |
 
 We also recommend that you monitor virtualization "steal" time to ensure that other virtual machines running on the same host system are not using all of the instance's resources.
 
 ## Monitoring memory usage
 
-The amount of physical memory allocated to {% data variables.location.product_location %} can have a large impact on overall performance and application responsiveness. The system is designed to make heavy use of the kernel disk cache to speed up Git operations. We recommend that the normal RSS working set fit within 50% of total available RAM at peak usage.
+The amount of physical memory allocated to {% data variables.location.product_location %} can have a large impact on overall performance and application responsiveness. The system is designed to make heavy use of the kernel disk cache to speed up Git operations. We recommend that the amount of physical memory assigned to the processes fit within 50% of total available RAM at peak usage.
 
 | Severity | Threshold |
 | -------- | --------- |
-| **Warning**  | Sustained RSS usage exceeds 50% of total available memory |
-| **Critical** | Sustained RSS usage exceeds 70% of total available memory |
+| **Warning**  | Sustained memory usage exceeds 50% of total available memory |
+| **Critical** | Sustained memory usage exceeds 70% of total available memory |
+
+Nevertheless, for cluster installations, we recommend following a similar approach to CPU monitoring: establish a baseline that defines what is considered normal usage, and set the threshold accordingly. This threshold may also vary between roles.
 
 If memory is exhausted, the kernel OOM killer will attempt to free memory resources by forcibly killing RAM heavy application processes, which could result in a disruption of service. We recommend allocating more memory to the virtual machine than is required in the normal course of operations.

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/recommended-alert-thresholds.md

@@ -10,9 +10,12 @@ versions:
   feature: desktop
 shortTitle: Configure default editor
 ---
-## Supported editors
 
-{% data variables.product.prodname_desktop %} supports the following editors. If you installed an editor while {% data variables.product.prodname_desktop %} was open you will need to quit and reopen {% data variables.product.prodname_desktop %} in order for the editor to be detected.
+## Introduction
+
+{% data variables.product.prodname_desktop %} provides support for a number of editors, and also allows you to select a custom editor if your preferred editor is not supported. If you installed an editor while {% data variables.product.prodname_desktop %} was open you will need to quit and reopen {% data variables.product.prodname_desktop %} in order for the editor to be detected.
+
+## Supported editors
 
 {% mac %}
 
@@ -97,6 +100,17 @@ shortTitle: Configure default editor
 
 {% endwindows %}
 
+## Configuring a custom editor
+
+{% data reusables.desktop.mac-select-desktop-menu %}
+1. In the Preferences window, select **Integrations**.
+   ![Screenshot of the "Preferences" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png)
+1. Under "External Editor", use the dropdown menu to select **Configure Custom Editor**.
+   ![Screenshot of the "Preferences window. Under "External Editor", the dropdown menu is displayed with "Configure Custom Editor" highlighted in blue and outlined in orange.](/assets/images/help/desktop/configure-custom-editor.png)
+1. Click **Choose** to open the system dialog to navigate to the path of your custom editor.
+1. Under "Arguments", enter any arguments you would like to use after the "%TARGET_PATH%" variable. Reference supporting documentation for your custom editor to ensure you have the arguments set correctly, as invalid arguments can prevent the editor from launching in {% data variables.product.prodname_desktop %}.
+1. Click **Save**.
+
 ## Opening a repository in the default editor
 
 To open the current repository in the default editor, you can use the menu bar:

content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md

@@ -65,7 +65,7 @@ text:
   name: Text
   comment: number
 typescript:
-  name: Typescript
+  name: TypeScript
   comment: slash
 xml:
   name: XML

data/code-languages.yml

@@ -3,5 +3,5 @@
     "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
     "apiRequestEvent": "This event is only available via audit log streaming."
   },
-  "sha": "0da185a95ffe0bea6a17eb08ac06a03b5729e751"
+  "sha": "30ee4d895a808d2e9d1f96fe142fb9f939e57efb"
 }

src/audit-logs/lib/config.json

@@ -60,5 +60,5 @@
       "2022-11-28"
     ]
   },
-  "sha": "272a391f5bfe7d533f35ecfb65adfcf137162fb3"
+  "sha": "fe797834e6a9f3216737d6e0bc9fb3237ecb7957"
 }