Skip to content

Commit 8c20146

Browse files
authored
Merge pull request #179282 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 185a051 + 0263c3e commit 8c20146

File tree

9 files changed

+36
-40
lines changed

9 files changed

+36
-40
lines changed

articles/active-directory/saas-apps/launchdarkly-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8383
`https://app.launchdarkly.com/trust/saml2/acs/<customers-unique-id>`
8484

8585
> [!NOTE]
86-
> The Reply URL value is not real. You will update the value with the actual Reply URL, which is explained later in the tutorial. If you are intending to use the application in **IDP** mode you need to leave the **Sign on URL** field blank, otherwise you will not be able to initiate the login from the **IDP**. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
86+
> The Reply URL value is not real. You will update the value with the actual Reply URL, which is explained later in the tutorial. LaunchDarkly currently supports **IDP** initiated SSO. To use this application in **IDP** mode, you need to leave the **Sign on URL** field blank, otherwise you will not be able to initiate the login from the **IDP**. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
8787

8888
6. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
8989

@@ -159,4 +159,4 @@ In this section, you test your Azure AD single sign-on configuration with follow
159159

160160
## Next steps
161161

162-
Once you configure LaunchDarkly you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-any-app).
162+
Once you configure LaunchDarkly you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-any-app).

articles/azure-monitor/containers/container-insights-log-query.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ KubeEvents
4545
| sort by TimeGenerated desc
4646
| render table
4747
```
48-
### Image inventory
49-
50-
``` kusto
51-
ContainerImageInventory
52-
| summarize AggregatedValue = count() by Image, ImageTag, Running
53-
```
5448

5549
### Container CPU
5650

articles/container-apps/github-actions-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The first time you attach GitHub Actions to your container app, you need to prov
3636
az ad sp create-for-rbac \
3737
--name <SERVICE_PRINCIPAL_NAME> \
3838
--role "contributor" \
39-
--scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP_NAME> /subscriptions/<SUBSCRIPTION_ID> \
39+
--scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP_NAME> \
4040
--sdk-auth
4141
```
4242

@@ -46,7 +46,7 @@ az ad sp create-for-rbac \
4646
az ad sp create-for-rbac `
4747
--name <SERVICE_PRINCIPAL_NAME> `
4848
--role "contributor" `
49-
--scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP_NAME> /subscriptions/<SUBSCRIPTION_ID> `
49+
--scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP_NAME> `
5050
--sdk-auth
5151
```
5252

articles/media-services/latest/stream-files-nodejs-quickstart.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: How to encode and stream video files with Node.JS
3-
description: How to stream video files with Node.JS. Follow the steps of this tutorial to create a new Azure Media Services account, encode a file, and stream it to Azure Media Player.
2+
title: How to encode and stream video files with Node.js
3+
description: How to stream video files with Node.js. Follow the steps of this tutorial to create a new Azure Media Services account, encode a file, and stream it to Azure Media Player.
44
services: media-services
55
author: IngridAtMicrosoft
66
manager: femila
77
editor: ''
8-
keywords: azure media services, stream, Node.JS
8+
keywords: azure media services, stream, Node.js
99

1010
ms.service: media-services
1111
ms.workload: media
@@ -15,18 +15,18 @@ ms.author: inhenkel
1515

1616
---
1717

18-
# How to encode and stream video files with Node.JS
18+
# How to encode and stream video files with Node.js
1919

2020
[!INCLUDE [media services api v3 logo](./includes/v3-hr.md)]
2121

2222
This quickstart shows you how easy it is to encode and start streaming videos on a wide variety of browsers and devices using Azure Media Services. An input video file can be specified using HTTPS URLs, SAS URLs, or paths to files located in Azure Blob storage.
2323

2424
By the end of this quickstart you will know:
2525

26-
- How to encode with Node.JS
27-
- How to stream with Node.JS
28-
- How to upload a file from an HTTPS URL with Node.JS
29-
- How to use an HLS or DASH client player with Node.JS
26+
- How to encode with Node.js
27+
- How to stream with Node.js
28+
- How to upload a file from an HTTPS URL with Node.js
29+
- How to use an HLS or DASH client player with Node.js
3030

3131
The sample in this article encodes content that you make accessible via an HTTPS URL. Note that currently, AMS v3 does not support chunked transfer encoding over HTTPS URLs.
3232

articles/purview/register-scan-azure-postgresql.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 'Connect to and manage an Azure database for PostgreSQL'
3-
description: This guide describes how to connect to an Azure database for PostgreSQL in Azure Purview, and use Purview's features to scan and manage your Azure database for PostgreSQL source.
4-
author: evwhite
3+
description: This guide describes how to connect to an Azure database for PostgreSQL single server in Azure Purview, and use Purview's features to scan and manage your Azure database for PostgreSQL source.
4+
author: evangelinew
55
ms.author: evwhite
66
ms.service: purview
77
ms.subservice: purview-data-map
@@ -12,10 +12,12 @@ ms.custom: template-how-to, ignite-fall-2021
1212

1313
# Connect to and manage an Azure database for PostgreSQL in Azure Purview
1414

15-
This article outlines how to register an Azure database for PostgreSQL, as well as how to authenticate and interact with an Azure database for PostgreSQL in Azure Purview. For more information about Azure Purview, read the [introductory article](overview.md).
15+
This article outlines how to register an Azure database for PostgreSQL deployed with single server deployment option, as well as how to authenticate and interact with an Azure database for PostgreSQL in Azure Purview. For more information about Azure Purview, read the [introductory article](overview.md).
1616

1717
## Supported capabilities
1818

19+
Purview only supports single server deployment option for Azure database for PostgreSQL.
20+
1921
|**Metadata Extraction**| **Full Scan** |**Incremental Scan**|**Scoped Scan**|**Classification**|**Access Policy**|**Lineage**|
2022
|---|---|---|---|---|---|---|
2123
| [Yes](#register) | [Yes](#scan)| [Yes](#scan) | [Yes](#scan) | [Yes](#scan) | No | No** |
@@ -36,7 +38,7 @@ This section describes how to register an Azure database for PostgreSQL in Azure
3638

3739
### Authentication for registration
3840

39-
Currently, to be able to manage and interact with an Azure database for PostgreSQL, only SQL Authentication is supported.
41+
Currently, to be able to manage and interact with an Azure database for PostgreSQL single server, only SQL Authentication is supported.
4042

4143
#### SQL Authentication
4244

articles/storage/common/storage-account-keys-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ StorageBlobLogs | where KeyExpiryStatus startsWith "Policy Violated".
195195
You can also create a query that helps you determine if a query is nearing expiration. The following query provides this information.
196196

197197
```kusto
198-
resources
198+
StorageBlobLogs
199199
| where type =~ 'microsoft.storage/storageAccounts'
200200
| extend days = datetime_diff('day', now(), todatetime(parse_json(properties).keyCreationTime))
201201
| extend KeyExpiryStatus = iff(days > 180, "Policy Violated", "")

articles/storage/files/storage-files-identity-auth-active-directory-domain-service-enable.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,18 @@ Set-AzStorageAccount -ResourceGroupName "<resource-group-name>" `
130130

131131
To enable Azure AD authentication over SMB with Azure CLI, install the latest CLI version (Version 2.0.70 or newer). For more information about installing Azure CLI, see [Install the Azure CLI](/cli/azure/install-azure-cli).
132132

133-
To create a new storage account, call [az storage account create](/cli/azure/storage/account#az_storage_account_create), and set the `--enable-files-aadds` property to **true**. In the following example, remember to replace the placeholder values with your own values. (If you were using the previous preview module, the parameter for feature enablement is **file-aad**.)
133+
To create a new storage account, call [az storage account create](/cli/azure/storage/account#az_storage_account_create), and set the `--enable-files-aadds` argument. In the following example, remember to replace the placeholder values with your own values. (If you were using the previous preview module, the parameter for feature enablement is **file-aad**.)
134134

135135
```azurecli-interactive
136136
# Create a new storage account
137-
az storage account create -n <storage-account-name> -g <resource-group-name> --enable-files-aadds $true
137+
az storage account create -n <storage-account-name> -g <resource-group-name> --enable-files-aadds
138138
```
139139

140140
To enable this feature on existing storage accounts, use the following command:
141141

142142
```azurecli-interactive
143143
# Update a new storage account
144-
az storage account update -n <storage-account-name> -g <resource-group-name> --enable-files-aadds $true
144+
az storage account update -n <storage-account-name> -g <resource-group-name> --enable-files-aadds
145145
```
146146
---
147147

articles/storage/files/storage-how-to-use-files-linux.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ uname -r
8383
httpEndpoint=$(az storage account show \
8484
--resource-group $resourceGroupName \
8585
--name $storageAccountName \
86-
--query "primaryEndpoints.file" | tr -d '"')
86+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
8787
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))
8888
fileHost=$(echo $smbPath | tr -d "/")
8989
@@ -125,13 +125,13 @@ Next, mount the file share using the `mount` command. In the following example,
125125
httpEndpoint=$(az storage account show \
126126
--resource-group $resourceGroupName \
127127
--name $storageAccountName \
128-
--query "primaryEndpoints.file" | tr -d '"')
128+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
129129
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))$fileShareName
130130
131131
storageAccountKey=$(az storage account keys list \
132132
--resource-group $resourceGroupName \
133133
--account-name $storageAccountName \
134-
--query "[0].value" | tr -d '"')
134+
--query "[0].value" --output tsv | tr -d '"')
135135
136136
sudo mount -t cifs $smbPath $mntPath -o username=$storageAccountName,password=$storageAccountKey,serverino
137137
```
@@ -142,13 +142,13 @@ sudo mount -t cifs $smbPath $mntPath -o username=$storageAccountName,password=$s
142142
httpEndpoint=$(az storage account show \
143143
--resource-group $resourceGroupName \
144144
--name $storageAccountName \
145-
--query "primaryEndpoints.file" | tr -d '"')
145+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
146146
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))$fileShareName
147147
148148
storageAccountKey=$(az storage account keys list \
149149
--resource-group $resourceGroupName \
150150
--account-name $storageAccountName \
151-
--query "[0].value" | tr -d '"')
151+
--query "[0].value" --output tsv | tr -d '"')
152152
153153
sudo mount -t cifs $smbPath $mntPath -o vers=3.0,username=$storageAccountName,password=$storageAccountKey,serverino
154154
```
@@ -159,13 +159,13 @@ sudo mount -t cifs $smbPath $mntPath -o vers=3.0,username=$storageAccountName,pa
159159
httpEndpoint=$(az storage account show \
160160
--resource-group $resourceGroupName \
161161
--name $storageAccountName \
162-
--query "primaryEndpoints.file" | tr -d '"')
162+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
163163
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))$fileShareName
164164
165165
storageAccountKey=$(az storage account keys list \
166166
--resource-group $resourceGroupName \
167167
--account-name $storageAccountName \
168-
--query "[0].value" | tr -d '"')
168+
--query "[0].value" --output tsv | tr -d '"')
169169
170170
sudo mount -t cifs $smbPath $mntPath -o vers=2.1,username=$storageAccountName,password=$storageAccountKey,serverino
171171
```
@@ -203,7 +203,7 @@ sudo mkdir -p "/etc/smbcredentials"
203203
storageAccountKey=$(az storage account keys list \
204204
--resource-group $resourceGroupName \
205205
--account-name $storageAccountName \
206-
--query "[0].value" | tr -d '"')
206+
--query "[0].value" --output tsv | tr -d '"')
207207
208208
# Create the credential file for this individual storage account
209209
smbCredentialFile="$credentialRoot/$storageAccountName.cred"
@@ -236,7 +236,7 @@ Finally, create a record in the `/etc/fstab` file for your Azure file share. In
236236
httpEndpoint=$(az storage account show \
237237
--resource-group $resourceGroupName \
238238
--name $storageAccountName \
239-
--query "primaryEndpoints.file" | tr -d '"')
239+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
240240
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))$fileShareName
241241
242242
if [ -z "$(grep $smbPath\ $mntPath /etc/fstab)" ]; then
@@ -285,7 +285,7 @@ fileShareName="<file-share-name>"
285285
httpEndpoint=$(az storage account show \
286286
--resource-group $resourceGroupName \
287287
--name $storageAccountName \
288-
--query "primaryEndpoints.file" | tr -d '"')
288+
--query "primaryEndpoints.file" --output tsv | tr -d '"')
289289
smbPath=$(echo $httpEndpoint | cut -c7-$(expr length $httpEndpoint))$fileShareName
290290
291291
echo "$fileShareName -fstype=cifs,credentials=$smbCredentialFile :$smbPath" > /etc/auto.fileshares
@@ -304,4 +304,4 @@ See these links for more information about Azure Files:
304304

305305
- [Planning for an Azure Files deployment](storage-files-planning.md)
306306
- [Remove SMB 1 on Linux](files-remove-smb1-linux.md)
307-
- [Troubleshooting](storage-troubleshoot-linux-file-connection-problems.md)
307+
- [Troubleshooting](storage-troubleshoot-linux-file-connection-problems.md)

articles/virtual-desktop/shortpath.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To allow inbound network traffic for RDP Shortpath, use the Windows Defender Fir
8888
2. In the navigation pane, select **Inbound Rules**.
8989
3. Select **Action**, and then select **New rule**.
9090
4. On the **Rule Type** page of the New Inbound Rule Wizard, select **Custom**, and then select **Next**.
91-
5. On the **Program** page, select **This program path**, and type "%SystemRoot%\s ystem32\svchost.exe' then select **Next**.
91+
5. On the **Program** page, select **This program path**, and type "%SystemRoot%\system32\svchost.exe' then select **Next**.
9292
6. On the **Protocol and Ports** page, select the UDP protocol type. In the **Local port**, select "Specific ports" and enter the configured UDP port. If you've left the default settings on, the port number will be 3390.
9393
7. On the **Scope** page, you can specify that the rule applies only to network traffic to or from the IP addresses entered on this page. Configure as appropriate for your design, and then select **Next**.
9494
8. On the **Action** page, select **Allow the connection**, and then select **Next**.
@@ -225,10 +225,10 @@ To disable RDP Shortpath for a specific client, you can use the following Group
225225
To disable RDP Shortpath for a specific session host, you can use the following Group Policy to disable the UDP support:
226226

227227
1. On the Session Host Run **gpedit.msc**.
228-
2. Go to **Computer Configuration > Administration Templates > Windows Components > Remote Desktop Services > Remote Desktop Connection Host > Connections**.
228+
2. Go to **Computer Configuration > Administration Templates > Windows Components > Remote Desktop Services > Remote Desktop Session Host > Connections**.
229229
3. Set the **"Select RDP Transport Protocols"** setting to **TCP Only**.
230230

231231
## Next steps
232232

233233
* To learn about Azure Virtual Desktop network connectivity, see [Understanding Azure Virtual Desktop network connectivity](network-connectivity.md).
234-
* To get started with Quality of Service (QoS) for Azure Virtual Desktop, see [Implement Quality of Service (QoS) for Azure Virtual Desktop](rdp-quality-of-service-qos.md).
234+
* To get started with Quality of Service (QoS) for Azure Virtual Desktop, see [Implement Quality of Service (QoS) for Azure Virtual Desktop](rdp-quality-of-service-qos.md).

0 commit comments

Comments
 (0)