Enterprise bug fix hour for the week of September 4, 2023 🐛 (#42253)

Co-authored-by: Matt Pollard <[email protected]>

Author: lecoursen

content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-azure.md

@@ -42,7 +42,7 @@ Before launching {% data variables.location.product_location %} on Azure, you'll
 1. Find the most recent {% data variables.product.prodname_ghe_server %} appliance image. For more information about the `vm image list` command, see "[`az vm image list`](https://docs.microsoft.com/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" in the Microsoft documentation.
 
    ```shell
-   az vm image list --all -f GitHub-Enterprise | grep '"urn":' | sort -V
+   az vm image list --all -f GitHub-Enterprise | grep '"urn": "GitHub:' | sort -V
    ```
 
 1. Create a new VM using the appliance image you found. For more information, see [az vm create](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_create) in the Microsoft documentation.

content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md

@@ -167,6 +167,10 @@ DF |`packages_stats.ecosystems.containers.daily_update_count` | Number of contai
 DG |`packages_stats.ecosystems.containers.daily_delete_count` | Number of container images deleted
 DH | `packages_stats.ecosystems.containers.daily_create_count` | Number of container images created | {% endif %}
 
+{% ifversion ghes = 3.8 %}
+Optionally, you can include additional data about {% data variables.product.prodname_actions %}. For more information, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/including-data-about-github-actions-in-server-statistics)."
+{% endif %}
+
 ## {% data variables.product.prodname_server_statistics %} data examples
 
 To see an example of the headings included in the CSV export for {% data variables.product.prodname_server_statistics %}, download the [{% data variables.product.prodname_server_statistics %} CSV example](/assets/server-statistics-csv-example.csv).

content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/including-data-about-github-actions-in-server-statistics.md

@@ -0,0 +1,39 @@
+---
+title: Including data about GitHub Actions in Server Statistics
+shortTitle: Include data about Actions
+intro: 'You can help us improve {% data variables.product.prodname_actions %} by allowing {% data variables.product.prodname_server_statistics %} to collect data about {% data variables.product.prodname_actions %}.'
+versions:
+  ghes: '3.8'
+permissions: 'Enterprise owners can include data about {% data variables.product.prodname_actions %} in {% data variables.product.prodname_server_statistics %}.'
+topics:
+  - Enterprise
+---
+
+{% note %}
+
+**Note:** Including {% data variables.product.prodname_actions %} data in {% data variables.product.prodname_server_statistics %} is in public beta and subject to change.
+
+{% endnote %}
+
+## Data collected
+
+If you enable the collection of data about {% data variables.product.prodname_actions %}, the following data will be collected for {% data variables.location.product_location %}.
+
+- The top 20 actions used per month, by organization
+- Number of checks run, by organization
+- Number of jobs per hour, day, week, and month, by organization
+- Maximum concurrency of running jobs, by organization and operating system
+- Workflows per operating system, by organization
+- Job run length, by organization
+- Number of job runners, by type (no names or IP addresses are collected)
+- Job distribution over types of runners
+
+## Enabling the collection of data about {% data variables.product.prodname_actions %}
+
+{% data reusables.enterprise_installation.ssh-into-instance %}
+1. Enter the following command.
+
+   ```shell{:copy}
+   ghe-config app.github.enable-actions-usage-stats true
+   ```
+{% data reusables.enterprise.apply-configuration %}

content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md

@@ -8,5 +8,5 @@ children:
   - /about-server-statistics
   - /exporting-server-statistics
   - /requesting-server-statistics-using-the-rest-api
+  - /including-data-about-github-actions-in-server-statistics
 ---
-

content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md

@@ -46,6 +46,12 @@ All streamed audit logs are sent as compressed JSON files. The filename format i
 
 {% endnote %}
 
+{% ifversion ghes %}
+
+Enabling audit log streaming can cause a minor impact on the performance of {% data variables.location.product_location %}. For more information about increasing resources to mitigate this performance impact, see "[AUTOTITLE](/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources)."
+
+{% endif %}
+
 ## Setting up audit log streaming
 
 You set up the audit log stream on {% data variables.product.product_name %} by following the instructions for your provider.

content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -22,10 +22,6 @@ shortTitle: Enterprise Cloud trial
 
 You can set up a trial to evaluate the additional features that come with {% data variables.product.prodname_ghe_cloud %}, such as SAML single sign-on (SSO), internal repositories, audit log streaming, and included {% data variables.product.prodname_actions %} minutes. For a detailed list of the features available with {% data variables.product.prodname_ghe_cloud %}, see our [Pricing](https://github.com/pricing) page.
 
-Trials are also available for {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server)."
-
-{% data reusables.products.which-product-to-use %}
-
 ## About trials of {% data variables.product.prodname_ghe_cloud %}
 
 You can set up a {% data reusables.copilot.trial-period %}-day trial to evaluate {% data variables.product.prodname_ghe_cloud %}. Your trial includes an enterprise account, which allows you to manage multiple organizations. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts)."
@@ -38,14 +34,13 @@ You do not need to provide a payment method during the trial.
 
 {% data reusables.saml.saml-accounts %}
 
-{% data variables.product.prodname_emus %} is not part of the free trial of {% data variables.product.prodname_ghe_cloud %}. If you're interested in {% data variables.product.prodname_emus %}, please contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact).
-
 {% data reusables.enterprise.ghec-trial-azure %}
 
 ## Features not included in the trial
 
 The following features are not included in the trial of {% data variables.product.prodname_ghe_cloud %}:
 
+- {% data variables.product.prodname_emus %}: If you're interested in {% data variables.product.prodname_emus %}, please contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact).
 - {% data variables.product.prodname_GH_advanced_security %}
 - {% data variables.product.prodname_github_codespaces %}
 - {% data variables.product.prodname_copilot_for_business %}

data/release-notes/enterprise-server/3-6/0.yml

@@ -36,7 +36,7 @@ sections:
       notes:
         # https://github.com/github/releases/issues/1438
         - |
-          You can stream audit log and Git events for your instance to Amazon S3, Azure Blob Storage, Azure Event Hubs, Google Cloud Storage, or Splunk. Audit log streaming is in public beta and subject to change. For more information, see "[Streaming the audit log for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise)."
+          You can stream audit log and Git events for your instance to Amazon S3, Azure Blob Storage, Azure Event Hubs, Google Cloud Storage, or Splunk. Audit log streaming is in public beta and subject to change. Enabling this feature can cause a minor impact on the performance of {% data variables.location.product_location %}. For more information, see "[Streaming the audit log for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise)." [Updated: 2023-09-12]
 
     - heading: GitHub Connect
       notes: