diff --git a/content/actions/security-guides/using-artifact-attestations-and-reusable-workflows-to-achieve-slsa-v1-build-level-3.md b/content/actions/security-guides/using-artifact-attestations-and-reusable-workflows-to-achieve-slsa-v1-build-level-3.md index 92d9e848a032..6c17090f2f45 100644 --- a/content/actions/security-guides/using-artifact-attestations-and-reusable-workflows-to-achieve-slsa-v1-build-level-3.md +++ b/content/actions/security-guides/using-artifact-attestations-and-reusable-workflows-to-achieve-slsa-v1-build-level-3.md @@ -14,8 +14,6 @@ versions: ghec: '*' --- -{% data reusables.actions.artifact-attestations-public-beta-note %} - ## Introduction Artifact attestations are a great way to create unfalsifiable provenance and integrity guarantees for the software you build. diff --git a/content/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds.md b/content/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds.md index 8f79d422c3bc..04318b209bee 100644 --- a/content/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds.md +++ b/content/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds.md @@ -7,8 +7,6 @@ versions: shortTitle: Artifact attestations --- -{% data reusables.actions.artifact-attestations-public-beta-note %} - ## About artifact attestations {% data reusables.actions.about-artifact-attestations %} diff --git a/content/actions/using-workflows/storing-workflow-data-as-artifacts.md b/content/actions/using-workflows/storing-workflow-data-as-artifacts.md index 5577e919a182..3532188f1807 100644 --- a/content/actions/using-workflows/storing-workflow-data-as-artifacts.md +++ b/content/actions/using-workflows/storing-workflow-data-as-artifacts.md @@ -124,8 +124,6 @@ jobs: ## Generating artifact attestations for builds -{% data reusables.actions.artifact-attestations-public-beta-note %} - {% data reusables.actions.about-artifact-attestations %} You can access attestations after a build run, underneath the list of the artifacts the build produced. diff --git a/content/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md b/content/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md index 7922749e39a2..71ecf30d1e80 100644 --- a/content/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md +++ b/content/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md @@ -203,3 +203,10 @@ For more information about restoring from a failed upgrade, see "[AUTOTITLE](/ad If your appliance averages more than 70% CPU utilization, {% data variables.product.company_short %} strongly recommends scaling up your server resources before upgrading to 3.11 or above. The new hardware or instance type should have more vCPUs to accommodate the additional load from new features and improvements included with the latest releases. {% endif %} + +{% ifversion ghes > 3.12 and ghes < 3.15 %} + +## Elasticsearch Upgrade + +As part of upgrading GitHub Enterprise Server to version 3.13 or later, the Elasticsearch service will be upgraded. {% data variables.product.company_short %} strongly recommends following the guidance in "[AUTOTITLE](/admin/monitoring-managing-and-updating-your-instance/updating-the-virtual-machine-and-physical-resources/preparing-for-the-elasticsearch-upgrade)." +{% endif %} diff --git a/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-builds.md b/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-builds.md index 22e60d20ecc6..d5498bcadcf4 100644 --- a/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-builds.md +++ b/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-builds.md @@ -43,8 +43,6 @@ In addition to the security benefits, {% data variables.product.prodname_actions ## Generate artifact attestations for your builds -{% data reusables.actions.artifact-attestations-public-beta-note %} - {% data reusables.actions.about-artifact-attestations %} Artifact attestations include a signature over a built artifact, along with links to the source code and build instructions. If you sign your build with artifact attestations, you do not have to manage your own signing key material. {% data variables.product.prodname_dotcom %} handles this for you with the signing authority we operate. diff --git a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/viewing-copilot-usage-for-your-enterprise.md b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/viewing-copilot-usage-for-your-enterprise.md index b361d513db5f..86698733af7c 100644 --- a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/viewing-copilot-usage-for-your-enterprise.md +++ b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/viewing-copilot-usage-for-your-enterprise.md @@ -39,6 +39,10 @@ If you have a subscription to {% data variables.product.prodname_copilot_for_bus The total spending for each organization for the current cycle will usually be the number of seats assigned, multiplied by the cost per seat. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#about-billing-for-github-copilot-business-and-github-copilot-enterprise)." However, if the same organization member is assigned a seat in multiple organizations, their seat usage will be included for each organization, but the enterprise will only be charged once. The cost for this person will only be included in the organization where they were first assigned a seat. +1. Optionally, to receive a CSV report by email detailing the usage of {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %}, and {% data variables.product.prodname_copilot %} for each of your enterprise account's organizations, under the billing summary at the top of the page click **Get usage report**. The report is sent to your account's primary email address. + + ![Screenshot of the header of the billing settings page on GitHub. A button, labeled "Get usage report", is highlighted with an orange outline.](/assets/images/help/billing/actions-packages-report-download-enterprise.png) + ### At the organization-level {% else %} @@ -55,3 +59,6 @@ If you have a subscription to {% data variables.product.prodname_copilot_for_bus ![Screenshot of the organization-level {% data variables.product.prodname_copilot %} seat usage page.](/assets/images/help/copilot/org-level-seat-view.png) The figure for Total Seats shows how many seats are currently assigned for {% data variables.product.prodname_copilot %}. + +1. Optionally, to download a CSV report detailing the usage of {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %}, and {% data variables.product.prodname_copilot %} in your organization, next to "Usage this month", click **Get usage report**. An email containing a link for downloading the CSV report is sent to the primary email address for your account. You can choose whether the report should cover the last 7, 30, 90, or 180 days. + ![Screenshot of the "Billing and plans" settings. A button, labeled "Get usage report", is highlighted with an orange outline.](/assets/images/help/billing/actions-packages-report-download.png) diff --git a/data/reusables/actions/artifact-attestations-public-beta-note.md b/data/reusables/actions/artifact-attestations-public-beta-note.md deleted file mode 100644 index 9ecd05da13e8..000000000000 --- a/data/reusables/actions/artifact-attestations-public-beta-note.md +++ /dev/null @@ -1 +0,0 @@ ->[!NOTE]Artifact attestations are in public beta and subject to change. diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json index 61c287126f62..dbd94ab7f841 100644 --- a/src/audit-logs/lib/config.json +++ b/src/audit-logs/lib/config.json @@ -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": "696298e01ede2e0c4b5b112aed8cccf548c35511" + "sha": "722817aced5cc835d69929a16d3424b50298ec6f" } \ No newline at end of file