Skip to content

Commit cfa507c

Browse files
authored
Merge pull request #221399 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 27a2e26 + 400e281 commit cfa507c

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@ Yes. The results are under [Sub-Assessments REST API](/rest/api/defenderforcloud
169169

170170
Some images may reuse tags from an image that was already scanned. For example, you may reassign the tag “Latest” every time you add an image to a digest. In such cases, the ‘old’ image does still exist in the registry and may still be pulled by its digest. If the image has security findings and is pulled, it will expose security vulnerabilities.
171171

172+
### Does Defender for Containers scan images in Microsoft Container Registry?
173+
174+
Currently, Defender for Containers can scan images in Azure Container Registry (ACR) and AWS Elastic Container Registry (ECR) only.
175+
Docker Registry, Microsoft Artifact Registry/Microsoft Container Registry, and Microsoft Azure Red Hat OpenShift (ARO) built-in container image registry are not supported.
176+
Images should first be imported to ACR. Learn more about [importing container images to an Azure container registry](/azure/container-registry/container-registry-import-images?tabs=azure-cli).
177+
172178
## Next steps
173179

174180
Learn more about the [advanced protection plans of Microsoft Defender for Cloud](enhanced-security-features-overview.md).

articles/defender-for-iot/organizations/workbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Each workbook graph or chart is based on an Azure Resource Graph (ARG) query run
1616
- Gather sensor statuses
1717
- Identify new devices in your network
1818
- Find alerts related to specific IP addresses
19-
- Understand which alerts are seen by each sensor.
19+
- Understand which alerts are seen by each sensor
2020

2121
## View workbooks
2222

articles/machine-learning/how-to-access-azureml-behind-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ These rule collections are described in more detail in [What are some Azure Fire
9797
| **\*.anaconda.org** | Used to get repo data. |
9898
| **pypi.org** | Used to list dependencies from the default index, if any, and the index isn't overwritten by user settings. If the index is overwritten, you must also allow **\*.pythonhosted.org**. |
9999
| **cloud.r-project.org** | Used when installing CRAN packages for R development. |
100-
| **ghcr.io**</br>**pkg-containers.githubusercontent.com** | Used by the Custom Applications feature on a compute instance to pull images from Github Container Repository (ghcr.io). For example, the RStudio or Posit Workbench image is hosted here. |
100+
| **ghcr.io**</br>**pkg-containers.githubusercontent.com** | Used by the Custom Applications feature on a compute instance to pull images from GitHub Container Repository (ghcr.io). For example, the RStudio or Posit Workbench image is hosted here. |
101101
| **\*pytorch.org** | Used by some examples based on PyTorch. |
102102
| **\*.tensorflow.org** | Used by some examples based on Tensorflow. |
103103
| **\*vscode.dev**</br>**\*vscode-unpkg.net**</br>**\*vscode-cdn.net**</br>**\*vscodeexperiments.azureedge.net**</br>**default.exp-tas.com** | Required to access vscode.dev (Visual Studio Code for the Web) |

articles/storage/blobs/access-tiers-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ Data must remain in the archive tier for at least 180 days or be subject to an e
6262

6363
While a blob is in the archive tier, it can't be read or modified. To read or download a blob in the archive tier, you must first rehydrate it to an online tier, either hot or cool. Data in the archive tier can take up to 15 hours to rehydrate, depending on the priority you specify for the rehydration operation. For more information about blob rehydration, see [Overview of blob rehydration from the archive tier](archive-rehydrate-overview.md).
6464

65-
An archived blob's metadata remains available for read access, so that you can list the blob and its properties, metadata, and index tags. Metadata for a blob in the archive tier is read-only, while blob index tags can be read or written. Snapshots aren't supported for archived blobs.
65+
An archived blob's metadata remains available for read access, so that you can list the blob and its properties, metadata, and index tags. Metadata for a blob in the archive tier is read-only, while blob index tags can be read or written. Storage costs for metadata of archived blobs will be charged on Cool tier rates.
66+
Snapshots aren't supported for archived blobs.
6667

6768
The following operations are supported for blobs in the archive tier:
6869

articles/synapse-analytics/sql/connection-strings.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-csharp
1313

1414
# Connection strings for Synapse SQL
1515

16-
You can connect to Synapse SQL with several different application protocols such as, [ADO.NET](/dotnet/framework/data/adonet/), [ODBC](/sql/connect/odbc/windows/microsoft-odbc-driver-for-sql-server-on-windows), [PHP](/sql/connect/php/overview-of-the-php-sql-driver?f=255&MSPPError=-2147217396), and [JDBC](/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server). Below are some examples of connections strings for each protocol.
16+
You can connect to Synapse SQL with several different application libraries such as, [ADO.NET](/dotnet/framework/data/adonet/), [ODBC](/sql/connect/odbc/windows/microsoft-odbc-driver-for-sql-server-on-windows), [PHP](/sql/connect/php/overview-of-the-php-sql-driver?f=255&MSPPError=-2147217396), and [JDBC](/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server). Below are some examples of connections strings for each library.
1717

1818
You can also use the Azure portal to build your connection string. To build your connection string using the Azure portal, navigate to your database blade, under *Essentials* select *Show database connection strings*.
1919

@@ -26,7 +26,7 @@ Server=tcp:{your_server}.sql.azuresynapse.net,1433;Database={your_database};User
2626
## Sample ODBC connection string
2727

2828
```csharp
29-
Driver={SQL Server Native Client 11.0};Server=tcp:{your_server}.sql.azuresynapse.net,1433;Database={your_database};Uid={your_user_name};Pwd={your_password_here};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30;
29+
Driver={ODBC Driver 18 for SQL Server};Server=tcp:{your_server}.sql.azuresynapse.net,1433;Database={your_database};Uid={your_user_name};Pwd={your_password_here};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30;
3030
```
3131

3232
## Sample PHP connection string
@@ -42,12 +42,12 @@ jdbc:sqlserver://yourserver.sql.azuresynapse.net:1433;database=yourdatabase;user
4242
```
4343

4444
> [!NOTE]
45-
> Consider setting the connection timeout to 300 seconds to allow the connection to survive short periods of unavailability.
45+
> Consider setting the connection timeout to 300 seconds to allow the connection to survive short periods of unavailability and provide enough time for paused instances to resume.
4646
4747
## Recommendations
4848

4949
For executing **serverless SQL pool** queries, recommended tools are [Azure Data Studio](get-started-azure-data-studio.md) and Azure Synapse Studio.
5050

5151
## Next steps
5252

53-
To start querying your analytics with Visual Studio and other applications, see [Query with Visual Studio](../sql-data-warehouse/sql-data-warehouse-query-visual-studio.md?context=/azure/synapse-analytics/context/context).
53+
To start querying your analytics with Visual Studio and other applications, see [Query with Visual Studio](../sql-data-warehouse/sql-data-warehouse-query-visual-studio.md?context=/azure/synapse-analytics/context/context).

0 commit comments

Comments
 (0)