Skip to content

Commit 56c835b

Browse files
felicitymayCopilotisaacmbrown
authored
[EDI] Audit and implement: /billing/how-tos/products/ generalize downloading and viewing articles (#57129)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
1 parent dc06771 commit 56c835b

File tree

13 files changed

+193
-137
lines changed

13 files changed

+193
-137
lines changed
Lines changed: 28 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,62 @@
11
---
2-
title: 'Downloading licensed use of Advanced Security'
3-
intro: 'You can download consumption of {% data variables.product.prodname_GHAS %} licenses by your {% data variables.enterprise.enterprise_or_org %}: volume/subscription licenses or metered usage.'
4-
permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners with {% data variables.product.prodname_AS %}'
5-
product: '{% data reusables.gated-features.ghas-billing %}'
2+
title: 'Downloading license use for your enterprise or organization'
3+
intro: 'Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}, and {% data variables.product.prodname_AS %} licenses.'
4+
permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}'
65
versions:
76
fpt: '*'
8-
ghes: '*'
97
ghec: '*'
8+
ghes: '*'
109
topics:
1110
- Billing
1211
- Advanced Security
1312
- Enterprise
14-
shortTitle: Download GHAS license use
13+
shortTitle: Download license use
14+
allowTitleToDifferFromFilename: true
1515
redirect_from:
1616
- /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage
1717
contentType: how-tos
1818
---
1919

20-
## Downloading {% data variables.product.prodname_AS %} license usage information
21-
22-
You can download a CSV file with details of paid use of {% data variables.product.prodname_GHAS %} products at both the {% data variables.enterprise.enterprise_and_org %} level. The CSV file contains information about each {% data variables.product.prodname_AS %} license that is in use, including:
23-
24-
* The username of the person using the {% data variables.product.prodname_GHAS_cs_or_sp %} license
25-
* The {% data variables.product.prodname_GH_cs_and_sp %}-enabled repositories where commits were made
26-
* The organizations{% ifversion secret-scanning-user-owned-repos %}{% ifversion ghec %} and user namespaces for {% data variables.product.prodname_emus %}{% endif %}{% endif %} that people using licenses belong to
27-
* The most recent commit dates and associated email addresses
28-
29-
You can use this information for insights into your paid use of {% data variables.product.prodname_AS %}, such as which members of your enterprise are using a license or how licenses are being consumed across your organizations.
20+
You can download CSV files with details of paid license use through the {% data variables.product.github %} user interface or the REST API.
3021

31-
You can download a CSV report of license usage through the {% data variables.product.github %} user interface or the REST API.
22+
For more detailed reports on usage of all paid products, see [AUTOTITLE](/billing/how-tos/products/view-product-use).
3223

33-
## Using the UI to download license and metered usage
24+
## On {% data variables.product.prodname_ghe_cloud %}
3425

35-
You can download a CSV report for a repository, an organization, or an enterprise.
26+
1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture.
3627

37-
{% ifversion fpt or ghec %}
28+
1. Select the account you want to view and then access the "Billing & Licensing" pages:
3829

39-
### For a repository
30+
* **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**.
4031

41-
{% data reusables.profile.access_org %}
42-
{% data reusables.profile.org_settings %}
43-
1. In the "Security" section of the sidebar, select the {% data variables.product.UI_advanced_security %} dropdown menu, then click **{% data variables.product.prodname_global_settings_caps %}**.
44-
1. In the "{% data variables.product.prodname_GH_cs_or_sp %} repositories" section, next to the repository you want usage information for, select {% octicon "kebab-horizontal" aria-label="GHAS repository actions" %}, then click **Download CSV report**.
32+
* **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page.
4533

46-
![Screenshot of the table for {% data variables.product.prodname_GH_secret_protection %} usage. The horizontal kebab icon and "Download CSV report" button are outlined in orange.](/assets/images/help/billing/ghas-billing-table-repository-csv.png)
34+
1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page.
4735

48-
### For an organization
36+
1. In the license area of interest, click **Download CSV report**. If offered a choice, choose your preferred report.
4937

50-
{% data reusables.profile.access_org %}
51-
{% data reusables.profile.org_settings %}
52-
1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** to display an overview.
53-
1. For metered usage, in the sidebar click **Usage**.
54-
1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**.
55-
1. To further filter the usage graph, use the dropdown menus:
56-
* To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}.
57-
* To filter by time, select **Time Frame**, then click a time period.
58-
* Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged).
59-
1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**.
60-
1. For license consumption, in the sidebar click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**.
61-
1. Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**.
38+
The report will be emailed to the default email address associated with your {% data variables.product.github %} account. For information about the fields, see [AUTOTITLE](/billing/reference/license-reports).
6239

63-
### For an enterprise
64-
65-
{% data reusables.enterprise-accounts.access-enterprise %}
66-
1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** to display an overview.
67-
1. For metered usage, click {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Usage**.
68-
1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**.
69-
1. To further filter the usage graph, use the dropdown menus:
70-
* To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}.
71-
* To filter by time, select **Time Frame**, then click a time period.
72-
* Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged).
73-
1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**.
74-
1. For license consumption, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**.
75-
* Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**.
76-
77-
{% elsif ghes %}
40+
## On {% data variables.product.prodname_ghe_server %}
7841

7942
{% data reusables.enterprise-accounts.access-enterprise %}
8043
{% data reusables.enterprise-accounts.license-tab-ghes %}
81-
1. Under "{% data variables.product.prodname_GHAS %}," click **{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**.
8244

83-
![Screenshot of the licensing screen. The "CSV Report" button is highlighted with an orange outline.](/assets/images/enterprise/ghas/download-csv-report-ghes-3.9.png)
45+
The page shows a summary of the licenses your enterprise is using for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}. Use links on the page to view more detailed information.
8446

85-
{% endif %}
47+
To download a license usage report for {% data variables.product.prodname_GHAS %}:
8648

87-
## Using the REST API to download license and metered usage
49+
* **Enterprise**: In "{% data variables.product.prodname_GHAS %}", click {% octicon "download" aria-hidden="true" aria-label="download" %} **CSV report**.
50+
* **Organization**: In the "ORGANIZATION" table, click {% octicon "download" aria-label="Download CSV report" %} associated with the organization that you want to download a CSV report for.
51+
* **User namespace**: In the "USER NAMESPACED" table, click {% octicon "download" aria-label="Download CSV report" %} associated with the user that you want to download a CSV report for.
52+
* **Repository**: In the "ORGANIZATION" table, click the name of an organization to show a settings page for the organization. In the {% data variables.product.prodname_GHAS %} repositories table, click {% octicon "kebab-horizontal" aria-label="GHAS repository actions" %} and select **Download CSV report**.
8853

89-
You can retrieve information on paid use of {% data variables.product.prodname_AS %} with the billing API.
54+
For details of the fields included in the report, see [AUTOTITLE](/billing/reference/license-reports).
9055

91-
{% ifversion fpt or ghec %}
56+
## Using the REST API
9257

93-
For organization-level data, use the `/organizations/{org}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/rest/billing/enhanced-billing?apiVersion=2022-11-28).
58+
You can retrieve information on paid use of {% data variables.product.prodname_AS %} with the billing API.
9459

95-
{% endif %}
60+
* Organization-level data (cloud only), use the `/organizations/{org}/settings/billing/usage` endpoint.{% ifversion fpt or ghec %} For more information, see [AUTOTITLE](/rest/billing/enhanced-billing?apiVersion=2022-11-28).{% endif %}
9661

97-
For enterprise-level data, use the `/enterprises/{enterprise}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation.
62+
* Enterprise-level data, use the `/enterprises/{enterprise}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation.

content/billing/how-tos/products/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ children:
3232
- view-ghas-committers
3333
contentType: how-tos
3434
---
35-

content/billing/how-tos/products/manage-ghas-license.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: 'Managing volume licenses for GitHub Advanced Security'
33
intro: 'You can monitor and control the availability and consumption of licenses for {% data variables.product.prodname_AS %} in repositories in your enterprise.'
4-
permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}. </br>For metered usage on the new platform, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).'
4+
permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}. </br>For metered usage, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).'
55
versions:
6+
fpt: '*'
67
ghec: '*'
78
redirect_from:
89
- /billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing
@@ -11,7 +12,8 @@ topics:
1112
- Billing
1213
- Advanced Security
1314
- Enterprise
14-
shortTitle: Manage GHAS license
15+
shortTitle: Manage GHAS licenses
16+
allowTitleToDifferFromFilename: true
1517
contentType: how-tos
1618
---
1719

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

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Viewing your usage of metered products
3-
intro: You can explore your use of different products that are billed by usage and see how each product contributes to your bill.
2+
title: Viewing your usage of metered products and licenses
3+
intro: Explore your use of features billed by usage on {% data variables.product.github %} cloud and see how they contribute to your bill.
44
redirect_from:
55
- /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage
66
- /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account
@@ -31,17 +31,25 @@ redirect_from:
3131
versions:
3232
fpt: '*'
3333
ghec: '*'
34+
ghes: '*'
3435
topics:
3536
- Billing
36-
shortTitle: View product use
37+
shortTitle: View product/license use
38+
allowTitleToDifferFromFilename: true
39+
permissions: '{% data reusables.permissions.enhanced-billing-cloud-all %}'
40+
product: 'Cloud only'
3741
contentType: how-tos
3842
---
3943

40-
## Viewing a summary of usage for billed products
44+
> [!TIP]
45+
> **{% data variables.product.prodname_ghe_server %}** administrators should instead see [AUTOTITLE](/billing/how-tos/products/download-ghas-license-use).
46+
47+
## Viewing a summary of usage
4148

42-
Anyone can view usage for their own personal account.
49+
The options available to you vary according to your role and {% data variables.product.github %} plan.
4350

44-
If you are an owner or billing manager of an organization or enterprise, you will also have access to usage data for that organization or account.
51+
* Anyone can view usage data for their own personal account unless their account is managed by their enterprise (EMU).
52+
* If you are an **owner** or **billing manager** of an enterprise, or an organization on {% data variables.product.prodname_team %}, you will also have access to usage data for that organization or enterprise account.
4553

4654
### Personal accounts
4755

@@ -74,17 +82,30 @@ The metered usage chart and usage break down table both show your current choice
7482

7583
![Screenshot of the metered usage chart showing "Actions grouped by SKU" with the three control fields outlined in dark orange.](/assets/images/help/billing/product-usage-chart.png)
7684

85+
{% ifversion fpt or ghec %}
7786
> [!TIP]
7887
> For GitHub Actions, you can also view the billable job execution minutes for an individual workflow run. For more information, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/viewing-job-execution-time).
88+
{% endif %}
89+
90+
## Downloading usage reports
91+
92+
You can download two different types of usage report from the "Usage" page.
93+
94+
### General usage reports
95+
96+
1. At the top of the "Usage" page, click **Get usage report**.
97+
1. Choose the report that you want to download.
98+
99+
For details of the fields included in the report, see [AUTOTITLE](/billing/reference/usage-reports).
79100

80-
## Downloading the data displayed
101+
### Downloading the data plotted in the usage chart
81102

82-
You can download the data plotted on the billing charts shown on the "Overview" or "Usage" page as a table or an image. Click the {% octicon "kebab-horizontal" aria-label="Chart options" aria-hidden="true" %} "Chart options" button and select your preferred format.
103+
When the chart on the "Usage" page shows the data you want to download, click the {% octicon "kebab-horizontal" aria-label="Chart options" aria-hidden="true" %} "Chart options" button and select your preferred format.
83104

84-
![Screenshot of the metered usage chart on the "Overview" page with the "Chart options" outlined in dark orange.](/assets/images/help/billing/overview-chart-download-button.png)
105+
![Screenshot of the metered usage chart on the "Usage" page with the "Chart options" outlined in dark orange.](/assets/images/help/billing/overview-chart-download-button.png)
85106

86-
## Further reading
107+
## Next steps
87108

88-
* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github)
109+
* [AUTOTITLE](/billing/reference/usage-reports){% ifversion fpt or ghec %}
89110
* [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending)
90-
* [AUTOTITLE](/billing/managing-your-billing/automating-usage-reporting)
111+
* [AUTOTITLE](/billing/managing-your-billing/automating-usage-reporting){% endif %}

0 commit comments

Comments
 (0)