Skip to content

Commit f76caa4

Browse files
authored
Merge pull request #241541 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents b959245 + 95e6d7f commit f76caa4

File tree

4 files changed

+13
-50
lines changed

4 files changed

+13
-50
lines changed

articles/azure-maps/how-to-create-data-registries.md

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Create Data Registry (preview)
2+
title: Create Data Registry
33
titleSuffix: Azure Maps
44
description: Learn how to create Data Registry.
55
author: faterceros
66
ms.author: aterceros
7-
ms.date: 2/14/2023
7+
ms.date: 6/14/2023
88
ms.topic: how-to
99
ms.service: azure-maps
1010
services: azure-maps
1111
---
1212

13-
# How to create data registry (preview)
13+
# How to create data registry
1414

1515
The [data registry] service enables you to register data content in an Azure Storage Account with your Azure Maps account. An example of data might include a collection of Geofences used in the Azure Maps Geofencing service. Another example is ZIP files containing drawing packages (DWG) or GeoJSON files that Azure Maps Creator uses to create or update indoor maps.
1616

@@ -221,7 +221,7 @@ To create a data registry:
221221
1. Once you have the body of your HTTP request ready, execute the following **HTTP PUT request**:
222222

223223
```http
224-
https://us.atlas.microsoft.com/dataRegistries/{udid}?api-version=2022-12-01-preview&subscription-key={Your-Azure-Maps-Subscription-key}
224+
https://us.atlas.microsoft.com/dataRegistries/{udid}?api-version=2023-06-01&subscription-key={Your-Azure-Maps-Subscription-key}
225225

226226
```
227227

@@ -241,15 +241,15 @@ The value of the **Operation-Location** key is the status URL that you'll use to
241241
To (optionally) check the status of the data registry creation process, enter the status URL you copied in the [Create a data registry](#create-a-data-registry) section, and add your subscription key as a query string parameter. The request should look similar to the following URL:
242242

243243
```http
244-
https://us.atlas.microsoft.com/dataRegistries/operations/{udid}?api-version=2022-12-01-preview&subscription-key={Your-Azure-Maps-Primary-Subscription-key}
244+
https://us.atlas.microsoft.com/dataRegistries/operations/{udid}?api-version=2023-06-01&subscription-key={Your-Azure-Maps-Primary-Subscription-key}
245245
```
246246

247247
## Get a list of all files in the data registry
248248

249249
Use the [List][list] request to get a list of all files registered in an Azure Maps account:
250250

251251
```http
252-
https://us.atlas.microsoft.com/dataRegistries?api-version=2022-12-01-preview&subscription-key={Azure-Maps-Subscription-key}
252+
https://us.atlas.microsoft.com/dataRegistries?api-version=2023-06-01&subscription-key={Azure-Maps-Subscription-key}
253253
```
254254

255255
The following sample demonstrates three possible statuses, completed, running and failed:
@@ -266,7 +266,6 @@ The following sample demonstrates three possible statuses, completed, running an
266266
"msiClientId": "3263cad5-ed8b-4829-b72b-3d1ba556e373",
267267
"linkedResource": "my-storage-account",
268268
"blobUrl": "https://mystorageaccount.blob.core.windows.net/my-container/my/blob/path1.zip",
269-
"downloadURL": "https://us.atlas.microsoft.com/dataRegistries/f6495f62-94f8-0ec2-c252-45626f82fcb2/content?api-version=2022-12-01-preview",
270269
"sizeInBytes": 29920,
271270
"contentMD5": "CsFxZ2YSfxw3cRPlqokV0w=="
272271
},
@@ -280,7 +279,6 @@ The following sample demonstrates three possible statuses, completed, running an
280279
"msiClientId": "3263cad5-ed8b-4829-b72b-3d1ba556e373",
281280
"linkedResource": "my-storage-account",
282281
"blobUrl": "https://mystorageaccount.blob.core.windows.net/my-container/my/blob/path2.geojson",
283-
"downloadURL": "https://us.atlas.microsoft.com/dataRegistries/8b1288fa-1958-4a2b-b68e-13a7i5af7d7c/content?api-version=2022-12-01-preview",
284282
"sizeInBytes": 1339
285283
},
286284
"status": "Running"
@@ -293,7 +291,6 @@ The following sample demonstrates three possible statuses, completed, running an
293291
"dataFormat": "geojson",
294292
"linkedResource": "my-storage-account",
295293
"blobUrl": "https://mystorageaccount.blob.core.windows.net/my-container/my/blob/path3.geojson",
296-
"downloadURL": "https://us.atlas.microsoft.com/dataRegistries/7c1288fa-2058-4a1b-b68f-13a6h5af7d7c/content?api-version=2022-12-01-preview",
297294
"sizeInBytes": 1650,
298295
"contentMD5": "rYpEfIeLbWZPyaICGEGy3A=="
299296
},
@@ -312,47 +309,8 @@ The data returned when running the list request is similar to the data provided
312309
| property | description |
313310
|-------------|-----------------------------------|
314311
| contentMD5 | MD5 hash created from the contents of the file being registered. For more information, see [Data validation](#data-validation) |
315-
| downloadURL | The download URL of the underlying data. Used to [Get content from a data registry](#get-content-from-a-data-registry). |
316312
| sizeInBytes | The size of the content in bytes. |
317313

318-
## Get content from a data registry
319-
320-
Once you've uploaded one or more files to an Azure storage account, created and Azure Maps datastore to link to those files, then registered them using the [register] API, you can access the data contained in the files.
321-
322-
Use the `udid` to get the content of a file registered in an Azure Maps account:
323-
324-
```http
325-
https://us.atlas.microsoft.com/dataRegistries/{udid}/content?api-version=2022-12-01-preview&subscription-key={Your-Azure-Maps-Subscription-key}
326-
```
327-
328-
The contents of the file appear in the body of the response. For example, a text based GeoJSON file appears similar to the following example:
329-
330-
```json
331-
{
332-
"type": "FeatureCollection",
333-
"features": [
334-
{
335-
"type": "Feature",
336-
"geometry": {
337-
"type": "Point",
338-
"coordinates": [
339-
-122.126986,
340-
47.639754
341-
]
342-
},
343-
"properties": {
344-
"geometryId": "001",
345-
"radius": 500
346-
}
347-
}
348-
]
349-
}
350-
```
351-
352-
The file type is returned in the `content-type` key of the response header.
353-
354-
Both text and binary files can be saved to a local hard drive or used directly in other processes like importing into the Azure Maps Creator conversion process.
355-
356314
## Replace a data registry
357315

358316
If you need to replace a previously registered file with another file, rerun the register request, passing in the same [AzureBlob](#the-azureblob) used to create the original registration, except for the [blobUrl](#the-bloburl-property). The `BlobUrl` needs to be modified to point to the new file.

articles/cosmos-db/continuous-backup-restore-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Currently, you can restore an Azure Cosmos DB account (API for NoSQL or MongoDB,
3939
By default, Azure Cosmos DB stores continuous mode backup data in locally redundant storage blobs. For the regions that have zone redundancy configured, the backup is stored in zone-redundant storage blobs. In continuous backup mode, you can't update the backup storage redundancy.
4040

4141
## Different ways to restore
42-
Continuous backup mode supports two ways to restore deleted containers, databases. Existing restore mechanism restores into a [new account](restore-account-continuous-backup.md) as documented here. Restore into existing account is described [here](restore-account-continuous-backup.md). The choice between two depends on the scenarios and impact. Most of the deleted containers, databases can prefer in-account (existing) account restore to prevent data transfer which is required in case you restored to a new account. For scenarios where you have modified the data accidently restore into new account is the right thing to do.
42+
Continuous backup mode supports two ways to restore deleted containers, databases. Existing restore mechanism restores into a [new account](restore-account-continuous-backup.md) as documented here. Restore into existing account is described [here](restore-account-continuous-backup.md). The choice between two depends on the scenarios and impact. Most of the deleted containers, databases can prefer in-account (existing) account restore to prevent data transfer which is required in case you restored to a new account. For scenarios where you have modified the data accidentally restore into new account is the right thing to do.
4343

4444
## What is restored into a new account?
4545

articles/service-health/resource-health-checks-resource-types.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ Below is a complete list of all the checks executed through resource health by r
175175
|---|
176176
|<ul><li>Is performance of the Application Gateway degraded?</li><li>Is the Application Gateway available?</li></ul>|
177177

178+
## Microsoft.network/azureFirewalls
179+
|Executed Checks|
180+
|---|
181+
|<ul><li>Are there enough remaining available ports to perform Source NAT?</li><li>Are there enough remaining available connections?</li></ul>|
182+
178183
## Microsoft.network/bastionhosts
179184
|Executed Checks|
180185
|---|

articles/synapse-analytics/security/synapse-workspace-ip-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article will explain IP firewall rules and teach you how to configure them
1616

1717
## IP firewall rules
1818

19-
IP firewall rules grant or deny access to your Azure Synapse workspace based on the originating IP address of each request. You can configure IP firewall rules for your workspace. IP firewall rules configured at the workspace level apply to all public endpoints of the workspace (dedicated SQL pools, serverless SQL pool, and development).
19+
IP firewall rules grant or deny access to your Azure Synapse workspace based on the originating IP address of each request. You can configure IP firewall rules for your workspace. IP firewall rules configured at the workspace level apply to all public endpoints of the workspace (dedicated SQL pools, serverless SQL pool, and development). The maximum number of IP firewall rules is limited to 128. If you have the **Allow Azure Services and resources to access this server** setting enabled, this counts as a single firewall rule for the workspace.
2020

2121
## Create and manage IP firewall rules
2222

0 commit comments

Comments
 (0)