diff --git a/content/actions/how-tos/reuse-automations/reuse-workflows.md b/content/actions/how-tos/reuse-automations/reuse-workflows.md index c2eeb112455b..8f93cbb255f6 100644 --- a/content/actions/how-tos/reuse-automations/reuse-workflows.md +++ b/content/actions/how-tos/reuse-automations/reuse-workflows.md @@ -59,7 +59,7 @@ You can define inputs and secrets, which can be passed from the caller workflow reusable_workflow_job: runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: repo-token: ${{ secrets.personal_access_token }} configuration-path: ${{ inputs.config-path }} @@ -99,7 +99,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: repo-token: ${{ secrets.token }} configuration-path: ${{ inputs.config-path }} diff --git a/content/billing/concepts/product-billing/github-advanced-security.md b/content/billing/concepts/product-billing/github-advanced-security.md index 37dcb0ff6890..6554a92dfebb 100644 --- a/content/billing/concepts/product-billing/github-advanced-security.md +++ b/content/billing/concepts/product-billing/github-advanced-security.md @@ -25,7 +25,7 @@ contentType: concepts {% ifversion fpt or ghec %} {% data variables.product.github %} makes a subset of {% data variables.product.prodname_AS %} features available, free of charge, to all public repositories on {% data variables.product.prodname_dotcom_the_website %}. In addition, you can get insight into your exposure to leaked secrets with a free {% data variables.product.prodname_secret_risk_assessment %}. See [AUTOTITLE](/code-security/securing-your-organization/understanding-your-organizations-exposure-to-leaked-secrets/viewing-the-secret-risk-assessment-report-for-your-organization). -You need pay to use {% data variables.product.prodname_AS %} features in private repositories. If you change the visibility of a public repository to private and don't pay for {% data variables.product.prodname_AS %}, {% data variables.product.prodname_AS %} features will be disabled for that repository. +You need to pay to use {% data variables.product.prodname_AS %} features in private repositories. If you change the visibility of a public repository to private and don't pay for {% data variables.product.prodname_AS %}, {% data variables.product.prodname_AS %} features will be disabled for that repository. {% endif %} diff --git a/content/billing/how-tos/products/view-product-use.md b/content/billing/how-tos/products/view-product-use.md index 0735ec1bd024..284536686d8e 100644 --- a/content/billing/how-tos/products/view-product-use.md +++ b/content/billing/how-tos/products/view-product-use.md @@ -46,7 +46,7 @@ If you are an owner or billing manager of an organization or enterprise, you wil ### Personal accounts {% data reusables.user-settings.access_billing_settings_url %} -1. Scroll to the bottom of the page and use the tabbed view to see a summary of consumed use for each product that you use (in this example, the "{% data variables.product.prodname_AS %}" tab is shown). +1. Use the tabbed view to see a summary of consumed use for each product that you use (in this example, the "{% data variables.product.prodname_AS %}" tab is shown). ![Screenshot of the tabbed view showing "{% data variables.product.prodname_AS %}" with the "View details" links outlined in dark orange.](/assets/images/help/billing/overview-product-summary.png) diff --git a/content/billing/tutorials/estimate-spending.md b/content/billing/tutorials/estimate-spending.md index 2410a8a288b8..39892e8c77b2 100644 --- a/content/billing/tutorials/estimate-spending.md +++ b/content/billing/tutorials/estimate-spending.md @@ -30,14 +30,10 @@ The new billing platform provides a high-level view of your spending trends base On this page, you can view your usage in the following categories: * **Current metered usage:** The card on the top left shows the gross metered usage for your personal account. -* **Metered usage:** The graph shows the gross metered usage for your personal account. - To view a different time period, select **Time Frame**, then choose a time period. You can also download an image or CSV of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right. - -* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage versus billable usage (minus any discounts that may apply). * **By products:** You can use the product tabs to view usage and discounts for different products. - ![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png) +* **By repository:** The card at the bottom of the page shows the top five repositories that generate the most usage for your personal account. This helps you identify which repositories are consuming the most resources across {% data variables.product.prodname_copilot_short %}, {% data variables.product.prodname_actions %}, {% data variables.product.prodname_codespaces %}, and other billable features. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a breakdown by gross usage versus billable usage (minus any discounts that may apply). Additionally, you can change your plan by clicking **Upgrade to Pro** or **Downgrade to Free** in the "Current plan" section. @@ -65,41 +61,31 @@ The "Overview" page provides a high-level view of your spending and budgets. On this page, you can view your usage in the following categories: * **Current metered usage:** The card on the top left shows the gross metered usage for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %} including all cost centers. Click **More details** to view a breakdown of the usage by cost center{% endif %}. -* **Metered usage:** The graph shows the gross metered usage for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %} including cost centers{% endif %}. - To view a different time period, select **Time Frame**, then choose a time period. You can also download an image or CSV of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right. +* **By products:** You can use the product tabs to view usage and discounts for different products. + + {% data reusables.billing.actions-usage-delay %} {% ifversion fpt %} -* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage verse billable usage (minus any discounts that may apply). +* **By repository:** The card at the bottom of the page shows the top five repositories that generate the most usage. You can click **View details** in the upper-right corner of the card to view all usage, including a breakdown by gross usage versus billable usage (minus any discounts that may apply). {% elsif ghec %} -* **By organization** and **by repository:** The two cards under the graph show the top five organizations and repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage verse billable usage (minus any discounts that may apply). +* **By organization** and **by repository:** The two cards at the bottom of the page show the top five organizations and repositories that generate the most usage. You can click **View details** in the upper-right corner of each card to view all usage, including a breakdown by gross usage versus billable usage (minus any discounts that may apply). {% endif %} -* **By products:** You can use the product tabs to view usage and discounts for different products. - - ![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png) - - {% data reusables.billing.actions-usage-delay %} {% ifversion ghec %} ## Viewing prepaid credits -Your prepaid credits are shown above the "Metered usage" graph. To add more prepaid credits, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %}. +Your prepaid credits are shown at the top of the page in the **Current included usage** card. To add more prepaid credits, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %}. If you don't currently use prepaid credits, but have a volume subscription and would like to use credits, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %}. Prepaid credits are only available to customers who are invoiced (with or without metered add-ons). Prepaid credits can't be used if your account _only_ includes metered add-ons. ## Viewing promotion and discounts -In the "Current promotions and discounts" section in the top right, you can see the total amount of promotions and discounts applied to your account. Click **More details** to view a breakdown of the promotions and discounts. +You can see the total amount of promotions and discounts applied to your account on the Overview page. In the top right-hand corner of the **Current included usage** card, click **More details** to view a breakdown of your promotions and discounts. {% endif %} -## Tracking budgets - -At the bottom of the page, under "Budgets", you can see your current budgets, and how much you have spent against those budgets. If your role provides access, you can edit or delete a budget by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} to the right of a budget. See [AUTOTITLE](/billing/managing-your-billing/roles-for-the-new-billing-platform). - -If you have used all of your budget, a red banner appears at the top of the page. You can click **Update your budget** to increase your budget. - ## Creating a budget As an enterprise owner or billing manager, you can set the budget for your enterprise, an organization within your enterprise, or a cost center. As an organization owner, you are able to set the budgets for the repositories you manage. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending#creating-a-budget). diff --git a/content/copilot/reference/metrics-data.md b/content/copilot/reference/metrics-data.md index 7a4e3ba053fd..c4b6becfc98a 100644 --- a/content/copilot/reference/metrics-data.md +++ b/content/copilot/reference/metrics-data.md @@ -28,12 +28,12 @@ This property is consistent across the following surfaces: The following interactions count as activity: * Receiving a code suggestion in an IDE -* Chatting with Copilot Chat in an IDE +* Chatting with {% data variables.copilot.copilot_chat_short %} in an IDE * Creating or updating a knowledge base -* Creating a pull request summary -* Interacting with Copilot Chat in GitHub +* Generating a pull request summary +* Interacting with {% data variables.copilot.copilot_chat_short %} in GitHub * Interacting with Copilot on a mobile device -* Interacting with Copilot Chat for CLI +* Interacting with {% data variables.copilot.copilot_chat_short %} for CLI The tracked events come from both client- and server-side telemetry, ensuring the timestamp is durable if network conditions affect client-side telemetry. @@ -62,24 +62,36 @@ Data in the report refreshes automatically every 30 minutes. | `last_activity_at` | UTC timestamp of the user's most recent Copilot interaction | | `last_surface_used` | The Copilot feature used most recently:
| +### Retention period + +Activity and authentication data are retained for a rolling 90-day period, consistent with the `last_activity_at` field. + ### Included features The activity report provides visibility into usage of all generally available (GA) GitHub Copilot features in the IDE, on GitHub, in GitHub CLI, and on GitHub Mobile. #### IDE features -* Code completions and Next edit suggestions -* Copilot Chat -* Copilot agents +* Code completions +* {% data variables.copilot.next_edit_suggestions_caps %} +* {% data variables.copilot.copilot_chat_short %} +* Agent mode +* {% data variables.copilot.copilot_edits_short %} in VS Code #### GitHub features -* Copilot Chat +* {% data variables.copilot.copilot_chat_short %} +* {% data variables.copilot.copilot_coding_agent %} * Copilot for Docs * Knowledge base management -* Copilot pull requests -* Copilot code reviews +* {% data variables.copilot.copilot_for_prs %} +* {% data variables.copilot.copilot_code-review_short %} -### Retention period +### Limitations -Activity and authentication data are retained for a rolling 90-day period, consistent with the `last_activity_at` field. +There is a possibility that {% data variables.product.github %} lacks consistent telemetry from some third party IDEs outside of VS Code (such as JetBrains and Xcode). Users should ensure they're running the latest version of their IDE. + +The activity report may exclude usage of {% data variables.product.prodname_copilot %} features that are not yet generally available (GA). Currently, the following features are not fully recorded: + +* {% data variables.copilot.copilot_spaces %} +* Copilot Spark diff --git a/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md b/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md index 0338113dbcb5..6d786602b2bc 100644 --- a/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md +++ b/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md @@ -67,7 +67,7 @@ jobs: # Replace `APP_PEM` with the name of the secret that contains your app private key. - name: Generate token id: generate-token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 with: app-id: {% raw %}${{ vars.APP_ID }}{% endraw %} private-key: {% raw %}${{ secrets.APP_PEM }}{% endraw %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md index 034e79eb0c40..3669df26d5ad 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md @@ -136,6 +136,10 @@ If the source of your migration is {% data variables.product.prodname_ghe_server {% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %} +### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %} + +{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %} + ### IP ranges for {% data variables.enterprise.data_residency_site %} {% data reusables.enterprise-migration-tool.ip-ranges-ghecom %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md index 183d2bf2975d..1c5899a0ab5e 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md @@ -90,6 +90,10 @@ To grant the migrator role using the CLI, you must have installed the {% data va {% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %} +### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %} + +{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %} + ### IP ranges for {% data variables.enterprise.data_residency_site %} {% data reusables.enterprise-migration-tool.ip-ranges-ghecom %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md index 419bf49da644..271bfc2d7e06 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md @@ -116,6 +116,10 @@ For more information, see [AUTOTITLE](/enterprise-cloud@latest/organizations/kee {% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %} +### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %} + +{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %} + ### IP ranges for {% data variables.enterprise.data_residency_site %} {% data reusables.enterprise-migration-tool.ip-ranges-ghecom %} diff --git a/content/rest/quickstart.md b/content/rest/quickstart.md index b890d870c5bd..94279f38e391 100644 --- a/content/rest/quickstart.md +++ b/content/rest/quickstart.md @@ -76,7 +76,7 @@ If you are authenticating with a {% data variables.product.prodname_github_app % steps: - name: Generate token id: generate-token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 with: app-id: {% raw %}${{ vars.APP_ID }}{% endraw %} private-key: {% raw %}${{ secrets.APP_PEM }}{% endraw %} @@ -227,7 +227,7 @@ If you are authenticating with a {% data variables.product.prodname_github_app % - name: Generate token id: generate-token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 with: app-id: {% raw %}${{ vars.APP_ID }}{% endraw %} private-key: {% raw %}${{ secrets.APP_PEM }}{% endraw %} @@ -321,7 +321,7 @@ If you are authenticating with a {% data variables.product.prodname_github_app % steps: - name: Generate token id: generate-token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 with: app-id: {% raw %}${{ vars.APP_ID }}{% endraw %} private-key: {% raw %}${{ secrets.APP_PEM }}{% endraw %} diff --git a/data/reusables/dependency-submission/premade-action-table.md b/data/reusables/dependency-submission/premade-action-table.md index 5340993dfe48..f9d9188695b2 100644 --- a/data/reusables/dependency-submission/premade-action-table.md +++ b/data/reusables/dependency-submission/premade-action-table.md @@ -40,7 +40,7 @@ jobs: go-version: ">=1.18.0" - name: Run snapshot action - uses: actions/go-dependency-submission@v1 + uses: actions/go-dependency-submission@v2 with: # Required: Define the repo path to the go.mod file used by the # build target diff --git a/data/reusables/enterprise-migration-tool/identify-gei-vnet-firewall-rules.md b/data/reusables/enterprise-migration-tool/identify-gei-vnet-firewall-rules.md new file mode 100644 index 000000000000..a8ed05fc7c4a --- /dev/null +++ b/data/reusables/enterprise-migration-tool/identify-gei-vnet-firewall-rules.md @@ -0,0 +1,6 @@ +Customers with Azure Blob Storage configured for storing repository data for migrations must add virtual network firewall rules to their storage accounts to allow GEI to access the repository data. This requires the use of the Azure CLI or PowerShell, as adding these virtual network firewall rules on the Azure Portal is currently unsupported. The following virtual network subnet IDs must be added to the virtual network firewall rules for your storage account: + +* `/subscriptions/495e10ff-6097-4190-a1de-b031fcb96f66/resourceGroups/ghr-network-service-4c5846fa-dc07-4153-8d08-a16a9b437a5a-3-eastus2/providers/Microsoft.Network/virtualNetworks/4c5846fa-dc07-4153-8d08-a16a9b437a5a-3/subnets/4c5846fa-dc07-4153-8d08-a16a9b437a5a-3` +* `/subscriptions/d3bde7c9-46be-429b-81a8-258387be6dde/resourceGroups/ghr-network-service-4c5846fa-dc07-4153-8d08-a16a9b437a5a-3-westus3/providers/Microsoft.Network/virtualNetworks/4c5846fa-dc07-4153-8d08-a16a9b437a5a-3/subnets/4c5846fa-dc07-4153-8d08-a16a9b437a5a-3` + +To add the virtual network firewall rules to your Azure Storage account, you can follow step 5 in the documentation for [creating a virtual network rule for Azure Storage](https://learn.microsoft.com/azure/storage/common/storage-network-security-virtual-networks?tabs=azure-cli) using the network subnet IDs provided above. Be sure to provide the `--subscription` argument with the subscription ID tied to the storage account.