Skip to content

Commit 919861d

Browse files
authored
Merge pull request github#39860 from github/repo-sync
Repo sync
2 parents 0fbccb0 + e649f04 commit 919861d

File tree

11 files changed

+109
-36
lines changed

11 files changed

+109
-36
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
title: Budgets and alerts
3+
intro: 'Budgets help you track and control spending on different products.'
4+
shortTitle: Budgets and alerts
5+
versions:
6+
feature: enhanced-billing-platform
7+
topics:
8+
- Billing
9+
- Enterprise
10+
- Team
11+
contentType: concepts
12+
---
13+
14+
Budgets and alerts allow you to track spending on metered products for your enterprise, organizations, cost centers (enterprise only), and repositories. Budgets and alerts are not available for pre-paid volume licenses.
15+
16+
By setting a monthly budget, you can monitor your spending and receive notifications by email when your spending exceeds certain preset percentages of your budget threshold. This can help you stay within your budget and avoid overspending.
17+
18+
Many accounts already have default budgets for certain products. {% data reusables.billing.migrated-budgets %}
19+
20+
## Stopping usage
21+
22+
For license-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_AS %}, {% data variables.product.prodname_team %}, and {% data variables.product.prodname_enterprise %}, setting a budget does not prevent usage over the budget amount but does provide alerts.
23+
24+
For metered products such as {% data variables.product.prodname_actions %} or {% data variables.product.prodname_copilot %} premium requests, you can choose for budgets to prevent usage once the budget amount is reached.
25+
26+
## Types and scopes
27+
28+
Each budget has a type and a scope that define which paid use contributes to spending against the budget.
29+
30+
* **Type**: Defines which metered product or SKU is measured.
31+
* **Scope**: Defines whether the budget applies to the whole account, or to a subset of repositories, organizations, or cost centers (enterprise only).
32+
33+
## Your first billing cycle after creating a budget
34+
35+
When you first create a budget, be aware that the budget applies only to metered usage from the date of its creation onwards. Any use made before you created the budget is not included in the calculations. This means that you may exceed your budget in the first billing cycle after you create your budget, even if you select the option stop usage when the limit is reached.
36+
37+
## Set up a budget
38+
39+
To get started with budgets, see [AUTOTITLE](/billing/tutorials/set-up-budgets).

content/billing/concepts/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ topics:
1010
- Billing
1111
children:
1212
- /billing-cycles
13+
- /budgets-and-alerts
1314
- /azure-subscriptions
1415
- /impact-of-plan-changes
1516
- /discounted-plans

content/billing/get-started/how-billing-works.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ topics:
3131
contentType: get-started
3232
---
3333

34-
<!--
34+
<!--
3535
Audience: All users
3636
JTBD: When I decide I want to pay for increased access, I need to understand what and how GitHub will charge me, so that I feel confident that I have been billed correctly and don't get any surprises. -->
3737

@@ -41,7 +41,7 @@ You can use {% data variables.product.github %} without incurring any costs. If
4141

4242
* **{% data variables.product.github %} plans**: A fixed monthly cost for a paid {% data variables.product.github %} account (for example: {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}) or {% data variables.product.prodname_copilot_short %} plan.
4343
* **Subscriptions**: Fixed monthly costs for any additional products you subscribe to (for example: {% data variables.product.prodname_GH_secret_protection %})
44-
* **Metered usage**: Variable costs that depend on how much you use certain features above the amounts included with your {% data variables.product.github %} plan (for example: {% data variables.product.prodname_actions %}). For more information see, [AUTOTITLE](/billing/reference/product-usage-included) and [AUTOTITLE](/billing/tutorials/set-up-budgets).
44+
* **Metered usage**: Variable costs that depend on how much you use certain features above the amounts included with your {% data variables.product.github %} plan (for example: {% data variables.product.prodname_actions %}). For more information see, [AUTOTITLE](/billing/reference/product-usage-included) and [AUTOTITLE](/billing/concepts/budgets-and-alerts).
4545

4646
> [!TIP]
4747
> {% data variables.product.github %} has discounted plans for verified students and academic faculties, and for non-profit organizations. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts).

content/billing/tutorials/set-up-budgets.md

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,7 @@ shortTitle: Set up budgets
3030
contentType: tutorials
3131
---
3232

33-
Budgets and alerts allow you to track spending on metered products for your accounts, organizations, cost centers (enterprise only), and repositories. By setting a monthly budget, you can monitor your spending and receive notifications by email when your spending exceeds certain preset percentages of your budget threshold. This can help you stay within your budget and avoid overspending.
34-
35-
If your account does not have a valid payment method on file, usage is blocked once you use up your quota.
36-
37-
If you have a valid payment method on file, spending may be limited by one or more budgets. Check the budgets set for your account to ensure they are appropriate for your usage needs.
38-
39-
{% data reusables.billing.migrated-budgets %}
40-
41-
## About budgets
42-
43-
Each budget has a type and a scope that define which paid use contributes to spending against the budget.
44-
45-
* **Type**: Defines which metered product or SKU is measured.
46-
* **Scope**: Defines whether the budget applies to the whole account, or to a subset of repositories, organizations, or cost centers (enterprise only).
47-
48-
### Your first billing cycle after creating a budget
49-
50-
When you first create a budget, be aware that the budget applies only to metered usage from the date of its creation onwards. Any use made before you created the budget, is not included in the calculations. This means that you may exceed your budget in the first billing cycle after you create your budget, even if you select the option stop usage when the limit is reached.
51-
52-
### Budget limitations
53-
54-
For license-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_AS %}, {% data variables.product.prodname_team %}, and {% data variables.product.prodname_enterprise %}, setting a budget does not prevent usage over the limit but does provide alerts.
55-
Budgets and alerts are not available for pre-paid volume licenses.
33+
Budgets help you track and control spending on different products. To learn more, see [AUTOTITLE](/billing/concepts/budgets-and-alerts).
5634

5735
## Deciding on the type and scope for a budget
5836

@@ -62,7 +40,7 @@ When deciding on the type and scope for a budget, remember that the use of meter
6240

6341
In this example, the organization has set a budget of $50 for the "Actions" product and a budget of $100 for one of the SKUs within the "Actions" product. The organization has used all the included quota of actions minutes and an extra $50 of billed minutes. Some of the extra use was for Linux 96-core runners so it is applied to both budgets. Overall, the organization has used the full budget for the "Actions" product of $50. Members are now blocked from using all {% data variables.product.github %}-hosted runners until the next billing cycle or until the "Actions" product budget is increased. The SKU budget for Linux 96-core runners serves no purpose and is confusing, so should be deleted.
6442

65-
We recommend that you avoid creating overlapping budgets for the use of a product and a SKU, or an organization and a repository, so that users are not unexpectedly blocked from using a feature that they rely on. Alternative, you may prefer to monitor use without blocking users by disabling the "Stop usage when budget limit is reached" option.
43+
We recommend that you avoid creating overlapping budgets for the use of a product and a SKU, or an organization and a repository, so that users are not unexpectedly blocked from using a feature that they rely on. Alternatively, you may prefer to monitor use without blocking users by disabling the "Stop usage when budget limit is reached" option.
6644

6745
## Managing budgets for your personal account
6846

content/issues/tracking-your-work-with-issues/using-issues/filtering-and-searching-issues-and-pull-requests.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ For issues, you can also use search to:
225225
* Filter for issues that are linked to a pull request by a closing reference: `linked:pr`
226226
* Filter issues by the reason they were closed: `is:closed reason:completed` or `is:closed reason:"not planned"`
227227
{% ifversion issue-types %}* Filter for issues with a particular type: `is:open type:"Bug"`{% endif %}{% ifversion issues-advanced-search %}
228+
* Filter for issues that have metadata: `has:label`
229+
* Filter for issues that are missing metadata: `no:project`
228230
* Filter for issues from repositories [**owned**](/search-github/searching-on-github/searching-issues-and-pull-requests#search-within-a-users-or-organizations-repositories) by a certain user or organization, limited to up to 16 `user` and `org` qualifiers with no limit on `repo` qualifiers: `state:open type:issue org:github OR user:octocat`{% endif %}
229231

230232
For pull requests, you can also use search to:

content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ You can add `site.github` to a post or page to add any repository references met
7676
{% data reusables.pages.add-jekyll-theme %} For more information, see [Themes](https://jekyllrb.com/docs/themes/) in the Jekyll documentation.
7777

7878
{% ifversion fpt or ghec %}
79-
You can add a supported theme to your site on {% data variables.product.prodname_dotcom %}. For more information, see [Supported themes](https://pages.github.com/themes/) on the {% data variables.product.prodname_pages %} site and [Adding a theme to your {% data variables.product.prodname_pages %} site using Jekyll](/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll).
79+
You can add a supported theme to your site on {% data variables.product.prodname_dotcom %}. For more information, see [Supported themes](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#supported-themes) on the {% data variables.product.prodname_pages %} site and [Adding a theme to your {% data variables.product.prodname_pages %} site using Jekyll](/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll).
8080

81-
To use any other open source Jekyll theme hosted on {% data variables.product.prodname_dotcom %}, you can add the theme manually.{% else %} You can add a theme to your site manually.{% endif %} For more information, see{% ifversion fpt or ghec %} [themes hosted on {% data variables.product.prodname_dotcom %}](https://github.com/topics/jekyll-theme) and{% else %} [Supported themes](https://pages.github.com/themes/) on the {% data variables.product.prodname_pages %} site and{% endif %} [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll).
81+
To use any other open source Jekyll theme hosted on {% data variables.product.prodname_dotcom %}, you can add the theme manually.{% else %} You can add a theme to your site manually.{% endif %} For more information, see{% ifversion fpt or ghec %} [themes hosted on {% data variables.product.prodname_dotcom %}](https://github.com/topics/jekyll-theme) and{% else %} [Supported themes](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#supported-themes) on the {% data variables.product.prodname_pages %} site and{% endif %} [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll).
8282

8383
You can override any of your theme's defaults by editing the theme's files. For more information, see your theme's documentation and [Overriding your theme's defaults](https://jekyllrb.com/docs/themes/#overriding-theme-defaults) in the Jekyll documentation.
8484

@@ -99,10 +99,10 @@ You can download or create Jekyll plugins to extend the functionality of Jekyll
9999

100100
You can enable additional plugins by adding the plugin's gem to the `plugins` setting in your `_config.yml` file. For more information, see [Configuration](https://jekyllrb.com/docs/configuration/) in the Jekyll documentation.
101101

102-
For a list of supported plugins, see [Dependency versions](https://pages.github.com/versions/) on the {% data variables.product.prodname_pages %} site. For usage information for a specific plugin, see the plugin's documentation.
102+
For a list of supported plugins, see [Dependency versions](https://pages.github.com/versions.json) on the {% data variables.product.prodname_pages %} site. For usage information for a specific plugin, see the plugin's documentation.
103103

104104
> [!TIP]
105-
> You can make sure you're using the latest version of all plugins by keeping the {% data variables.product.prodname_pages %} gem updated. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#updating-the-github-pages-gem) and [Dependency versions](https://pages.github.com/versions/) on the {% data variables.product.prodname_pages %} site.
105+
> You can make sure you're using the latest version of all plugins by keeping the {% data variables.product.prodname_pages %} gem updated. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#updating-the-github-pages-gem) and [Dependency versions](https://pages.github.com/versions.json) on the {% data variables.product.prodname_pages %} site.
106106

107107
{% data variables.product.prodname_pages %} cannot build sites using unsupported plugins. If you want to use unsupported plugins, generate your site locally and then push your site's static files to {% data variables.product.github %}.
108108

content/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,34 @@ People with write permissions for a repository can add a theme to a {% data vari
2323

2424
{% data reusables.pages.test-locally %}
2525

26+
## Supported themes
27+
28+
Out of the box, the following themes are supported:
29+
30+
* [Architect](https://github.com/pages-themes/architect)
31+
* [Cayman](https://github.com/pages-themes/cayman)
32+
* [Dinky](https://github.com/pages-themes/dinky)
33+
* [Hacker](https://github.com/pages-themes/hacker)
34+
* [Leap day](https://github.com/pages-themes/leap-day)
35+
* [Merlot](https://github.com/pages-themes/merlot)
36+
* [Midnight](https://github.com/pages-themes/midnight)
37+
* [Minima](https://github.com/jekyll/minima)
38+
* [Minimal](https://github.com/pages-themes/minimal)
39+
* [Modernist](https://github.com/pages-themes/modernist)
40+
* [Slate](https://github.com/pages-themes/slate)
41+
* [Tactile](https://github.com/pages-themes/tactile)
42+
* [Time machine](https://github.com/pages-themes/time-machine)
43+
44+
The [`jekyll-remote-theme`](https://github.com/benbalter/jekyll-remote-theme) Jekyll plugin is also available and lets you load other themes.
45+
2646
## Adding a theme
2747

2848
{% data reusables.pages.navigate-site-repo %}
2949
{% data reusables.pages.navigate-publishing-source %}
3050
1. Navigate to `_config.yml`.
3151
{% data reusables.repositories.edit-file %}
3252
1. Add a new line to the file for the theme name.
33-
* To use a supported theme, type `theme: THEME-NAME`, replacing THEME-NAME with the name of the theme as shown in the `_config.yml` of the theme's repository (most themes follow a `jekyll-theme-NAME` naming convention). For a list of supported themes, see [Supported themes](https://pages.github.com/themes/) on the {% data variables.product.prodname_pages %} site. For example, to select the Minimal theme, type `theme: jekyll-theme-minimal`.
53+
* To use a supported theme, type `theme: THEME-NAME`, replacing THEME-NAME with the name of the theme as shown in the `_config.yml` of the theme's repository (most themes follow a `jekyll-theme-NAME` naming convention). For a list of supported themes, see [Supported themes](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#supported-themes) on the {% data variables.product.prodname_pages %} site. For example, to select the Minimal theme, type `theme: jekyll-theme-minimal`.
3454
* To use any other Jekyll theme hosted on {% data variables.product.prodname_dotcom %}, type `remote_theme: THEME-NAME`, replacing THEME-NAME with the name of the theme as shown in the README of the theme's repository.
3555
{% data reusables.files.write_commit_message %}
3656
{% data reusables.files.choose-commit-email %}

content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages %
9999
gem "github-pages", "~> GITHUB-PAGES-VERSION", group: :jekyll_plugins
100100
```
101101

102-
Replace GITHUB-PAGES-VERSION with the latest supported version of the `github-pages` gem. You can find this version here: [Dependency versions](https://pages.github.com/versions/).
102+
Replace GITHUB-PAGES-VERSION with the latest supported version of the `github-pages` gem. You can find this version here: [Dependency versions](https://pages.github.com/versions.json).
103103

104104
The correct version Jekyll will be installed as a dependency of the `github-pages` gem.
105105
1. Save and close the Gemfile.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% ifversion fpt or ghec %}
2-
These instructions work best with themes that are officially supported by {% data variables.product.prodname_pages %}. For a complete list of supported themes, see [Supported themes](https://pages.github.com/themes/) on the {% data variables.product.prodname_pages %} site.
2+
These instructions work best with themes that are officially supported by {% data variables.product.prodname_pages %}. For a complete list of supported themes, see [Supported themes](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#supported-themes) on the {% data variables.product.prodname_pages %} site.
33
{% endif %}

src/secret-scanning/data/public-docs.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,6 +2576,39 @@
25762576
hasPushProtection: true
25772577
hasValidityCheck: false
25782578
isduplicate: false
2579+
- provider: GuardSquare
2580+
supportedSecret: GuardSquare AppSweep API Key
2581+
secretType: guardsquare_appsweep_api_key
2582+
versions:
2583+
fpt: '*'
2584+
ghec: '*'
2585+
isPublic: true
2586+
isPrivateWithGhas: true
2587+
hasPushProtection: false
2588+
hasValidityCheck: false
2589+
isduplicate: false
2590+
- provider: GuardSquare
2591+
supportedSecret: GuardSquare CLI Access Token
2592+
secretType: guardsquare_cli_access_token
2593+
versions:
2594+
fpt: '*'
2595+
ghec: '*'
2596+
isPublic: true
2597+
isPrivateWithGhas: true
2598+
hasPushProtection: false
2599+
hasValidityCheck: false
2600+
isduplicate: false
2601+
- provider: GuardSquare
2602+
supportedSecret: GuardSquare Maven Token
2603+
secretType: guardsquare_maven_token
2604+
versions:
2605+
fpt: '*'
2606+
ghec: '*'
2607+
isPublic: true
2608+
isPrivateWithGhas: true
2609+
hasPushProtection: false
2610+
hasValidityCheck: false
2611+
isduplicate: false
25792612
- provider: HashiCorp
25802613
supportedSecret: HashiCorp Vault Batch Token
25812614
secretType: hashicorp_vault_batch_token
@@ -4213,7 +4246,7 @@
42134246
ghes: '>=3.18'
42144247
isPublic: false
42154248
isPrivateWithGhas: true
4216-
hasPushProtection: false
4249+
hasPushProtection: true
42174250
hasValidityCheck: false
42184251
isduplicate: false
42194252
- provider: Samsara

0 commit comments

Comments
 (0)