Skip to content

Commit 8f004a9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-nw
2 parents 54203b4 + 624c951 commit 8f004a9

File tree

8 files changed

+48
-51
lines changed

8 files changed

+48
-51
lines changed

articles/ai-services/openai/quotas-limits.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ The following sections provide you with a quick guide to the default quotas and
2727
| OpenAI resources per region per Azure subscription | 30 |
2828
| Default DALL-E 2 quota limits | 2 concurrent requests |
2929
| Default DALL-E 3 quota limits| 2 capacity units (6 requests per minute)|
30+
| Default Whisper quota limits | 3 requests per minute |
3031
| Maximum prompt tokens per request | Varies per model. For more information, see [Azure OpenAI Service models](./concepts/models.md)|
3132
| Max fine-tuned model deployments | 5 |
3233
| Total number of training jobs per resource | 100 |
@@ -48,6 +49,7 @@ The following sections provide you with a quick guide to the default quotas and
4849
| GPT-4o max images per request (# of images in the messages array/conversation history) | 10 |
4950
| GPT-4 `vision-preview` & GPT-4 `turbo-2024-04-09` default max tokens | 16 <br><br> Increase the `max_tokens` parameter value to avoid truncated responses. GPT-4o max tokens defaults to 4096. |
5051

52+
5153
## Regional quota limits
5254

5355
[!INCLUDE [Quota](./includes/model-matrix/quota.md)]
@@ -99,7 +101,7 @@ If your Azure subscription is linked to certain [offer types](https://azure.micr
99101
|Azure for Students, Free Trials | 1 K (all models)|
100102
| Monthly credit card based accounts <sup>1</sup> | GPT 3.5 Turbo Series: 30 K <br> GPT-4 series: 8 K <br> |
101103

102-
<sup>1</sup>This currently applies to [offer type 0003P](https://azure.microsoft.com/support/legal/offer-details/)
104+
<sup>1</sup> This currently applies to [offer type 0003P](https://azure.microsoft.com/support/legal/offer-details/)
103105

104106
In the Azure portal you can view what offer type is associated with your subscription by navigating to your subscription and checking the subscriptions overview pane. Offer type corresponds to the plan field in the subscription overview.
105107

articles/azure-monitor/essentials/diagnostic-settings.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: robb
66
services: azure-monitor
77
ms.topic: conceptual
88
ms.custom:
9-
ms.date: 03/12/2024
9+
ms.date: 06/13/2024
1010
ms.reviewer: lualderm
1111
---
1212

@@ -39,9 +39,9 @@ Information on these newer features is included in this article.
3939

4040
There are three sources for diagnostic information:
4141

42-
- **[Platform metrics](./metrics-supported.md)** are sent automatically to [Azure Monitor Metrics](./data-platform-metrics.md) by default and without configuration.
43-
- **[Platform logs](./platform-logs-overview.md)** - provide detailed diagnostic and auditing information for Azure resources and the Azure platform they depend on.
44-
- **Resource logs** aren't collected until they're routed to a destination.
42+
- Platform metrics are sent automatically to [Azure Monitor Metrics](./data-platform-metrics.md) by default and without configuration. For more information on supported metrics, see [Supported metrics with Azure Monitor](./metrics-supported.md)
43+
- Platform logs provide detailed diagnostic and auditing information for Azure resources and the Azure platform they depend on.
44+
- **Resource logs** aren't collected until they're routed to a destination. For more information on supported logs, see [Supported Resource log categories for Azure Monitor](/azure/azure-monitor/reference/supported-logs/logs-index)
4545
- The **Activity log** provides information about resources from outside the resource, such as when the resource was created or deleted. Entries exist on their own but can be routed to other locations.
4646

4747
### Metrics

articles/cdn/cdn-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following table compares the features available with each product.
4848
| [Token authentication](cdn-token-auth.md) | | |**&#x2713;**|
4949
| [DDoS Protection](https://www.cisa.gov/news-events/news/understanding-denial-service-attacks) | **&#x2713;** |**&#x2713;** |**&#x2713;** |
5050
| [Bring your own certificate](cdn-custom-ssl.md?tabs=option-2-enable-https-with-your-own-certificate#tlsssl-certificates) |**&#x2713;** | **&#x2713;** | **&#x2713;** |
51-
| Supported TLS Versions | TLS 1.2, TLS 1.0/1.1 - [Configurable](/rest/api/cdn/custom-domains/enable-custom-https#usermanagedhttpsparameters) | TLS 1.2, TLS 1.3 | TLS 1.2, TLS 1.3 |
51+
| Supported TLS Versions | TLS 1.3, TLS 1.2, TLS 1.0/1.1 - [Configurable](/rest/api/cdn/custom-domains/enable-custom-https#usermanagedhttpsparameters) | TLS 1.2, TLS 1.3 | TLS 1.2, TLS 1.3 |
5252
||||
5353
| **Analytics and reporting** | **Standard Microsoft** | **Standard Edgio** | **Premium Edgio** |
5454
| [Azure diagnostic logs](cdn-azure-diagnostic-logs.md) | **&#x2713;** |**&#x2713;** |**&#x2713;** |

articles/open-datasets/dataset-boston-safety.md

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,36 @@ description: Learn how to use the Boston Safety Data dataset in Azure Open Datas
44
ms.service: open-datasets
55
ms.custom: devx-track-python
66
ms.topic: sample
7-
ms.date: 04/16/2021
7+
ms.reviewer: franksolomon
8+
ms.date: 06/13/2024
89
---
910

1011
# Boston Safety Data
1112

12-
311 calls reported to the city of Boston.
13-
14-
Refer to this link to learn more about [BOS:311](https://www.cityofboston.gov/311/).
13+
Boston 311 call data covers 311 nonemergency calls made to the Boston 311 call system. For more information, visit the [BOS:311](https://www.cityofboston.gov/311/) resource.
1514

1615
[!INCLUDE [Open Dataset usage notice](./includes/open-datasets-usage-note.md)]
1716

1817
## Volume and retention
1918

20-
This dataset is stored in Parquet format. It is updated daily, and contains about 100-K rows (10 MB) in total as of 2019.
21-
22-
This dataset contains historical records accumulated from 2011 to the present. You can use parameter settings in our SDK to fetch data within a specific time range.
19+
This dataset is stored in Parquet format. Starting in 2011, Boston provides its 311 data in different files, one file resource for each different year. The data is updated daily. The 2023 dataset contains about receives daily updates, and it contains about 313-K rows (179 MB) in total as of 2019. You can use parameter settings in our SDK to fetch data within a specific time range.
2320

2421
## Storage location
2522

26-
This dataset is stored in the East US Azure region. Allocating compute resources in East US is recommended for affinity.
23+
This dataset is stored in the East US Azure region. For affinity, we recommend allocation of compute resources in the East US region.
2724

2825
## Additional information
2926

30-
This dataset is sourced from city of Boston government. For more information, see [Boston's dataset site](https://data.boston.gov/dataset/311-service-requests). For dataset licensing, see [Open Data Commons Public Domain Dedication and License (ODC PDDL)](http://opendefinition.org/licenses/odc-pddl/).
27+
This dataset is sourced from the government of the City of Boston. For more information, visit the [Boston dataset site](https://data.boston.gov/dataset/311-service-requests). For dataset licensing information, visit the [Open Data Commons Public Domain Dedication and License (ODC PDDL)](http://opendefinition.org/licenses/odc-pddl/) resource.
3128

3229
## Columns
3330

3431
| Name | Data type | Unique | Values (sample) | Description |
3532
|-|-|-|-|-|
3633
| address | string | 140,612 | \" \" 1 City Hall Plz Boston MA 02108 | Location. |
3734
| category | string | 54 | Street Cleaning Sanitation | Reason of the service request. |
38-
| dataSubtype | string | 1 | 311_All | 311_All |
39-
| dataType | string | 1 | Safety | Safety |
35+
| dataSubtype | string | 1 | 311_All | "311_All" |
36+
| dataType | string | 1 | Safety | "Safety" |
4037
| dateTime | timestamp | 1,529,075 | 2015-07-23 10:51:00 2015-07-23 10:47:00 | Open date and time of the service request. |
4138
| latitude | double | 1,622 | 42.3594 42.3603 | This is the latitude value. Lines of latitude are parallel to the equator. |
4239
| longitude | double | 1,806 | -71.0587 -71.0583 | This is the longitude value. Lines of longitude run perpendicular to lines of latitude, and all pass through both poles. |
@@ -57,15 +54,12 @@ This dataset is sourced from city of Boston government. For more information, se
5754
| Safety | 311_All | 4/27/2021 11:05:00 PM | Enforcement & Abandoned Vehicles | Parking Enforcement | Open | 1 Nassau St Boston MA 02111 | 42.3486 | -71.0629 | Constituent Call | |
5855
| Safety | 311_All | 4/27/2021 11:00:55 PM | Code Enforcement | Poor Conditions of Property | Open | 17 Mercer St South Boston MA 02127 | 42.3332 | -71.0492 | Citizens Connect App | |
5956

60-
## Data access
61-
62-
### Azure Notebooks
57+
## Data access - Azure Notebooks
6358

6459
# [azureml-opendatasets](#tab/azureml-opendatasets)
6560

6661
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureNotebooks&package=azureml-opendatasets&registryId=city_safety_boston -->
6762

68-
6963
```
7064
# This is a package in preview.
7165
from azureml.opendatasets import BostonSafety
@@ -85,12 +79,10 @@ safety.info()
8579

8680
<!-- nbend -->
8781

88-
8982
# [azure-storage](#tab/azure-storage)
9083

9184
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureNotebooks&package=azure-storage&registryId=city_safety_boston -->
9285

93-
9486
```python
9587
# Pip install packages
9688
import os, sys
@@ -153,29 +145,26 @@ df
153145

154146
<!-- nbend -->
155147

156-
157148
# [pyspark](#tab/pyspark)
158149

159-
Sample not available for this platform/package combination.
150+
A sample isn't available for this platform / package combination.
160151

161152
---
162153

163-
### Azure Databricks
154+
## Data access - Azure Databricks
164155

165156
# [azureml-opendatasets](#tab/azureml-opendatasets)
166157

167158
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureDatabricks&package=azureml-opendatasets&registryId=city_safety_boston -->
168159

169-
170160
```
171161
# This is a package in preview.
172-
# You need to pip install azureml-opendatasets in Databricks cluster. https://learn.microsoft.com/azure/data-explorer/connect-from-databricks#install-the-python-library-on-your-azure-databricks-cluster
162+
# You need to pip install azureml-opendatasets in a Databricks cluster. https://learn.microsoft.com/azure/data-explorer/connect-from-databricks#install-the-python-library-on-your-azure-databricks-cluster
173163
from azureml.opendatasets import BostonSafety
174164
175165
from datetime import datetime
176166
from dateutil import parser
177167
178-
179168
end_date = parser.parse('2016-01-01')
180169
start_date = parser.parse('2015-05-01')
181170
safety = BostonSafety(start_date=start_date, end_date=end_date)
@@ -190,13 +179,12 @@ display(safety)
190179

191180
# [azure-storage](#tab/azure-storage)
192181

193-
Sample not available for this platform/package combination.
182+
A sample isn't available for this platform / package combination.
194183

195184
# [pyspark](#tab/pyspark)
196185

197186
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureDatabricks&package=pyspark&registryId=city_safety_boston -->
198187

199-
200188
```python
201189
# Azure storage access info
202190
blob_account_name = "azureopendatastorage"
@@ -231,20 +219,18 @@ display(spark.sql('SELECT * FROM source LIMIT 10'))
231219

232220
---
233221

234-
### Azure Synapse
222+
## Data access - Azure Synapse
235223

236224
# [azureml-opendatasets](#tab/azureml-opendatasets)
237225

238226
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureSynapse&package=azureml-opendatasets&registryId=city_safety_boston -->
239227

240-
241228
```python
242229
from azureml.opendatasets import BostonSafety
243230

244231
from datetime import datetime
245232
from dateutil import parser
246233

247-
248234
end_date = parser.parse('2016-01-01')
249235
start_date = parser.parse('2015-05-01')
250236
safety = BostonSafety(start_date=start_date, end_date=end_date)
@@ -259,13 +245,12 @@ display(safety)
259245

260246
# [azure-storage](#tab/azure-storage)
261247

262-
Sample not available for this platform/package combination.
248+
A sample isn't available for this platform / package combination.
263249

264250
# [pyspark](#tab/pyspark)
265251

266252
<!-- nbstart https://opendatasets-api.azure.com/discoveryapi/OpenDataset/DownloadNotebook?serviceType=AzureSynapse&package=pyspark&registryId=city_safety_boston -->
267253

268-
269254
```python
270255
# Azure storage access info
271256
blob_account_name = "azureopendatastorage"
@@ -302,9 +287,8 @@ display(spark.sql('SELECT * FROM source LIMIT 10'))
302287

303288
## Examples
304289

305-
- See the [City Safety Analytics](https://github.com/scottcounts/CitySafety) example on GitHub.
306-
290+
- Visit the [City Safety Analytics](https://github.com/scottcounts/CitySafety) resource available at GitHub.
307291

308292
## Next steps
309293

310-
View the rest of the datasets in the [Open Datasets catalog](dataset-catalog.md).
294+
View the rest of the datasets in the [Open Datasets catalog](./dataset-catalog.md).

articles/sentinel/connect-threat-intelligence-upload-api.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ ms.collection: usx-security
1515

1616
# Connect your threat intelligence platform to Microsoft Sentinel with the upload indicators API
1717

18-
Many organizations use threat intelligence platform (TIP) solutions to aggregate threat indicator feeds from various sources. From the aggregated feed, the data is curated to apply to security solutions such as network devices, EDR/XDR solutions, or SIEMs such as Microsoft Sentinel. The **Threat Intelligence Upload Indicators API** data connector allows you to use these solutions to import threat indicators into Microsoft Sentinel. This data connector uses the Sentinel upload indicators API to ingest threat intelligence indicators into Microsoft Sentinel. For more information, see [Threat Intelligence](understand-threat-intelligence.md).
18+
Many organizations use threat intelligence platform (TIP) solutions to aggregate threat indicator feeds from various sources. From the aggregated feed, the data is curated to apply to security solutions such as network devices, EDR/XDR solutions, or SIEMs such as Microsoft Sentinel. The **Threat Intelligence Upload Indicators API** allows you to use these solutions to import threat indicators into Microsoft Sentinel. The upload indicators API ingests threat intelligence indicators into Microsoft Sentinel without the need of the data connector. The data connector only mirrors the instructions for connecting to the API endpoint detailed in this article and the supplemental API reference document [Microsoft Sentinel upload indicators API](upload-indicators-api.md).
1919

2020
:::image type="content" source="media/connect-threat-intelligence-upload-api/threat-intel-upload-api.png" alt-text="Threat intelligence import path":::
2121

22+
For more information about threat intelligence, see [Threat Intelligence](understand-threat-intelligence.md).
23+
2224
> [!IMPORTANT]
23-
> The Microsoft Sentinel upload indicators API and **Threat Intelligence Upload Indicators API** data connector are in **PREVIEW**. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for additional legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
25+
> The Microsoft Sentinel **Threat Intelligence Upload Indicators API** is in **PREVIEW**. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for additional legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
2426
>
2527
> [!INCLUDE [unified-soc-preview-without-alert](includes/unified-soc-preview-without-alert.md)]
2628
@@ -29,7 +31,7 @@ Many organizations use threat intelligence platform (TIP) solutions to aggregate
2931
**See also**: [Connect Microsoft Sentinel to STIX/TAXII threat intelligence feeds](connect-threat-intelligence-taxii.md)
3032

3133
## Prerequisites
32-
- In order to install, update and delete standalone content or solutions in content hub, you need the **Microsoft Sentinel Contributor** role at the resource group level.
34+
- In order to install, update and delete standalone content or solutions in content hub, you need the **Microsoft Sentinel Contributor** role at the resource group level. Keep in mind, you don't need to install the data connector to use the API endpoint.
3335
- You must have read and write permissions to the Microsoft Sentinel workspace to store your threat indicators.
3436
- You must be able to register a Microsoft Entra application.
3537
- The Microsoft Entra application must be granted the Microsoft Sentinel contributor role at the workspace level.
@@ -41,7 +43,6 @@ Follow these steps to import threat indicators to Microsoft Sentinel from your i
4143
1. Register a Microsoft Entra application and record its application ID.
4244
1. Generate and record a client secret for your Microsoft Entra application.
4345
1. Assign your Microsoft Entra application the Microsoft Sentinel contributor role or equivalent.
44-
1. Enable the Threat Intelligence upload API data connector in Microsoft Sentinel.
4546
1. Configure your TIP solution or custom application.
4647

4748
<a name='register-an-azure-ad-application'></a>
@@ -81,9 +82,9 @@ The upload indicators API ingests threat indicators at the workspace level and a
8182

8283
For more information on assigning roles to applications, see [Assign a role to the application](../active-directory/develop/howto-create-service-principal-portal.md#assign-a-role-to-the-application).
8384

84-
## Enable the Threat Intelligence upload indicators API data connector in Microsoft Sentinel
85+
## Install the Threat Intelligence upload indicators API data connector in Microsoft Sentinel (optional)
8586

86-
Enable the **Threat Intelligence Upload Indicators API** data connector to allow Microsoft Sentinel to receive threat indicators sent from your TIP or custom solution. These indicators are available to the Microsoft Sentinel workspace you configure.
87+
Install the **Threat Intelligence Upload Indicators API** data connector to see the API connection instructions from your Microsoft Sentinel workspace.
8788

8889
1. For Microsoft Sentinel in the [Azure portal](https://portal.azure.com), under **Content management**, select **Content hub**. <br>For Microsoft Sentinel in the [Defender portal](https://security.microsoft.com/), select **Microsoft Sentinel** > **Content management** > **Content hub**.
8990

articles/sentinel/upload-indicators-api.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,23 @@ There are two versions of the upload indicators API. Depending on the endpoint,
6868

6969
- Connector action name: **Threat Intelligence - Upload Indicators of Compromise (Deprecated)**
7070
- Endpoint: `https://sentinelus.azure-api.net/{workspaceId}/threatintelligence:upload-indicators`
71-
- array of indicators name: `value`
71+
- Array of indicators name: `value`
72+
```json
73+
{
74+
"sourcesystem":"TIsource-example",
75+
"value":[]
76+
}
77+
```
7278

7379
- Connector action name: **Threat Intelligence - Upload Indicators of Compromise (V2) (Preview)**
7480
- Endpoint: `https://sentinelus.azure-api.net/{workspaceId}/threatintelligenceindicators:upload`
75-
- array of indicators name: `indicators`
76-
81+
- Array of indicators name: `indicators`
82+
```json
83+
{
84+
"sourcesystem":"TIsource-example",
85+
"indicators":[]
86+
}
87+
```
7788

7889
#### Request URI
7990
API versioning: `api-version=2022-07-01`<br>

articles/virtual-machines/extensions/agent-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Testing has confirmed that the following systems work with the Azure Linux VM Ag
8282
| Red Hat Enterprise Linux | 6.7+, 7.x+, 8.x+, 9.x+ | 8.6+, 9.0+ |
8383
| Rocky Linux | 9.x+ | 9.x+ |
8484
| SLES | 12.x+, 15.x+ | 15.x SP4+ |
85-
| Ubuntu (LTS releases)| 18.04+, 20.04+, 22.04+ | 20.04+, 22.04+ |
85+
| Ubuntu (LTS releases)| 18.04+, 20.04+, 22.04+, 24.04+ | 20.04+, 22.04+, 24.04+ |
8686

8787
> [!IMPORTANT]
8888
> RHEL/Oracle Linux 6.10 is the only RHEL/OL 6 version with Extended Lifecycle Support available. [The extended maintenance ends on June 30, 2024](https://access.redhat.com/support/policy/updates/errata).

includes/disks-prem-v2-limitations.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ ms.custom:
1818
- Azure Disk Encryption (guest VM encryption via Bitlocker/DM-Crypt) isn't supported for VMs with Premium SSD v2 disks. We recommend you to use encryption at rest with platform-managed or customer-managed keys, which is supported for Premium SSD v2.
1919
- Currently, Premium SSD v2 disks can't be attached to VMs in Availability Sets.
2020
- Azure Site Recovery isn't supported for VMs with Premium SSD v2 disks.
21-
- Azure Backup support for VMs with Premium SSD v2 disks is [generally available](/azure/backup/backup-support-matrix-iaas#vm-storage-support).
2221
- The size of a Premium SSD v2 can't be expanded without either deallocating the VM or detaching the disk.
23-
- Premium SSDv2 doesn't support host caching.
22+
- Premium SSDv2 doesn't support host caching.

0 commit comments

Comments
 (0)