Skip to content

Commit 81ee6f1

Browse files
authored
Merge pull request #213612 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 260c7c6 + be37e6a commit 81ee6f1

File tree

10 files changed

+28
-20
lines changed

10 files changed

+28
-20
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
179179

180180
1. Perform following steps on configuration page:
181181

182-
![Screenshot that shows the single sign-on configuration page.](./media/confluencemicrosoft-tutorial/add-on-53.png)
182+
![Screenshot that shows the single sign-on configuration page.](./media/confluencemicrosoft-tutorial/confluence-configure-addon.png)
183183

184184
> [!TIP]
185185
> Ensure that there is only one certificate mapped against the app so that there is no error in resolving the metadata. If there are multiple certificates, admin gets an error upon resolving the metadata.
@@ -211,6 +211,8 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
211211
> To enable the default login form for admin login on the login page when the force azure login is enabled, add the query parameter in the browser URL.
212212
> `https://<DOMAIN:PORT>/login.action?force_azure_login=false`
213213
214+
1. **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup. For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](/articles/active-directory/app-proxy/what-is-application-proxy.md).
215+
214216
1. Click **Save** button to save the settings.
215217

216218
> [!NOTE]

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
203203

204204
6. Perform following steps on configuration page:
205205

206-
![Screenshot shows the Microsoft Azure Active Directory single sign-on for Jira configuration page.](./media/jiramicrosoft-tutorial/addon54.png)
206+
![Screenshot shows the Microsoft Azure Active Directory single sign-on for Jira configuration page.](./media/jiramicrosoft-tutorial/jira-configure-addon.png)
207207

208208
> [!TIP]
209209
> Ensure that there is only one certificate mapped against the app so that there is no error in resolving the metadata. If there are multiple certificates, upon resolving the metadata, admin gets an error.
@@ -235,7 +235,11 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
235235
> To enable the default login form for admin login on login page when force azure login is enabled, add the query parameter in the browser URL.
236236
> `https://<domain:port>/login.jsp?force_azure_login=false`
237237

238-
k. Click **Save** button to save the settings.
238+
k. **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup.
239+
240+
* For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](/articles/active-directory/app-proxy/what-is-application-proxy.md).
241+
242+
l. Click **Save** button to save the settings.
239243

240244
> [!NOTE]
241245
> For more information about installation and troubleshooting, visit [MS JIRA SSO Connector Admin Guide](./ms-confluence-jira-plugin-adminguide.md). There is also an [FAQ](./ms-confluence-jira-plugin-adminguide.md) for your assistance.

articles/azure-monitor/agents/resource-manager-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ resource logAnalyticsAgent 'Microsoft.Compute/virtualMachines/extensions@2021-11
666666

667667
### Linux
668668

669-
The following sample installs the Log Analytics agent on a Linux Azure virtual machine. This is done by enabling the [Log Analytics virtual machine extension for Windows](../../virtual-machines/extensions/oms-linux.md).
669+
The following sample installs the Log Analytics agent on a Linux Azure virtual machine. This is done by enabling the [Log Analytics virtual machine extension for Linux](../../virtual-machines/extensions/oms-linux.md).
670670

671671
#### Template file
672672

articles/azure-monitor/logs/personal-data-mgmt.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,9 @@ You need to implement the logic for converting the data to an appropriate format
9393
9494
Azure Monitor's Purge API lets you delete personal data. Use the purge operation sparingly to avoid potential risks, performance impact, and the potential to skew all-up aggregations, measurements, and other aspects of your Log Analytics data. See the [Strategy for personal data handling](#strategy-for-personal-data-handling) section for alternative approaches to handling personal data.
9595
96-
Purge is a highly privileged operation. Applications and Azure users, including the resource owner, can't execute a purge operation without explicitly being granted the _Data Purger_ role in Azure Resource Manager. Grant this role cautiously due to the potential for data loss.
96+
Purge is a highly privileged operation. Grant the _Data Purger_ role in Azure Resource Manager cautiously due to the potential for data loss.
9797
98-
To manage system resources, we limit purge requests to 50 requests an hour. Batch the execution of purge requests by sending a single command whose predicate includes all user identities that require purging. Use the [in operator](/azure/kusto/query/inoperator) to specify multiple identities. Run the query before executing the purge request to verify the expected results.
99-
100-
> [!NOTE]
101-
> After initiating a purge request, you cannot access the related data while the [purge operation status](/rest/api/loganalytics/workspacepurge/getpurgestatus) is *pending*.
98+
To manage system resources, we limit purge requests to 50 requests an hour. Batch the execution of purge requests by sending a single command whose predicate includes all user identities that require purging. Use the [in operator](/azure/kusto/query/inoperator) to specify multiple identities. Run the query before executing the purge request to verify the expected results.
10299
103100
#### Log data
104101

articles/container-apps/communicate-between-microservices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ Output from the `az acr build` command shows the upload progress of the source c
129129
# [Bash](#tab/bash)
130130

131131
```azurecli
132-
docker build --tag $ACR_NAME.azurecr.io/albumapp-ui .
132+
docker build --tag "$ACR_NAME.azurecr.io/albumapp-ui" .
133133
```
134134
135135
# [PowerShell](#tab/powershell)
136136
137137
```powershell
138-
docker build --tag $ACR_NAME.azurecr.io/albumapp-ui .
138+
docker build --tag "$ACR_NAME.azurecr.io/albumapp-ui" .
139139
```
140140
141141
---
@@ -241,7 +241,7 @@ az containerapp create `
241241
--name $FRONTEND_NAME `
242242
--resource-group $RESOURCE_GROUP `
243243
--environment $ENVIRONMENT `
244-
--image $ACR_NAME.azurecr.io/albumapp-ui `
244+
--image "$ACR_NAME.azurecr.io/albumapp-ui" `
245245
--env-vars API_BASE_URL=https://$API_BASE_URL `
246246
--target-port 3000 `
247247
--ingress 'external' `

articles/container-apps/ingress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following settings are available when configuring ingress:
4747

4848
| Property | Description | Values | Required |
4949
|---|---|---|---|
50-
| `external` | Your ingress IP and app fully qualified domain name (FQDN) can either be visible externally from the internet, or internally from a VNET depending on whether the app environment has an external or internal endpoint, respectively - or visibility from within the app environment only. |`true` for visibility from internet or VNET, depending on app environment endpoint is configured, `false` for visibility within app environment only. (default) | Yes |
50+
| `external` | The ingress IP and fully qualified domain name (FQDN) can either be accessible externally from the internet or a VNET, or internally within the app environment only. | `true` for external visibility from the internet or a VNET, `false` for internal visibility within app environment only (default) | Yes |
5151
| `targetPort` | The port your container listens to for incoming requests. | Set this value to the port number that your container uses. Your application ingress endpoint is always exposed on port `443`. | Yes |
5252
| `transport` | You can use either HTTP/1.1 or HTTP/2, or you can set it to automatically detect the transport type. | `http` for HTTP/1, `http2` for HTTP/2, `auto` to automatically detect the transport type (default) | No |
5353
| `allowInsecure` | Allows insecure traffic to your container app. | `false` (default), `true`<br><br>If set to `true`, HTTP requests to port 80 aren't automatically redirected to port 443 using HTTPS, allowing insecure connections. | No |

articles/container-apps/vnet-custom-internal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Provide an internal virtual network to an Azure Container Apps environment
3-
description: Learn how to provide an internal VNET to an Azure Container Apps environment.
2+
title: Integrate a virtual network with an internal Azure Container Apps environment
3+
description: Learn how to integrate a VNET to an internal Azure Container Apps environment.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: container-apps

articles/container-apps/vnet-custom.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Provide an external virtual network to an Azure Container Apps environment
3-
description: Learn how to provide an external VNET to an Azure Container Apps environment.
2+
title: Integrate a virtual network with an external Azure Container Apps environment
3+
description: Learn how to integrate a VNET with an external Azure Container Apps environment.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: container-apps
@@ -221,11 +221,11 @@ First, extract identifiable information from the environment.
221221
# [Bash](#tab/bash)
222222

223223
```bash
224-
ENVIRONMENT_DEFAULT_DOMAIN=`az containerapp env show --name ${CONTAINERAPPS_ENVIRONMENT} --resource-group ${RESOURCE_GROUP} --query defaultDomain --out json | tr -d '"'`
224+
ENVIRONMENT_DEFAULT_DOMAIN=`az containerapp env show --name ${CONTAINERAPPS_ENVIRONMENT} --resource-group ${RESOURCE_GROUP} --query properties.defaultDomain --out json | tr -d '"'`
225225
```
226226

227227
```bash
228-
ENVIRONMENT_STATIC_IP=`az containerapp env show --name ${CONTAINERAPPS_ENVIRONMENT} --resource-group ${RESOURCE_GROUP} --query staticIp --out json | tr -d '"'`
228+
ENVIRONMENT_STATIC_IP=`az containerapp env show --name ${CONTAINERAPPS_ENVIRONMENT} --resource-group ${RESOURCE_GROUP} --query properties.staticIp --out json | tr -d '"'`
229229
```
230230

231231
```bash
@@ -236,6 +236,7 @@ VNET_ID=`az network vnet show --resource-group ${RESOURCE_GROUP} --name ${VNET_N
236236

237237
```azurepowershell
238238
$EnvironmentDefaultDomain = (Get-AzContainerAppManagedEnv -EnvName $ContainerAppsEnvironment -ResourceGroupName $ResourceGroupName).DefaultDomain
239+
239240
```
240241

241242
```azurepowershell

articles/route-server/route-server-faq.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ You can still use Route Server to direct traffic between subnets in different vi
105105

106106
Azure Route Server supports ***NO_ADVERTISE*** BGP Community. If an NVA advertises routes with this community string to the route server, the route server won't advertise it to other peers including the ExpressRoute gateway. This feature can help reduce the number of routes to be sent from Azure Route Server to ExpressRoute.
107107

108+
### Can Azure Route Server provide transit between ExpressRoute and a Point-to-Site (P2S) VPN gateway connection if the Branch-to-Branch setting is enabled?
109+
110+
No, Azure Route Server provides transit only between ExpressRoute and a Site-to-Site (S2S) VPN gateway connections if the Branch-to-Branch setting is enabled.
111+
108112
## <a name = "limitations"></a>Route Server Limits
109113

110114
Azure Route Server has the following limits (per deployment).

articles/storage/common/storage-explorer-direct-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Parameter | Description
2828
:---------| :---------
2929
`v` | Version of the direct link protocol.
3030
`accountid` | The Azure Resource Manager resource ID of the storage account for the linked resource. If the linked resource is a storage account, this ID will be the Azure Resource Manager resource ID of that storage account. Otherwise, this ID will be the Azure Resource Manager resource ID of the storage account the linked resource belongs to.
31-
`resourcetype` | Optional. Only used when the linked resource is a blob container, a file share, a queue, or a table. Must be either one of "Azure.BlobContainer", "Azure.FileShare", "Azure.Queue", "Azure.FileShare".
31+
`resourcetype` | Optional. Only used when the linked resource is a blob container, a file share, a queue, or a table. Must be either one of "Azure.BlobContainer", "Azure.FileShare", "Azure.Queue", "Azure.Table".
3232
`resourcename` | Optional. Only used when the linked resource is a blob container, a file share, a queue, or a table. The name of the linked resource.
3333

3434
Here is an example direct link to a blob container.

0 commit comments

Comments
 (0)