Skip to content

Commit adaa6b2

Browse files
committed
billing updates, curation, redirection
1 parent 1a8e0f2 commit adaa6b2

31 files changed

+201
-270
lines changed

.openpublishing.redirection.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,14 @@
553553
{
554554
"source_path": "docs/organizations/security/security-tools-reference.md",
555555
"redirect_url": "/azure/devops/organizations/security/manage-tokens-namespaces"
556+
},
557+
{
558+
"source_path": "docs/organizations/billing/add-backup-billing-managers.md",
559+
"redirect_url": "/azure/devops/organizations/billing/set-up-billing-for-your-organization-vs#add-backup-billing-managers"
560+
},
561+
{
562+
"source_path": "docs/organizations/billing/change-azure-subscription.md",
563+
"redirect_url": "/azure/devops/organizations/billing/set-up-billing-for-your-organization-vs#change-azure-subscription"
556564
}
557565
]
558566
}

docs/artifacts/artifact-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The project-level view provides an overview of your total storage usage as well
5959
:::image type="content" source="media/packages-proj-scoped-feeds.png" alt-text="A screenshot showing the total storage for packages in project-scoped feeds.":::
6060

6161
> [!NOTE]
62-
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, we recommend [set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md) to ensure you have the appropriate resources.
62+
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, we recommend [set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing) to ensure you have the appropriate resources.
6363
6464
## Related articles
6565

Loading

docs/artifacts/reference/limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ monikerRange: '<= azure-devops'
1414
Azure Artifacts is a highly scalable package management solution that enables developers to create, host, and share different types of packages. In this article, we will cover the size and count limits that developers should be aware of when using Azure Artifacts. Some of these limits are imposed by the client tools that Azure Artifacts integrates with (example nuget.exe).
1515

1616
> [!NOTE]
17-
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, we recommend [set up billing](../../organizations/billing/set-up-billing-for-your-organization-vs.md) to ensure you have the appropriate resources.
17+
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, we recommend [set up billing](../../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing) to ensure you have the appropriate resources.
1818
1919
## Count limits
2020

docs/artifacts/start-using-azure-artifacts.md

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,64 @@
11
---
2-
title: Azure Artifacts overview
3-
description: Learn how to get started with Azure Artifacts
2+
title: Start using Azure Artifacts
3+
description: Learn how to get started with Azure Artifacts by increasing the storage or usage limit in Billing, and create your first feed.
44
ms.service: azure-devops-artifacts
55
ms.topic: quickstart
66
ms.assetid: 45ECCEFD-3804-4D8C-8567-57C84F92A705
77
ms.author: rabououn
88
author: ramiMSFT
9-
ms.date: 12/07/2023
9+
ms.date: 09/18/2024
1010
monikerRange: '<= azure-devops'
1111
---
1212

13-
# Azure Artifacts overview
13+
# Start using Azure Artifacts
1414

1515
[!INCLUDE [version-lt-eq-azure-devops](../includes/version-lt-eq-azure-devops.md)]
1616

17-
Azure Artifacts enables developers to efficiently manage all their dependencies from one place. With Azure Artifacts, developers can publish packages to their feeds and share them within their team, across organizations, and even publicly across the internet. Azure Artifacts also allows developers to consume packages from different feeds and public registries such as NuGet.org or npmjs.com. Azure Artifacts supports the following package types: NuGet, npm, Python, Maven, Cargo, and Universal Packages.
17+
Azure Artifacts allows developers to manage dependencies in one place, for instance, they can:
18+
- Publish packages to feeds and share them within teams, across organizations, or publicly.
19+
- Consume packages from various feeds and public registries like NuGet.org or npmjs.com.
20+
- Use supported package types include NuGet, npm, Python, Maven, Cargo, and Universal Packages.
1821

19-
## Prerequisites
22+
This article shows you how to increase your Azure Artifact storage limit and create your first feed.
2023

21-
- Create an Azure DevOps [organization](../organizations/accounts/create-organization.md) and a [project](../organizations/projects/create-project.md#create-a-project) if you haven't already.
24+
## Prerequisites
2225

23-
- [Allow domain URLs and IP addresses](../organizations/security/allow-list-ip-url.md) if your organization is using a firewall or a proxy server.
26+
- **Project:** Have a [project](../organizations/projects/create-project.md#create-a-project) and be a member.
27+
- **Permissions:** Be a member of the [Project Collection Administrators group](../security/look-up-project-collection-administrators.md). Organization owners are automatically members of this group.
28+
- **Network configuration:** [Allow domain URLs and IP addresses](../organizations/security/allow-list-ip-url.md) if your organization is using a firewall or a proxy server.
2429

2530
> [!NOTE]
26-
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, we recommend [set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md) to ensure you have the appropriate resources.
31+
> Azure Artifacts provides 2 GiB of free storage for each organization. This free tier is designed to help you evaluate if Azure Artifacts fits your workflow. As your organization starts handling more critical tasks, [increase the storage limit for Azure Artifacts](increase-artifacts-storage-limit) to ensure you have the appropriate resources.
32+
33+
::: moniker range="azure-devops"
34+
35+
<a name="increase-artifacts-storage-limit"></a>
36+
37+
## Increase storage limit for Azure Artifacts
38+
39+
Azure Artifacts is provided at no cost for every organization with up to 2 GiB of storage. When your organization reaches the maximum storage limit, you can't publish new artifacts. To continue, either delete some of your existing artifacts or do the following steps to increase your storage limit.
40+
41+
1. [Set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing-for-your-organization) for your organization.
42+
43+
2. Adjust your Artifacts usage limit by selecting **No limit, pay for what you use** from the dropdown menu.
44+
45+
:::image type="content" source="media/adjust-artifacts-usage-limit.png" alt-text="Screenshot showing adjusted usage limit for Artifacts on Billing page.":::
46+
47+
## View Artifacts storage consumption
48+
49+
- [Project-level storage](./artifact-storage.md#project-level-storage)
50+
51+
- [Organization-level storage](./artifact-storage.md#organization-level-storage)
52+
53+
::: moniker-end
2754

2855
::: moniker range="azure-devops"
2956

3057
## Create a feed
3158

3259
[!INCLUDE [](includes/create-feed.md)]
3360

34-
## Get started
61+
## Get started with package type
3562

3663
With Azure Artifacts, you can publish and consume various package types from feeds and public registries such as nuget.org, npmjs.com, Maven Central, etc. Select your package type to get started:
3764

@@ -69,7 +96,7 @@ With Azure Artifacts, you can publish and consume various package types from fee
6996

7097
::: moniker range="azure-devops-2019 || azure-devops-2020 || azure-devops-2022"
7198

72-
## Get started
99+
## Get started with package type
73100

74101
With Azure Artifacts, you can publish and consume different types of packages. Select your package type to get started:
75102

@@ -109,62 +136,36 @@ With Azure Artifacts, you can publish and consume different types of packages. S
109136
| **Cargo packages** | :::image type="icon" source="../media/icons/checkmark.png" border="false"::: | :::image type="icon" source="../media/icons/delete-icon.png" border="false"::: |
110137
| **Universal Packages** | :::image type="icon" source="../media/icons/checkmark.png" border="false"::: | :::image type="icon" source="../media/icons/delete-icon.png" border="false"::: |
111138

112-
::: moniker range="azure-devops"
113-
114-
## Artifacts free tier and upgrade
115-
116-
Azure Artifacts is provided at no cost for every organization with up to 2 GiB of storage. Upon reaching the maximum storage limit, you won't be able to publish new artifacts. To continue, you'll need to either delete some of your existing artifacts or [set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md) to increase your storage limit. Explore the [Pricing Calculator](https://azure.microsoft.com/pricing/details/devops/azure-devops-services/) for further insights into Azure DevOps billing.
117-
118-
## View organization billing
119-
120-
Follow the steps below to access your organization's billing settings:
121-
122-
1. Sign in to your Azure DevOps organization.
123-
124-
1. Select ![gear icon](../media/icons/gear-icon.png) **Organization settings**, and then select **Billing**.
125-
126-
1. View your Artifacts tier and usage limit.
127-
128-
:::image type="content" source="media/organization-billing-artifacts.png" alt-text="A screenshot showing Artifacts tier and usage limit.":::
129-
130-
## View Artifacts storage consumption
131-
132-
- [Project-level storage](./artifact-storage.md#project-level-storage)
133-
134-
- [Organization-level storage](./artifact-storage.md#organization-level-storage)
135-
136-
::: moniker-end
137-
138139
## FAQs
139140

140-
##### Q: How can I manage the retention duration for Artifacts?
141+
#### Q: How can I manage the retention duration for Artifacts?
141142

142143
A: You can set up the retention policies to automatically delete packages. For more information, see [How to use retention policies to delete old packages](how-to/delete-and-recover-packages.md#delete-packages-automatically-with-retention-policies).
143144

144-
##### Q: How do I delete specific packages?
145+
#### Q: How do I delete specific packages?
145146

146-
A: See [Delete and recover packages](how-to/delete-and-recover-packages.md) for more details.
147+
A: For more information, see [Delete and recover packages](how-to/delete-and-recover-packages.md).
147148

148-
::: moniker range="azure-devops"
149+
::: moniker range=" azure-devops"
149150

150-
##### Q: Which artifacts contribute to my total billed storage?
151+
#### Q: Which artifacts contribute to my total billed storage?
151152

152-
A: You will be charged for all package types (npm, NuGet, Python, Maven, Cargo, and Universal Packages), including packages stored from upstream sources. However, there will be no charges for Pipeline Artifacts and Pipeline Caching
153+
A: You get charged for all package types (npm, NuGet, Python, Maven, Cargo, and Universal Packages), including packages stored from upstream sources. However, there are no charges for Pipeline Artifacts and Pipeline Caching.
153154

154155
> [!NOTE]
155-
> Packages in the recycle bin contribute to your overall storage consumption. These packages are permanently deleted after 30 days. If you wish to remove them before that, you can navigate to your recycle bin and delete them manually.
156+
> Packages in the recycle bin contribute to your overall storage consumption. These packages are permanently deleted after 30 days. If you wish to remove them before that, go to your recycle bin and delete them manually.
156157
157-
##### Q: What are the implications if I remove my Azure Subscription from my Azure DevOps organization?
158+
#### Q: What are the implications if I remove my Azure Subscription from my Azure DevOps organization?
158159

159160
A: When you remove your Azure Subscription from your Azure DevOps organization, your access is limited to the free tier. If your storage usage exceeds 2 GiB, you retain read-only access to packages. To publish new packages, you must reduce your storage usage below 2 GiB. Alternatively, you can reconnect an Azure subscription to your organization and set up billing to increase your storage tier.
160161

161-
##### Q: Why does my storage consumption display as 0 GiB even though I am storing Artifacts?
162+
#### Q: Why does my storage consumption display as 0 GiB even though I'm storing Artifacts?
162163

163-
A: Currently, our smallest unit of measurement is 1 GiB, so it's probable that you haven't surpassed the 1 GiB threshold yet.
164+
A: Currently, our smallest unit of measurement is 1 GiB, so it's probable that you didn't surpass the 1-GiB threshold yet.
164165

165-
##### Q: How much time does it typically take for the removal of Artifacts to be reflected in the billed storage amount?
166+
#### Q: How much time does it typically take for the removal of Artifacts to be reflected in the billed storage amount?
166167

167-
A: Deletion of artifacts may not be immediately reflected in the system. Storage consumption updates are typically completed within 24 hours, but in some instances, it may take up to 48 hours. If you encounter obstacles in uploading artifacts, a temporary workaround is to increase your usage level then reduce it once storage metrics are updated.
168+
A: Deletion of artifacts might not immediately reflect in the system. Storage consumption updates are typically completed within 24 hours, but in some instances, it might take up to 48 hours. If you encounter obstacles in uploading artifacts, a temporary workaround is to increase your usage level then reduce it once storage metrics are updated.
168169

169170
The **Used** column on the Billing page of your Organization is updated once a day. When you delete an Artifact, it might not be reflected immediately on your billing page. However, the Artifact Storage page is updated more frequently, so you might see a small discrepancy between the two pages.
170171

docs/get-started/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ landingContent:
7474
- text: Delete or restore a project
7575
url: ../organizations/projects/delete-project.md?toc=/azure/devops/get-started/toc.json
7676
- text: Set up billing for your Organization
77-
url: ../organizations/billing/set-up-billing-for-your-organization-vs.md?toc=/azure/devops/get-started/toc.json
77+
url: ../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing?toc=/azure/devops/get-started/toc.json
7878
- linkListType: concept
7979
links:
8080
- text: Default permissions and access

docs/marketplace/request-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ Tell your team about installed extensions, so they can start using their capabil
103103
## Related articles
104104

105105
- [FAQs](faq-extensions.yml)
106-
- [Set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md)
106+
- [Set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing)
107107
- [Azure DevOps pricing](https://azure.microsoft.com/pricing/details/devops/azure-devops-services/)
108108
- [Assign access levels by group membership](../organizations/accounts/assign-access-levels-by-group-membership.md)

docs/migrate/migration-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ In addition to the core features, the following value-added services are availab
8888
- Test Manager extensions: For comprehensive test management, consider using Test Manager extensions. These extensions enhance your testing capabilities by providing features like test case management, exploratory testing, and test execution tracking.
8989
- More features: Azure DevOps offers various extensions and integrations that cater to specific needs. Whether it’s integrating with non-Microsoft tools, enhancing security, or automating deployment pipelines, there's a wide range of options.
9090

91-
Some of these services might come with extra costs, so it’s essential to evaluate your requirements and budget accordingly. These costs appear on your bill under the associated subscription. For more information, see [Set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md). If you have specific questions about your situation, contact your DevOps Partner, Microsoft Reseller, or your Microsoft Developer Solutions Sales Specialist for personalized guidance.
91+
Some of these services might come with extra costs, so it’s essential to evaluate your requirements and budget accordingly. These costs appear on your bill under the associated subscription. For more information, see [Set up billing](../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing). If you have specific questions about your situation, contact your DevOps Partner, Microsoft Reseller, or your Microsoft Developer Solutions Sales Specialist for personalized guidance.
9292

9393
## Reserve your new organization
9494

docs/migrate/migration-prepare-test-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ For more information, see [Create a storage account](/azure/storage/common/stora
270270

271271
A grace period is placed on the newly migrated Azure DevOps Services organization to allow your team to finish any steps it needs and correct license assignments. If you anticipate that you might want to purchase any more user plans, build or deployment pipelines, hosted build services, hosted load test services, for example, we highly recommend that you sure you have an Azure Subscription ready for linking to your migrated organization. The grace period ends on the first day of the following month after you completed your migration.
272272

273-
We remind you again in the Post-migration phase(link) for when you need to do the linking. This preparation step is more about making sure that you know which Azure Subscription you use in that later step. For more information, see [Set up billing for your organization](../organizations/billing/set-up-billing-for-your-organization-vs.md).
273+
We remind you again in the Post-migration phase(link) for when you need to do the linking. This preparation step is more about making sure that you know which Azure Subscription you use in that later step. For more information, see [Set up billing for your organization](../organizations/billing/set-up-billing-for-your-organization-vs.md#set-up-billing).
274274

275275
## Next steps
276276

docs/organizations/accounts/add-organization-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ After you add members to your project, each member gets an invitation email that
311311
## Next steps
312312

313313
> [!div class="nextstepaction"]
314-
> [Set up billing](../billing/set-up-billing-for-your-organization-vs.md)
314+
> [Set up billing](../billing/set-up-billing-for-your-organization-vs.md#set-up-billing)
315315
316316
## Related articles
317317

0 commit comments

Comments
 (0)