Skip to content

Commit 1bb7976

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents bb1fa36 + 5b50712 commit 1bb7976

File tree

30 files changed

+226
-130
lines changed

30 files changed

+226
-130
lines changed

articles/azure-health-insights/radiology-insights/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ items:
4343
- name: Tutorial
4444
href: tutorial.md
4545
- name: REST API
46-
href: /java/api/com.azure.health.insights.radiologyinsights
46+
href: /rest/api/cognitiveservices/healthinsights/radiology-insights?view=rest-cognitiveservices-healthinsights-2024-04-01
4747
- name: SDKs
4848
items:
4949
- name: .NET
@@ -52,6 +52,8 @@ items:
5252
href: /java/api/overview/azure/health-insights-radiologyinsights-readme
5353
- name: Python
5454
href: /python/api/overview/azure/healthinsights-radiologyinsights-readme
55+
# still being finalized- name: JavaScript
56+
# href: /javascript/api/overview/azure/health-insights-radiologyinsights-rest-readme
5557
- name: Resources
5658
items:
5759
- name: FAQ

articles/azure-health-insights/radiology-insights/get-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The Service URL to access your service is: https://```YOUR-NAME```.cognitiveserv
2929
To send an API request, you need the endpoint and key of your Azure AI Health Insights service.
3030

3131

32-
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/create-job).
32+
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/create-job?view=rest-cognitiveservices-healthinsights-2024-04-01).
3333

3434

3535
![[Screenshot of the Keys and Endpoints for the Radiology Insights.](../media/keys-and-endpoints.png)](../media/keys-and-endpoints.png#lightbox)
@@ -156,7 +156,7 @@ Ocp-Apim-Subscription-Key: {cognitive-services-account-key}
156156
}
157157
```
158158

159-
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/create-job).
159+
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/create-job?view=rest-cognitiveservices-healthinsights-2024-04-01).
160160

161161

162162

@@ -206,7 +206,7 @@ Ocp-Apim-Subscription-Key: {cognitive-services-account-key}
206206
}
207207
```
208208

209-
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/get-job).
209+
You can also find a full view of the [request parameters here](/rest/api/cognitiveservices/healthinsights/radiology-insights/get-job?view=rest-cognitiveservices-healthinsights-2024-04-01).
210210

211211
## Data limits
212212

-13.7 KB
Loading

articles/azure-resource-manager/bicep/visual-studio-code.md

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Open or create a Bicep file in VS Code, select the **View** menu and then **Comm
2525
These commands include:
2626

2727
- [Build ARM Template](#build-arm-template)
28+
- [Build Parameters File](#build-parameters-file)
2829
- [Create Bicep Configuration File](#create-bicep-configuration-file)
2930
- [Decompile into Bicep](#decompile-into-bicep)
3031
- [Deploy Bicep File](#deploy-bicep-file)
@@ -33,7 +34,10 @@ These commands include:
3334
- [Insert Resource](#insert-resource)
3435
- [Open Bicep Visualizer](#open-bicep-visualizer)
3536
- [Open Bicep Visualizer to the side](#open-bicep-visualizer)
37+
- [Paste JSON as Bicep](#paste-as-bicep)
3638
- [Restore Bicep Modules (Force)](#restore-bicep-modules)
39+
- [Show Deployment Pane](#show-deployment-pane)
40+
- [Show Deployment Pane to the Side](#show-deployment-pane)
3741

3842
These commands are also shown in the context menu when you right-click a Bicep file:
3943

@@ -45,7 +49,11 @@ When you right-click a JSON file:
4549

4650
### Build ARM template
4751

48-
The `build` command converts a Bicep file to an Azure Resource Manager template (ARM template). The new JSON template is stored in the same folder with the same file name. If a file with the same file name exists, it overwrites the old file. For more information, see [Bicep CLI commands](./bicep-cli.md#bicep-cli-commands).
52+
The `build` command converts a Bicep file to an Azure Resource Manager template (ARM template). The new JSON template is stored in the same folder with the same file name. If a file with the same file name exists, it overwrites the old file. For more information, see [Bicep CLI commands](./bicep-cli.md#build).
53+
54+
### Build parameters file
55+
56+
The `build` command converts a [Bicep parameters file](./parameter-files.md#parameters-file) to a [JSON parameters file](../templates/parameter-files.md#parameter-file). The new JSON parameters file is stored in the same folder with the same file name. If a file with the same file name exists, it overwrites the old file. For more information, see [Bicep CLI commands](./bicep-cli.md#build-params).
4957

5058
### Create Bicep configuration file
5159

@@ -115,21 +123,7 @@ The visualizer shows the resources defined in the Bicep file with the resource d
115123

116124
You can also open the visualizer side-by-side with the Bicep file.
117125

118-
### Restore Bicep modules
119-
120-
When your Bicep file uses modules that are published to a registry, the restore command gets copies of all the required modules from the registry. It stores those copies in a local cache. For more information, see [restore](./bicep-cli.md#restore).
121-
122-
## View documentation
123-
124-
From Visual Studio Code, you can open the template reference for the resource type you're working on. To do so, hover your cursor over the resource symbolic name, and then select **View Documentation**.
125-
126-
:::image type="content" source="./media/visual-studio-code/visual-studio-code-bicep-view-type-document.png" alt-text="Screenshot of Visual Studio Code Bicep view type document.":::
127-
128-
## Go to definition
129-
130-
When defining a [module](./modules.md) and regardless of the type of file that's being referenced - whether it's a local file, module registry file, or a template spec - you can open the file by selecting or highlighting the module path and then press **[F12]**. If the referenced file is an [Azure Verified Modules(AVM)](https://aka.ms/avm), you can toggle between compiled JSON or Bicep file. To open the Bicep file of a private registry module, ensure that the module is published to the registry with the `WithSource` switch enabled. For more information, see [Publish files to registry](./private-module-registry.md#publish-files-to-registry). The Visual Studio Code Bicep extension version 0.27.1 or newer is required for opening Bicep files from a private module registry.
131-
132-
## Paste as Bicep
126+
### Paste as Bicep
133127

134128
You can paste a JSON snippet from an ARM template to a Bicep file. Visual Studio Code automatically decompiles the JSON to Bicep. This feature is only available with the Bicep extension version 0.14.0 or newer, and it's enabled by default. To disable the feature, see [VS Code and Bicep extension](./install.md#visual-studio-code-and-bicep-extension).
135129

@@ -195,14 +189,34 @@ Visual Studio Code automatically converts the JSON to Bicep. Notice that you als
195189

196190
You can undo the decompilation by using <kbd>Ctrl+Z</kbd>. The original JSON appears in the file.
197191

192+
### Restore Bicep modules
193+
194+
When your Bicep file uses modules that are published to a registry, the restore command gets copies of all the required modules from the registry. It stores those copies in a local cache. For more information, see [restore](./bicep-cli.md#restore).
195+
196+
### Show deployment pane
197+
198+
The Bicep Deployment Pane is an experimental feature. For more information, see [Using the Deployment Pane](https://github.com/Azure/bicep/blob/main/docs/experimental/deploy-ui.md).
199+
200+
You can also open the deployment pane side-by-side with the Bicep file.
201+
202+
## View documentation
203+
204+
From Visual Studio Code, you can open the template reference for the resource type you're working on. To do so, hover your cursor over the resource symbolic name, and then select **View Documentation**.
205+
206+
:::image type="content" source="./media/visual-studio-code/visual-studio-code-bicep-view-type-document.png" alt-text="Screenshot of Visual Studio Code Bicep view type document.":::
207+
208+
## Go to definition
209+
210+
When defining a [module](./modules.md) and regardless of the type of file that's being referenced - whether it's a local file, module registry file, or a template spec - you can open the file by selecting or highlighting the module path and then press **[F12]**. If the referenced file is an [Azure Verified Modules(AVM)](https://aka.ms/avm), you can toggle between compiled JSON or Bicep file. To open the Bicep file of a private registry module, ensure that the module is published to the registry with the `WithSource` switch enabled. For more information, see [Publish files to registry](./private-module-registry.md#publish-files-to-registry). The Visual Studio Code Bicep extension version 0.27.1 or newer is required for opening Bicep files from a private module registry.
211+
198212
## Troubleshoot
199213

200214
The `Problems` pane summarizes the errors and warning in your Bicep file:
201215

202216
:::image type="content" source="./media/visual-studio-code/visual-studio-code-bicep-problems-pane.png" alt-text="Screenshot of Visual Studio Code Bicep problems pane.":::
203217

204218
For the list of error/warning codes, see [Bicep error/warning codes](./bicep-error-codes.md).
205-
219+
206220
## Next steps
207221

208222
To walk through a quickstart tutorial, see [Quickstart: Create Bicep files with Visual Studio Code](./quickstart-create-bicep-use-visual-studio-code.md).
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
title: What is a cloud subscription?
3+
description: Learn about cloud subscriptions, how they help manage Microsoft products and services, and the benefits of organizing resources with multiple subscriptions.
4+
author: bandersmsft
5+
ms.reviewer: macyso
6+
ms.service: cost-management-billing
7+
ms.subservice: billing
8+
ms.topic: concept-article
9+
ms.date: 11/21/2024
10+
ms.author: banders
11+
#customer intent: As a billing admin, I want to understand what a cloud subscription is so that I can manage my resources effectively.
12+
---
13+
14+
# What is a cloud subscription?
15+
16+
A cloud subscription is a way to manage the products and services that you buy from Microsoft. Cloud subscriptions get created when you acquire Azure resources and sometimes when you get products outside of Azure services. For example, they include the Microsoft Azure Consumption Commitment benefit, some Microsoft 365 subscriptions, and benefits like Enterprise Support.
17+
18+
The term cloud subscription is synonymous with Azure subscription.
19+
20+
- **No cost for cloud subscriptions** - Cloud subscriptions themselves don't cost any money. They're used to organizing and managing the things you buy. While products like virtual machines or Enterprise Support managed within a cloud subscription might incur charges, the subscription itself doesn't.
21+
- **Multiple subscriptions** - You can create multiple cloud subscriptions to delegate management to different users in your organization or to apply policies for security, budgeting, and compliance.
22+
- **Familiar management tools** - If you used Azure subscriptions before, you can manage cloud subscriptions similarly, with more manageability for a broader set of products and services.
23+
24+
## Frequently asked questions
25+
26+
Here are some common questions and answers about cloud subscriptions.
27+
28+
### Where can I find my cloud subscription?
29+
30+
In the Azure portal, you can see all your cloud subscriptions on the Subscriptions page.
31+
32+
If you're signing in for the first time, search for **Subscriptions** in the search bar.
33+
34+
:::image type="content" source="./media/cloud-subscription/subscription-search-portal.png" border="true" alt-text="Screenshot showing search for subscriptions." lightbox="./media/cloud-subscription/subscription-search-portal.png" :::
35+
36+
37+
### Do I get charged for creating and using cloud subscriptions?
38+
39+
No, cloud subscriptions are created silently and are used to manage the things that you buy. They don't incur charges or cost money.
40+
41+
### How do I manage my cloud subscriptions?
42+
43+
To see your cloud subscriptions, navigate to your list of subscriptions in the Azure portal. From there, you can manage them using the tools you’re already familiar with.
44+
45+
## Related content
46+
47+
- [Create a new cloud subscription](create-subscription.md)
48+
- [Manage role assignments and permissions](../../role-based-access-control/rbac-and-directory-admin-roles.md)
49+
- [Manage your cloud subscriptions](manage-azure-subscription-policy.md)
50+
- [Transfer your cloud subscription](../../role-based-access-control/transfer-subscription.md)
51+
- [Filter and view your subscriptions](filter-view-subscriptions.md)
52+
- [Delegate management](/azure/lighthouse/how-to/view-manage-customers#view-and-manage-delegations)
53+
- [Organize costs](../costs/allocate-costs.md)
54+
- [Track budget and spend](../costs/tutorial-acm-create-budgets.md)
55+
- [Organize products and services](/azure/cloud-adoption-framework/ready/azure-setup-guide/organize-resources)
56+
- [Manage policies and controls for security and compliance](../../governance/policy/tutorials/create-and-manage.md)
57+
- [Add tags to your subscriptions](../../azure-resource-manager/management/tag-resources-portal.md)
58+
- [Cancel and delete your subscriptions](cancel-azure-subscription.md)
91.3 KB
Loading

articles/cost-management-billing/scope-level/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
### YamlMime:Landing
22

33
title: Centrally managed Azure Hybrid Benefit
4-
summary: Azure Hybrid Benefit is a licensing benefit that lets you bring your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure. It allows you to significantly reduce the costs of running your workloads in the cloud. In the Azure portal, you can now centrally manage your Azure Hybrid Benefit for SQL Server by assigning licenses to the scope of an entire Azure subscription or overall billing account.
4+
summary: Azure Hybrid Benefit is an Azure discount that lets you allocate your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure. It allows you to significantly reduce the costs of running your workloads in the cloud. In the Azure portal, you can now centrally manage your Azure Hybrid Benefit for SQL Server by assigning licenses to the scope of an entire Azure subscription or overall billing account.
55
metadata:
66
title: Azure Hybrid Benefit documentation
7-
description: Azure Hybrid Benefit is a licensing benefit that lets you bring your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure. It allows you to significantly reduce the costs of running your workloads in the cloud. In the Azure portal, you can now centrally manage your Azure Hybrid Benefit for SQL Server by assigning licenses to the scope of an entire Azure subscription or overall billing account.
7+
description: Azure Hybrid Benefit is an Azure discount that lets you allocate your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure. It allows you to significantly reduce the costs of running your workloads in the cloud. In the Azure portal, you can now centrally manage your Azure Hybrid Benefit for SQL Server by assigning licenses to the scope of an entire Azure subscription or overall billing account.
88
ms.service: cost-management-billing
99
ms.subservice: ahb
1010
ms.topic: landing-page
1111
author: bandersmsft
1212
ms.author: banders
13-
ms.date: 03/21/2024
13+
ms.date: 11/21/2024
1414

1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1616

articles/cost-management-billing/scope-level/manage-licenses-centrally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Prices shown in the following image are only examples.
3636

3737
The Azure SQL resources covered by the assigned Core licenses can vary from hour to hour. The variance depends on what resources run and in what order the automated system processes their usage. However, the system ensures the maximum usage of the assigned SQL licenses in the selected scope. You can monitor the usage using Cost Management. For more information, see [How to track assigned license usage](create-sql-license-assignments.md#track-assigned-license-use).
3838

39-
The following diagram shows how the assigned SQL Server licenses apply over time to get the maximum Azure Hybrid Benefit discount.
39+
The following diagram shows how the assigned SQL Server licenses apply over time to get the maximum Azure Hybrid Benefit allocation.
4040

4141
:::image type="content" source="./media/manage-licenses-centrally/ncl-utilization-over-time.png" alt-text="Diagram showing NC use over time." border="false" lightbox="./media/manage-licenses-centrally/ncl-utilization-over-time.png":::
4242

articles/cost-management-billing/scope-level/overview-azure-hybrid-benefit-scope.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: What is centrally managed Azure Hybrid Benefit for SQL Server?
3-
description: Azure Hybrid Benefit is a licensing benefit that lets you bring your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure.
3+
description: Azure Hybrid Benefit an Azure discount that lets you allocate your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure.
44
author: bandersmsft
55
ms.author: banders
6-
ms.date: 11/11/2024
6+
ms.date: 11/21/2024
77
ms.topic: overview
88
ms.service: cost-management-billing
99
ms.subservice: ahb
@@ -12,7 +12,7 @@ ms.reviewer: chrisrin
1212

1313
# What is centrally managed Azure Hybrid Benefit for SQL Server?
1414

15-
Azure Hybrid Benefit is a licensing benefit that helps you to significantly reduce the costs of running your workloads in the cloud. It works by letting you use your on-premises Software Assurance or subscription-enabled Windows Server and SQL Server licenses on Azure. For more information, see [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/).
15+
Azure Hybrid Benefit an Azure discount that helps you to significantly reduce the costs of running your workloads in the cloud. It works by letting you use your on-premises Software Assurance or subscription-enabled Windows Server and SQL Server licenses on Azure. For more information, see [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/).
1616

1717
You can centrally manage your Azure Hybrid Benefit for SQL Server across the scope of an entire Azure subscription or overall billing account. To quickly learn how it works, watch the following video.
1818

@@ -94,7 +94,7 @@ You get the following benefits:
9494

9595
## How licenses apply to Azure resources
9696

97-
Both SQL Server Enterprise (core) and SQL Server Standard (core) licenses with Software Assurance qualify but, as described in the [Microsoft Product Terms](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzureServices/EAEAS), different conversion ratios apply when you bring them to Azure with Azure Hybrid Benefit.
97+
Both SQL Server Enterprise (core) and SQL Server Standard (core) licenses with Software Assurance qualify but, as described in the [Microsoft Product Terms](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzureServices/EAEAS), different conversion ratios apply when you allocate them to Azure with Azure Hybrid Benefit.
9898

9999
One rule to understand: One SQL Server Enterprise Edition license has the same coverage as _four_ SQL Server Standard Edition licenses, across all qualified Azure SQL resource types.
100100

articles/cost-management-billing/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
href: understand/review-partner-agreement-bill.md
2020
- name: Concepts
2121
items:
22+
- name: What is a cloud subscription
23+
href: manage/cloud-subscription.md
2224
- name: Individual subscription usage terms
2325
href: understand/understand-usage.md
2426
- name: Individual subscription invoice terms

0 commit comments

Comments
 (0)