Skip to content

Commit c9b88b9

Browse files
authored
Merge pull request #39591 from github/repo-sync
Repo sync
2 parents a1d8c43 + 2cebe1a commit c9b88b9

File tree

7 files changed

+51
-35
lines changed

7 files changed

+51
-35
lines changed

content/billing/how-tos/products/view-product-use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you are an owner or billing manager of an organization or enterprise, you wil
4646
### Personal accounts
4747

4848
{% data reusables.user-settings.access_billing_settings_url %}
49-
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).
49+
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).
5050

5151
![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)
5252

content/billing/tutorials/estimate-spending.md

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,10 @@ The new billing platform provides a high-level view of your spending trends base
3030
On this page, you can view your usage in the following categories:
3131

3232
* **Current metered usage:** The card on the top left shows the gross metered usage for your personal account.
33-
* **Metered usage:** The graph shows the gross metered usage for your personal account.
3433

35-
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.
36-
37-
* **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).
3834
* **By products:** You can use the product tabs to view usage and discounts for different products.
3935

40-
![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png)
36+
* **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).
4137

4238
Additionally, you can change your plan by clicking **Upgrade to Pro** or **Downgrade to Free** in the "Current plan" section.
4339

@@ -65,41 +61,31 @@ The "Overview" page provides a high-level view of your spending and budgets.
6561
On this page, you can view your usage in the following categories:
6662

6763
* **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 %}.
68-
* **Metered usage:** The graph shows the gross metered usage for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %} including cost centers{% endif %}.
6964

70-
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.
65+
* **By products:** You can use the product tabs to view usage and discounts for different products.
66+
67+
{% data reusables.billing.actions-usage-delay %}
7168

7269
{% ifversion fpt %}
73-
* **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).
70+
* **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).
7471
{% elsif ghec %}
75-
* **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).
72+
* **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).
7673
{% endif %}
77-
* **By products:** You can use the product tabs to view usage and discounts for different products.
78-
79-
![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png)
80-
81-
{% data reusables.billing.actions-usage-delay %}
8274

8375
{% ifversion ghec %}
8476

8577
## Viewing prepaid credits
8678

87-
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 %}.
79+
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 %}.
8880

8981
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.
9082

9183
## Viewing promotion and discounts
9284

93-
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.
85+
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.
9486

9587
{% endif %}
9688

97-
## Tracking budgets
98-
99-
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).
100-
101-
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.
102-
10389
## Creating a budget
10490

10591
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).

content/copilot/reference/metrics-data.md

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ This property is consistent across the following surfaces:
2828
The following interactions count as activity:
2929

3030
* Receiving a code suggestion in an IDE
31-
* Chatting with Copilot Chat in an IDE
31+
* Chatting with {% data variables.copilot.copilot_chat_short %} in an IDE
3232
* Creating or updating a knowledge base
33-
* Creating a pull request summary
34-
* Interacting with Copilot Chat in GitHub
33+
* Generating a pull request summary
34+
* Interacting with {% data variables.copilot.copilot_chat_short %} in GitHub
3535
* Interacting with Copilot on a mobile device
36-
* Interacting with Copilot Chat for CLI
36+
* Interacting with {% data variables.copilot.copilot_chat_short %} for CLI
3737

3838
The tracked events come from both client- and server-side telemetry, ensuring the timestamp is durable if network conditions affect client-side telemetry.
3939

@@ -62,24 +62,36 @@ Data in the report refreshes automatically every 30 minutes.
6262
| `last_activity_at` | UTC timestamp of the user's most recent Copilot interaction |
6363
| `last_surface_used` | The Copilot feature used most recently:<br><ul><li>**IDE**: Editor name and version (e.g. "VS Code 1.89.1")</li><li>**GitHub.com**: Feature name (e.g., "Copilot Chat")</li><li>**Unspecified**: When IDE details are unavailable or no recent activity exists</ul> |
6464

65+
### Retention period
66+
67+
Activity and authentication data are retained for a rolling 90-day period, consistent with the `last_activity_at` field.
68+
6569
### Included features
6670

6771
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.
6872

6973
#### IDE features
7074

71-
* Code completions and Next edit suggestions
72-
* Copilot Chat
73-
* Copilot agents
75+
* Code completions
76+
* {% data variables.copilot.next_edit_suggestions_caps %}
77+
* {% data variables.copilot.copilot_chat_short %}
78+
* Agent mode
79+
* {% data variables.copilot.copilot_edits_short %} in VS Code
7480

7581
#### GitHub features
7682

77-
* Copilot Chat
83+
* {% data variables.copilot.copilot_chat_short %}
84+
* {% data variables.copilot.copilot_coding_agent %}
7885
* Copilot for Docs
7986
* Knowledge base management
80-
* Copilot pull requests
81-
* Copilot code reviews
87+
* {% data variables.copilot.copilot_for_prs %}
88+
* {% data variables.copilot.copilot_code-review_short %}
8289

83-
### Retention period
90+
### Limitations
8491

85-
Activity and authentication data are retained for a rolling 90-day period, consistent with the `last_activity_at` field.
92+
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.
93+
94+
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:
95+
96+
* {% data variables.copilot.copilot_spaces %}
97+
* Copilot Spark

content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ If the source of your migration is {% data variables.product.prodname_ghe_server
136136

137137
{% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %}
138138

139+
### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %}
140+
141+
{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %}
142+
139143
### IP ranges for {% data variables.enterprise.data_residency_site %}
140144

141145
{% data reusables.enterprise-migration-tool.ip-ranges-ghecom %}

content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ To grant the migrator role using the CLI, you must have installed the {% data va
9090

9191
{% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %}
9292

93+
### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %}
94+
95+
{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %}
96+
9397
### IP ranges for {% data variables.enterprise.data_residency_site %}
9498

9599
{% data reusables.enterprise-migration-tool.ip-ranges-ghecom %}

content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ For more information, see [AUTOTITLE](/enterprise-cloud@latest/organizations/kee
116116

117117
{% data reusables.enterprise-migration-tool.identifying-githubs-ip-ranges %}
118118

119+
### Virtual network firewall rules for Azure Blob Storage for {% data variables.product.prodname_dotcom_the_website %}
120+
121+
{% data reusables.enterprise-migration-tool.identify-gei-vnet-firewall-rules %}
122+
119123
### IP ranges for {% data variables.enterprise.data_residency_site %}
120124

121125
{% data reusables.enterprise-migration-tool.ip-ranges-ghecom %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
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:
2+
3+
* `/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`
4+
* `/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`
5+
6+
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.

0 commit comments

Comments
 (0)