jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-30 03:01:36 -05:00
Code Issues Projects Releases Wiki Activity

Branch was updated using the 'autoupdate branch' Actions workflow.

Browse Source
This commit is contained in:
Octomerger Bot
2021-02-02 05:01:54 +10:00
committed by GitHub
parent e5e5bc4ce6 205fe55a31
commit 8b79603e5c
27 changed files with 95 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/triage-stale-check.yml vendored
View File

@@ -12,8 +12,8 @@ jobs:
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: 'This PR is stale because it has been open 7 days with no activity and will be automatically closed in 3 days. To keep this PR open, update the PR by adding a comment or pushing a commit.'
days-before-stale: 7
stale-pr-message: 'This PR is stale because it has been open 21 days with no activity and will be automatically closed in 10 days. To keep this PR open, update the PR by adding a comment or pushing a commit.'
days-before-stale: 21
days-before-close: 10
stale-pr-label: 'stale'
exempt-pr-labels: 'never-stale'

2
content/developers/apps/refreshing-user-to-server-access-tokens.md
View File

@@ -42,7 +42,7 @@ Name | Type | Description
{
"access_token": "e72e16c7e42f292c6912e7710c838347ae178b4a",
"expires_in": "28800",
"refresh_token": "r1.c1b4a2e77838347a7e420ce178f2e7c6912e1692",
"refresh_token": "r1.c1b4a2e77838347a7e420ce178f2e7c6912e169246c34e1ccbf66c46812d16d5b1a9dc86a149873c",
"refresh_token_expires_in": "15811200",
"scope": "",
"token_type": "bearer"

2
content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md
View File

@@ -12,6 +12,8 @@ versions:
{% data reusables.github-actions.actions-spending-limit-brief %} For more information, see "[About spending limits](#about-spending-limits)."
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."
Minutes reset every month, while storage usage does not.
|Product | Storage | Minutes (per month)|

2
content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages.md
View File

@@ -14,6 +14,8 @@ versions:
{% data reusables.package_registry.container-registry-beta-billing-note %}
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."
Data transfer resets every month, while storage usage does not.
Product | Storage | Data transfer (per month)

2
content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md
View File

@@ -14,6 +14,8 @@ versions:
{% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_actions %} usage, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions)."
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."
As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and creates workflow artifacts that increase your storage usage for the month from 1.9GB to 2.1GB, you will use slightly more storage than the 2GB your product includes.
Because you have not enabled overages, your next attempt to create a workflow artifact will fail. You will not receive a bill for the 0.1GB overage that month. However, if you enable overages, your first bill will include the 0.1GB of existing overage for the current billing cycle, as well as any additional overages you accrue.

2
content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md
View File

@@ -14,6 +14,8 @@ versions:
{% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_registry %} usage, see "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)."
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."
As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and publishes a new version of a private package that increases your storage usage for the month from 1.9GB to 2.1GB, publishing the version will use slightly more than the 2GB your product includes.
Because you have not enabled overages, your next attempt to publish a version of the package will fail. You will not receive a bill for the 0.1GB overage that month. However, if you enable overages, your first bill will include the 0.1GB of existing overage for the current billing cycle, as well as any additional overages you accrue.

39
content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md Normal file
View File

@@ -0,0 +1,39 @@
---
title: Connecting an Azure subscription to your enterprise
intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} usage beyond the included amounts for your enterprise.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
versions:
free-pro-team: '*'
---
### About Azure subscriptions and {% data variables.product.product_name %}
{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions) and "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)."
After you connect an Azure subscription, you can also manage your spending limit. For information on managing and changing your account's spending limit, see "[Managing your spending limit for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages)" and "[Managing your spending limit for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions)."
### Connecting your Azure subscription to your enterprise account
To connect your Azure subscription, you must have owner permissions to the subscription.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.billing-tab %}
{% data reusables.enterprise-accounts.payment-information-tab %}
1. Under "Payment Information", click **Add Azure Subscription**.
1. To sign in to your Microsoft account, follow the prompts.
1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**.
1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise.
1. Click **Connect**.
### Disconnecting your Azure subscription from your enterprise account
After you disconnect your Azure subscription from your enterprise account, your usage can no longer exceed the amounts included with your plan.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.billing-tab %}
{% data reusables.enterprise-accounts.payment-information-tab %}
1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trashcan" aria-label="The trashcan icon" %}**.
1. Review the prompt, then click **Remove**.

1
content/github/setting-up-and-managing-your-enterprise/index.md
View File

@@ -18,6 +18,7 @@ versions:
{% link_in_list /about-enterprise-accounts %}
{% link_in_list /viewing-the-subscription-and-usage-for-your-enterprise-account %}
{% link_in_list /managing-licenses-for-visual-studio-subscription-with-github-enterprise %}
{% link_in_list /connecting-an-azure-subscription-to-your-enterprise %}
{% topic_link_in_list /managing-users-in-your-enterprise %}
{% link_in_list /roles-in-an-enterprise %}
{% link_in_list /inviting-people-to-manage-your-enterprise %}

2
content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md
View File

@@ -15,6 +15,8 @@ versions:
Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account are aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs, and subscriptions for {% data variables.product.prodname_marketplace %} apps).
{% if currentVersion == "free-pro-team@latest" %}{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."{% endif %}
For more information about managing billing managers, see "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)."
### Viewing the subscription and usage for your enterprise account

1
data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md Normal file
View File

@@ -0,0 +1 @@
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} usage beyond the amounts including with your account.

1
data/reusables/enterprise-accounts/payment-information-tab.md Normal file
View File

@@ -0,0 +1 @@
Under "Billing", click **Payment information**.

8
lib/rest/static/decorated/api.github.com.json
View File

@@ -70826,12 +70826,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -70898,12 +70898,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-2.18.json
View File

@@ -51777,12 +51777,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -51849,12 +51849,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-2.19.json
View File

@@ -52579,12 +52579,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -52651,12 +52651,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-2.20.json
View File

@@ -53233,12 +53233,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -53305,12 +53305,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-2.21.json
View File

@@ -57275,12 +57275,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -57347,12 +57347,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-2.22.json
View File

@@ -64671,12 +64671,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -64743,12 +64743,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/ghes-3.0.json
View File

@@ -69364,12 +69364,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -69436,12 +69436,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

8
lib/rest/static/decorated/github.ae.json
View File

@@ -55004,12 +55004,12 @@
},
"context": {
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
},
@@ -55076,12 +55076,12 @@
},
{
"type": "string",
"description": "<p>A string label to differentiate this status from the status of other systems.</p>",
"description": "<p>A string label to differentiate this status from the status of other systems. This field is case-insensitive.</p>",
"default": "default",
"name": "context",
"in": "body",
"rawType": "string",
"rawDescription": "A string label to differentiate this status from the status of other systems.",
"rawDescription": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"childParamsGroups": []
}
],

2
lib/rest/static/dereferenced/api.github.com.deref.json
View File

@@ -259781,7 +259781,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-2.18.deref.json
View File

@@ -196638,7 +196638,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-2.19.deref.json
View File

@@ -200037,7 +200037,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-2.20.deref.json
View File

@@ -203019,7 +203019,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-2.21.deref.json
View File

@@ -214626,7 +214626,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-2.22.deref.json
View File

@@ -242891,7 +242891,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/ghes-3.0.deref.json
View File

@@ -248217,7 +248217,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},

2
lib/rest/static/dereferenced/github.ae.deref.json
View File

@@ -208313,7 +208313,7 @@
},
"context": {
"type": "string",
"description": "A string label to differentiate this status from the status of other systems.",
"description": "A string label to differentiate this status from the status of other systems. This field is case-insensitive.",
"default": "default"
}
},