Skip to content

Commit 08b5f94

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/analytics-rules-conceptual
2 parents 40583a9 + ad9f226 commit 08b5f94

File tree

6 files changed

+99
-69
lines changed

6 files changed

+99
-69
lines changed

articles/azure-functions/functions-reference-python.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ This feature makes it possible to handle large data stream, OpenAI integrations,
539539

540540
### Enable HTTP streams
541541

542-
HTTP streams are disabled by default. You need to enable this feature in your application settings and also update your code to use the FastAPI package.
542+
HTTP streams are disabled by default. You need to enable this feature in your application settings and also update your code to use the FastAPI package. Note that when enabling HTTP streams, the function app will default to using HTTP streaming, and the original HTTP functionality will not work.
543543

544544
1. Add the `azurefunctions-extensions-http-fastapi` extension package to the `requirements.txt` file in the project, which should include at least these packages:
545545

@@ -549,10 +549,13 @@ HTTP streams are disabled by default. You need to enable this feature in your ap
549549

550550
:::code language="python" source="~/functions-python-extensions/azurefunctions-extensions-http-fastapi/samples/fastapi_samples_streaming_download/function_app.py" range="8" :::
551551

552-
1. When you deploy to Azure, add these [application settings](./functions-how-to-use-azure-function-app-settings.md#settings) in your function app:
552+
1. When you deploy to Azure, add the following [application setting](./functions-how-to-use-azure-function-app-settings.md#settings) in your function app:
553553

554-
+ `"PYTHON_ISOLATE_WORKER_DEPENDENCIES": "1"`
555-
+ `"PYTHON_ENABLE_INIT_INDEXING": "1"`
554+
`"PYTHON_ENABLE_INIT_INDEXING": "1"`
555+
556+
If you are deploying to Linux Consumption, also add
557+
558+
`"PYTHON_ISOLATE_WORKER_DEPENDENCIES": "1"`
556559

557560
When running locally, you also need to add these same settings to the `local.settings.json` project file.
558561

articles/defender-for-cloud/prepurchase-plan.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@
22
title: Optimize Microsoft Defender for Cloud costs with a prepurchase plan
33
description: Learn how you can optimize Microsoft Defender for Cloud costs with a prepurchase plan.
44
ms.topic: how-to
5+
ms.reviewer: liuyizhu
6+
ms.service: cost-management-billing
7+
ms.subservice: reservations
58
ms.date: 05/15/2024
69
---
710

811
# Optimize Microsoft Defender for Cloud costs with a prepurchase plan
912

10-
You can save on your Microsoft Defender for Cloud costs when you prepurchase Microsoft Defender for Cloud commit units (MCU) for one year. You can use the prepurchased MCUs at any time during the purchase term. Unlike VMs, the prepurchased units don't expire on an hourly basis and you can use them at any time during the term of the purchase.
13+
You can save on your Microsoft Defender for Cloud costs when you prepurchase Microsoft Defender for Cloud commit units (DCU) for one year. You can use the prepurchased DCUs at any time during the purchase term. Unlike VMs, the prepurchased units don't expire on an hourly basis and you can use them at any time during the term of the purchase.
1114

12-
Any eligible Microsoft Defender for Cloud usage deducts from the prepurchased MCUs automatically. You don't need to redeploy or assign a prepurchased plan to your Microsoft Defender for Cloud workspaces for the MCU usage to get the prepurchase discounts.
15+
Any eligible Microsoft Defender for Cloud usage deducts from the prepurchased DCUs automatically. You don't need to redeploy or assign a prepurchased plan to your Microsoft Defender for Cloud workspaces for the DCU usage to get the prepurchase discounts.
1316

1417
## Determine the right size to buy
1518

1619
A Defender for Cloud prepurchase applies to all Defender for Cloud plans. You can think of the prepurchase as a pool of prepaid Defender for Cloud commit units. Usage is deducted from the pool, regardless of the workload.
1720

18-
There’s no ratio on which the MCUs are applied. MCUs are equivalent to the purchase currency value and are deducted at retail prices. Like other reservations, the benefit of a prepurchase plan is discounted pricing by committing to a purchase term. The more you buy, the larger the discount you receive.
21+
There’s no ratio on which the DCUs are applied. DCUs are equivalent to the purchase currency value and are deducted at retail prices. Like other reservations, the benefit of a prepurchase plan is discounted pricing by committing to a purchase term. The more you buy, the larger the discount you receive.
1922

20-
For example, if you purchase 5,000 Commit Units for a one year term, you get a 20% discount on Defender for Cloud products at this tier, so you pay only 4,000 USD. You can use these units with Defender for Servers P2 and Defender CSPM plans on 20 Virtual machines (Azure VMs) for one year, which uses up 4800 Commit units. In this example, we use $15/$5 monthly retail price and 1 MCU = $1.
23+
For example, if you purchase 5,000 Commit Units for a one year term, you get a 20% discount on Defender for Cloud products at this tier, so you pay only 4,000 USD. You can use these units with Defender for Servers P2 and Defender CSPM plans on 20 Virtual machines (Azure VMs) for one year, which uses up 4800 Commit units. In this example, we use $15/$5 monthly retail price and 1 DCU = $1.
2124

2225
> [!NOTE]
2326
> The mentioned prices are for example purposes only. They aren't intended to represent actual costs.
@@ -38,7 +41,7 @@ The Microsoft Defender for Cloud prepurchase discount applies to usage from the
3841
- Microsoft Defender CSPM
3942
- Microsoft Defender for APIs
4043

41-
For more information about available MCU tiers and pricing discounts, see the reservation purchase experience in the following section.
44+
For more information about available DCU tiers and pricing discounts, see the reservation purchase experience in the following section.
4245

4346
## Purchase Defender for Cloud commit units
4447

articles/dev-box/tutorial-configure-multiple-monitors.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: dev-box
66
ms.service: dev-box
77
ms.author: rosemalcolm
88
author: RoseHJM
9-
ms.date: 05/29/2024
9+
ms.date: 05/30/2024
1010
ms.topic: tutorial
1111

1212
#Customer intent: As a dev box user, I want to use multiple monitors when connecting to my dev box so that I can have more screen real estate to work with.
@@ -91,6 +91,11 @@ Use the following steps to configure Remote Desktop to use multiple monitors.
9191

9292
---
9393

94+
> [!TIP]
95+
> For more information about the Microsoft remote desktop clients currently available, see:
96+
> - [Remote Desktop clients for Remote Desktop Services and remote PCs](https://aka.ms/rdapps)
97+
> - [Connect to Azure Virtual Desktop with the Remote Desktop client for Windows](/azure/virtual-desktop/users/connect-windows)
98+
9499
## Clean up resources
95100

96101
Dev boxes incur costs whenever they're running. When you finish using your dev box, shut down or stop it to avoid incurring unnecessary costs.
Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
---
2-
title: Access DICOMweb APIs with the DICOM service in Azure Health Data Services
3-
description: Learn how to use the DICOMweb APIs to store, review, search, and delete DICOM objects with the DICOM service. The DICOM service also offers custom APIs for tracking changes and defining custom tags for DICOM data.
2+
title: Access DICOMweb APIs to manage DICOM data in Azure Health Data Services
3+
description: Learn how to use DICOMweb APIs to store, review, search, and delete DICOM objects. Learn how to use custom APIs to track changes and assign unique tags to DICOM data.
44
author: mmitrik
55
ms.service: healthcare-apis
66
ms.subservice: dicom
77
ms.topic: tutorial
8-
ms.date: 10/13/2022
8+
ms.date: 05/29/2024
99
ms.author: mmitrik
1010
---
1111

12-
# Access DICOMweb APIs with the DICOM service
12+
# Access DICOMweb APIs to manage DICOM data
1313

14-
The DICOM® service allows you to store, review, search, and delete DICOM objects by using a subset of DICOMweb APIs, which are web-based services that follow the DICOM standard. By using these APIs, you can access and manage your organization's DICOM data in the cloud without requiring complex protocols or formats.
14+
The DICOM® service allows you to store, review, search, and delete DICOM objects by using a subset of DICOMweb APIs. The DICOMweb APIs are web-based services that follow the DICOM standard. By using these APIs, you can access and manage your organization's DICOM data without requiring complex protocols or formats.
1515

1616
The supported services are:
1717

18-
* [Store (STOW-RS)](dicom-services-conformance-statement-v2.md#store-stow-rs): Upload DICOM objects to the server.
19-
* [Retrieve (WADO-RS)](dicom-services-conformance-statement-v2.md#retrieve-wado-rs): Download DICOM objects from the server.
20-
* [Search (QIDO-RS)](dicom-services-conformance-statement-v2.md#search-qido-rs): Find DICOM objects on the server based on criteria.
21-
* [Delete](dicom-services-conformance-statement-v2.md#delete): Remove DICOM objects from the server.
18+
- [Store (STOW-RS)](dicom-services-conformance-statement-v2.md#store-stow-rs): Upload DICOM objects to the server.
19+
- [Retrieve (WADO-RS)](dicom-services-conformance-statement-v2.md#retrieve-wado-rs): Download DICOM objects from the server.
20+
- [Search (QIDO-RS)](dicom-services-conformance-statement-v2.md#search-qido-rs): Find DICOM objects on the server based on criteria.
21+
- [Delete](dicom-services-conformance-statement-v2.md#delete): Remove DICOM objects from the server.
22+
- [Worklist Service (UPS Push and Pull SOPs)](dicom-services-conformance-statement-v2.md#worklist-service-ups-rs): Manage and track medical imaging workflows.
2223

23-
In addition to the subset of DICOMweb APIs, the DICOM service supports two custom APIs that are unique to Microsoft:
24+
In addition to the subset of DICOMweb APIs, the DICOM service supports these custom APIs that are unique to Microsoft:
2425

25-
* [Change feed](change-feed-overview.md): Track changes to DICOM data over time.
26-
* [Extended query tags](dicom-extended-query-tags-overview.md): Define custom tags for querying DICOM data.
27-
* [Bulk update](update-files.md)
28-
* [Bulk import](import-files.md)
29-
* [Export](export-dicom-files.md)
26+
- [Change feed](change-feed-overview.md): Track changes to DICOM data over time.
27+
- [Extended query tags](dicom-extended-query-tags-overview.md): Define custom tags for querying DICOM data.
28+
- [Bulk update](update-files.md)
29+
- [Bulk import](import-files.md)
30+
- [Export](export-dicom-files.md)
3031

3132
## Prerequisites
3233

@@ -36,23 +37,23 @@ In addition to the subset of DICOMweb APIs, the DICOM service supports two custo
3637

3738
## Use REST API methods to interact with the DICOM service
3839

39-
The DICOM service provides a web-based interface that follows REST (representational state transfer) principles. The REST API allows different applications or systems to communicate with each other using standard methods like GET, POST, PUT, and DELETE. Use any programming language that supports HTTP requests and responses to interact with the DICOM service.
40+
The DICOM service provides a web-based interface that follows REST (representational state transfer) principles. The REST API allows different applications or systems to communicate with each other using standard methods like GET, POST, PUT, and DELETE. To interact with the DICOM service, use any programming language that supports HTTP requests and responses.
4041

41-
For language-specific examples, refer to the examples. You can view Postman collection examples in several languages including:
42+
Refer to the language-specific examples. You can view Postman collection examples in several languages including:
4243

43-
* Go
44-
* Java
45-
* JavaScript
46-
* C#
47-
* PHP
48-
* C
49-
* NodeJS
50-
* Objective-C
51-
* OCaml
52-
* PowerShell
53-
* Python
54-
* Ruby
55-
* Swift
44+
- Go
45+
- Java
46+
- JavaScript
47+
- C#
48+
- PHP
49+
- C
50+
- NodeJS
51+
- Objective-C
52+
- OCaml
53+
- PowerShell
54+
- Python
55+
- Ruby
56+
- Swift
5657

5758
### C#
5859

@@ -62,28 +63,30 @@ Refer to [Use DICOMweb Standard APIs with C#](dicomweb-standard-apis-c-sharp.md)
6263

6364
cURL is a common command-line tool for calling web endpoints and is available for most operating systems. To get started, [download cURL](https://curl.haxx.se/download.html).
6465

65-
To learn how to use cURL with DICOM service, see [Using DICOMWeb™ Standard APIs with cURL](dicomweb-standard-apis-curl.md) tutorial.
66+
To learn how to use cURL with the DICOM service, see [Using DICOMWeb™ Standard APIs with cURL](dicomweb-standard-apis-curl.md).
6667

6768
### Python
6869

69-
Refer to the [Using DICOMWeb™ Standard APIs with Python](dicomweb-standard-apis-python.md) tutorial to learn how to use Python with the DICOM service.
70+
For more information about how to use Python with the DICOM service, see [Using DICOMWeb™ Standard APIs with Python](dicomweb-standard-apis-python.md).
7071

7172
### Postman
7273

73-
Postman is an excellent tool for designing, building, and testing REST APIs. [Download Postman](https://www.postman.com/downloads/) to get started. Learn how to use Postman at the [Postman learning site](https://learning.postman.com/).
74+
Postman is an excellent tool for designing, building, and testing REST APIs. [Download Postman](https://www.postman.com/downloads/) to get started. For more information, see [Postman learning site](https://learning.postman.com/).
7475

75-
One important caveat with Postman and the DICOMweb Standard is that Postman only supports uploading DICOM files using the single part payload defined in the DICOM standard. This reason is because Postman can't support custom separators in a multipart/related POST request. For more information, see [Multipart POST not working for me # 576](https://github.com/postmanlabs/postman-app-support/issues/576). All examples in the Postman collection for uploading DICOM documents using a multipart request are prefixed with **[won't work - see description]**. The examples for uploading using a single-part request are included in the collection and are prefixed with **Store-Single-Instance**.
76+
One important caveat with Postman and the DICOMweb standard is that Postman only supports uploading DICOM files by using the single-part payload defined in the DICOM standard. This caveat is because Postman can't support custom separators in a multipart/related POST request. For more information, see [Multipart POST not working for me # 576](https://github.com/postmanlabs/postman-app-support/issues/576). All examples in the Postman collection for uploading DICOM documents by using a multipart request are prefixed with **[won't work - see description]**. The examples for uploading by using a single-part request are included in the collection and are prefixed with **Store-Single-Instance**.
7677

77-
To use the Postman collection, you need to download the collection locally and import the collection through Postman. To access this collection, see [Postman Collection Examples](https://github.com/microsoft/dicom-server/blob/main/docs/resources/Conformance-as-Postman.postman_collection.json).
78+
To use the Postman collection, download it locally and then import the collection through Postman. To access the collection, see [Postman Collection Examples](https://github.com/microsoft/dicom-server/blob/main/docs/resources/Conformance-as-Postman.postman_collection.json).
7879

7980
### Next steps
80-
Check out these examples of how to use the APIs:
8181

82-
- [Using DICOMweb™ Standard APIs with C#](dicomweb-standard-apis-c-sharp.md)
83-
- [Using DICOMWeb™ Standard APIs with cURL](dicomweb-standard-apis-curl.md)
84-
- [Using DICOMWeb™ Standard APIs with Python](dicomweb-standard-apis-python.md)
85-
- [Use DICOMWeb™ Standard APIs with the Postman Example Collection](https://github.com/microsoft/dicom-server/blob/main/docs/resources/Conformance-as-Postman.postman_collection.json)
82+
[Use DICOMweb Standard APIs with C#](dicomweb-standard-apis-c-sharp.md)
8683

87-
Learn more about Microsoft support for DICOM Web Standard APIs in the [DICOM Conformance Statement](dicom-services-conformance-statement-v2.md).
84+
[Use DICOMweb Standard APIs with cURL](dicomweb-standard-apis-curl.md)
85+
86+
[Use DICOMweb Standard APIs with Python](dicomweb-standard-apis-python.md)
87+
88+
[Use DICOMWeb Standard APIs with the Postman Example Collection](https://github.com/microsoft/dicom-server/blob/main/docs/resources/Conformance-as-Postman.postman_collection.json)
89+
90+
[DICOM Conformance Statement](dicom-services-conformance-statement-v2.md)
8891

8992
[!INCLUDE [DICOM trademark statement](../includes/healthcare-apis-dicom-trademark.md)]

articles/healthcare-apis/dicom/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ items:
2424
- name: Register a client application
2525
href: dicom-register-application.md
2626
- name: Tutorials
27-
expanded: true
28-
items:
27+
expanded: false
28+
items:
2929
- name: Use DICOM data in analytics workloads
3030
href: get-started-with-analytics-dicom.md
3131
- name: Use the DICOM service for digital pathology

articles/static-web-apps/quotas.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,37 @@ services: static-web-apps
55
author: craigshoemaker
66
ms.service: static-web-apps
77
ms.topic: overview
8-
ms.date: 02/09/2023
8+
ms.date: 05/30/2024
99
ms.author: cshoe
1010
---
1111

1212
# Quotas in Azure Static Web Apps
1313

14-
The following quotas exist for Azure Static Web Apps.
15-
16-
| Feature | Free plan | Standard plan |
17-
|-----------------------------|------------------|---------------|
18-
| Included bandwidth | 100 GB per month, per subscription | 100 GB per month, per subscription |
19-
| Overage bandwidth | Unavailable | $0.20 per GB |
20-
| Apps per Azure subscription | 10 | Unlimited |
21-
| Storage | • 500 MB max for all staging and production environments<br><br>• 250 MB max per app | • 2 GB max for all staging and production environments<br><br>• 500 MB max per app |
22-
| Pre-production environments | 3 | 10 |
23-
| Custom domains | 2 per app | 5 per app |
24-
| Allowed IP ranges | Unavailable | 25 |
25-
| Authorization (built-in roles) | Unlimited end-users that may authenticate with built-in `authenticated` role | Unlimited end-users that may authenticate with built-in `authenticated` role |
26-
| Authorization (custom roles) | Maximum of 25 end-users that may belong to custom roles via [invitations](authentication-custom.md#manage-roles) | Maximum of 25 end-users that may belong to custom roles via [invitations](authentication-custom.md#manage-roles), or unlimited end-users that may be assigned custom roles via [serverless function](authentication-custom.md#manage-roles) |
27-
| Request Size Limit | 30 MB | 30 MB |
28-
| File count | 15,000 | 15,000|
14+
Subscription limits:
15+
16+
| Feature | Free plan | Standard plan | Dedicated plan (Preview) |
17+
|-------------------------------------|-------------|---------------|--------------------------|
18+
| Included bandwidth (per month) | 100 GB | 100 GB | 100 GB |
19+
| Overage bandwidth | Unavailable | $0.20 per GB | $0.20 per GB |
20+
| Apps | 10 | 100 | 1 |
21+
22+
If you need more apps on the Standard plan, contact Azure Support.
23+
24+
App limits:
25+
26+
| Feature | Free plan | Standard plan | Dedicated plan (Preview) |
27+
|-------------------------------------|-------------|---------------|--------------------------|
28+
| [Preview environments][3] | 3 | 10 | 10 |
29+
| Total storage (all environments) | 500 MB | 2 GB | 2 GB |
30+
| Storage (single environment) | 250 MB | 500 MB | 500 MB |
31+
| File count | 15,000 | 15,000 | 15,000 |
32+
| [Custom domains][1] | 2 | 5 | 5 |
33+
| [Private endpoint][4] | Unavailable | 1 | 1 |
34+
| Allowed IP range restrictions | Unavailable | 25 | 25 |
35+
| [Authorization (custom roles)][2] | | | |
36+
| &nbsp;&nbsp;&nbsp;&nbsp;via invitations | 25 | 25 | 25 |
37+
| &nbsp;&nbsp;&nbsp;&nbsp;via serverless functions | Unavailable | Unlimited | Unlimited |
38+
| Request Size Limit | 30 MB | 30 MB | 30 MB |
2939

3040
## GitHub storage
3141

@@ -40,3 +50,9 @@ See the following resources for more detail:
4050
## Next steps
4151

4252
- [Azure Static Web Apps overview](overview.md)
53+
54+
<!-- Links -->
55+
[1]: custom-domain.md
56+
[2]: authentication-custom.md#manage-roles
57+
[3]: preview-environments.md
58+
[4]: private-endpoint.md

0 commit comments

Comments
 (0)