diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md index 8ecf1ca60b..1c47c1207c 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md @@ -17,8 +17,6 @@ topics: shortTitle: View your Actions usage --- -{% data reusables.billing.enhanced-billing-platform %} - 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). ## Viewing {% data variables.product.prodname_actions %} usage for your personal account @@ -27,50 +25,26 @@ Anyone can view {% data variables.product.prodname_actions %} usage for their ow {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.actions-minutes %} -{% data reusables.dotcom_billing.actions-packages-storage %} -{% data reusables.dotcom_billing.actions-packages-report-download %} +{% data reusables.dotcom_billing.actions-view-usage %} +{% data reusables.dotcom_billing.actions-report-download %} ## Viewing {% data variables.product.prodname_actions %} usage for your organization -{% ifversion billing-beta-enterprise %} - -> [!NOTE] -> If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages. - -{% endif %} - Organization owners and billing managers can view {% data variables.product.prodname_actions %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_actions %} usage in the organization billing page. {% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.actions-minutes %} -{% data reusables.dotcom_billing.actions-packages-storage %} -{% data reusables.dotcom_billing.actions-packages-report-download-org-account %} +{% data reusables.dotcom_billing.actions-view-usage %} +{% data reusables.dotcom_billing.actions-report-download-org-account %} {% ifversion ghec %} ## Viewing {% data variables.product.prodname_actions %} usage for your enterprise account -{% ifversion billing-beta-enterprise %} - -> [!NOTE] -> If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages. - -{% endif %} - Enterprise owners and billing managers can view {% data variables.product.prodname_actions %} usage for an enterprise account. -> [!NOTE] -> Billing details for enterprise accounts don't summarize the usage minutes for each operating system. {% data reusables.actions.enterprise-billing-details %} - {% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under "Actions monthly usage," view your usage minutes. +{% data reusables.dotcom_billing.actions-view-usage %} +{% data reusables.enterprise-accounts.actions-report-download-enterprise-accounts %} - You can expand this section to show a breakdown of the usage by runner type. - -1. Under your usage minutes, view details of usage of data transfer by each organization in your enterprise account. -{% data reusables.dotcom_billing.actions-packages-storage-enterprise-account %} -{% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %} {% endif %} diff --git a/data/reusables/dotcom_billing/actions-minutes.md b/data/reusables/dotcom_billing/actions-minutes.md deleted file mode 100644 index bafee292f7..0000000000 --- a/data/reusables/dotcom_billing/actions-minutes.md +++ /dev/null @@ -1,3 +0,0 @@ -1. Under "Usage this month", in the "Actions" section, view details of your minutes used. - - You can expand this section to show a breakdown of your usage by runner type. diff --git a/data/reusables/dotcom_billing/actions-report-download-org-account.md b/data/reusables/dotcom_billing/actions-report-download-org-account.md new file mode 100644 index 0000000000..ff048feda8 --- /dev/null +++ b/data/reusables/dotcom_billing/actions-report-download-org-account.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Actions usage data. diff --git a/data/reusables/dotcom_billing/actions-report-download.md b/data/reusables/dotcom_billing/actions-report-download.md new file mode 100644 index 0000000000..ff048feda8 --- /dev/null +++ b/data/reusables/dotcom_billing/actions-report-download.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Actions usage data. diff --git a/data/reusables/dotcom_billing/actions-view-usage.md b/data/reusables/dotcom_billing/actions-view-usage.md new file mode 100644 index 0000000000..2c52f2e321 --- /dev/null +++ b/data/reusables/dotcom_billing/actions-view-usage.md @@ -0,0 +1,6 @@ +1. Under **Billing and licensing**, click **Usage**. +1. To display only Actions usage within the graph, click the search bar, then click **Product**. Within the list of products that generates, click **Actions**. +1. To further filter the usage graph, use the dropdown menus: + * To view usage by SKU, select the **Group** dropdown, then click **SKU**. + * To filter by time, select **Time Frame**, then click a time period. + * 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). diff --git a/data/reusables/enterprise-accounts/actions-report-download-enterprise-accounts.md b/data/reusables/enterprise-accounts/actions-report-download-enterprise-accounts.md new file mode 100644 index 0000000000..ff048feda8 --- /dev/null +++ b/data/reusables/enterprise-accounts/actions-report-download-enterprise-accounts.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Actions usage data. diff --git a/data/reusables/enterprise-accounts/billing-tab.md b/data/reusables/enterprise-accounts/billing-tab.md index 5ce8a6a0f6..fc7157eefb 100644 --- a/data/reusables/enterprise-accounts/billing-tab.md +++ b/data/reusables/enterprise-accounts/billing-tab.md @@ -1 +1 @@ -1. Under **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**, click **Billing**. +{% data reusables.billing.enterprise-billing-menu %} diff --git a/data/reusables/organizations/billing-settings.md b/data/reusables/organizations/billing-settings.md index da0cab9885..c5dd313773 100644 --- a/data/reusables/organizations/billing-settings.md +++ b/data/reusables/organizations/billing-settings.md @@ -1,4 +1,4 @@ {% data reusables.user-settings.access_settings %} 1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-hidden="true" aria-label="organization" %} Organizations**. {% data reusables.profile.org_settings %} -1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**. +1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="credit-card" aria-hidden="true" %} Billing and licensing**. diff --git a/data/reusables/user-settings/billing_plans.md b/data/reusables/user-settings/billing_plans.md index 217c2255d8..bbd7d4ba77 100644 --- a/data/reusables/user-settings/billing_plans.md +++ b/data/reusables/user-settings/billing_plans.md @@ -1 +1 @@ -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**, then click **Plans and usage**. +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="credit-card" aria-hidden="true" %} Billing and licensing**, then click **Usage**.