Skip to content

Commit d5da404

Browse files
authored
Merge pull request #225954 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 08b1a58 + 1fa9f95 commit d5da404

File tree

9 files changed

+49
-37
lines changed

9 files changed

+49
-37
lines changed

articles/active-directory/privileged-identity-management/pim-email-notifications.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ Who receives these emails for Azure AD roles depends on your role, the event, an
5959

6060
| User | Role activation is pending approval | Role activation request is completed | PIM is enabled |
6161
| --- | --- | --- | --- |
62-
| Privileged Role Administrator</br>(Activated/Eligible) | Yes</br>(only if no explicit approvers are specified) | Yes* | Yes |
63-
| Security Administrator</br>(Activated/Eligible) | No | Yes* | Yes |
64-
| Global Administrator</br>(Activated/Eligible) | No | Yes* | Yes |
62+
| Privileged Role Administrator</br>(Activated) | Yes</br>(only if no explicit approvers are specified) | Yes* | Yes |
63+
| Security Administrator</br>(Activated) | No | Yes* | Yes |
64+
| Global Administrator</br>(Activated) | No | Yes* | Yes |
6565

6666
\* If the [**Notifications** setting](pim-how-to-change-default-settings.md) is set to **Enable**.
6767

articles/aks/configure-azure-cni-dynamic-ip-allocation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ This article shows you how to use Azure CNI networking for dynamic allocation of
2828
2929
* Review the [prerequisites](/configure-azure-cni.md#prerequisites) for configuring basic Azure CNI networking in AKS, as the same prerequisites apply to this article.
3030
* Review the [deployment parameters](/configure-azure-cni.md#deployment-parameters) for configuring basic Azure CNI networking in AKS, as the same parameters apply.
31-
* Only linux node clusters and node pools are supported.
3231
* AKS Engine and DIY clusters aren't supported.
3332
* Azure CLI version `2.37.0` or later.
3433

articles/azure-functions/functions-run-local.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ There are no additional considerations for PowerShell.
252252

253253
# [TypeScript](#tab/ts)
254254

255-
+ To use a `--worker-runtime` value of `node`, specify the `--language` as `javascript`.
255+
+ To use a `--worker-runtime` value of `node`, specify the `--language` as `typescript`.
256256

257257
+ See the [TypeScript section in the JavaScript developer reference](functions-reference-node.md#typescript) for `func init` behaviors specific to TypeScript.
258258

articles/container-apps/azure-arc-create-container-app.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ az extension add -s https://download.microsoft.com/download/5/c/2/5c2ec3fc-bd2a-
4343
Create a resource group for the services created in this tutorial.
4444

4545
```azurecli-interactive
46-
az group create --name myResourceGroup --location eastus
46+
myResourceGroup="my-container-apps-resource-group"
47+
az group create --name $myResourceGroup --location eastus
4748
```
4849

4950
## Get custom location information
@@ -75,7 +76,8 @@ Now that you have the custom location ID, you can query for the connected enviro
7576
A connected environment is largely the same as a standard Container Apps environment, but network restrictions are controlled by the underlying Arc-enabled Kubernetes cluster.
7677

7778
```azure-interactive
78-
myConnectedEnvironment = az containerapp connected-env list --custom-location customLocationId -o tsv --query '[].id'
79+
myContainerApp="my-container-app"
80+
myConnectedEnvironment=$(az containerapp connected-env list --custom-location $customLocationId -o tsv --query '[].id')
7981
```
8082

8183
## Create an app
@@ -84,16 +86,15 @@ The following example creates a Node.js app.
8486

8587
```azurecli-interactive
8688
az containerapp create \
87-
--resource-group myResourceGroup \
88-
--name myContainerApp \
89-
--environment myConnectedEnvironment \
89+
--resource-group $myResourceGroup \
90+
--name $myContainerApp \
91+
--environment $myConnectedEnvironment \
9092
--environment-type connected \
91-
--image mcr.microsoft.com/azuredocs/container-apps-helloworld:latest \
93+
--image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
9294
--target-port 80 \
9395
--ingress 'external'
9496
95-
az containerapp browse --resource-group myResourceGroup \
96-
--name myContainerApp
97+
az containerapp browse --resource-group $myResourceGroup --name $myContainerApp
9798
```
9899

99100
## Get diagnostic logs using Log Analytics
@@ -112,7 +113,7 @@ let StartTime = ago(72h);
112113
let EndTime = now();
113114
ContainerAppsConsoleLogs_CL
114115
| where TimeGenerated between (StartTime .. EndTime)
115-
| where AppName_s =~ "myContainerApp"
116+
| where AppName_s =~ "my-container-app"
116117
```
117118

118119
The application logs for all the apps hosted in your Kubernetes cluster are logged to the Log Analytics workspace in the custom log table named `ContainerAppsConsoleLogs_CL`.

articles/container-apps/azure-arc-enable-cluster.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ Set environment variables based on your Kubernetes cluster deployment.
9191

9292
```bash
9393
GROUP_NAME="my-arc-cluster-group"
94-
CLUSTER_NAME="my-arc-cluster"
9594
AKS_CLUSTER_GROUP_NAME="my-aks-cluster-group"
9695
AKS_NAME="my-aks-cluster"
9796
LOCATION="eastus"
@@ -101,7 +100,6 @@ LOCATION="eastus"
101100

102101
```azurepowershell
103102
$GROUP_NAME="my-arc-cluster-group"
104-
$CLUSTER_NAME="my-arc-cluster"
105103
$AKS_CLUSTER_GROUP_NAME="my-aks-cluster-group"
106104
$AKS_NAME="my-aks-cluster"
107105
$LOCATION="eastus"
@@ -121,7 +119,7 @@ The following steps help you get started understanding the service, but for prod
121119
az group create --name $AKS_CLUSTER_GROUP_NAME --location $LOCATION
122120
az aks create \
123121
--resource-group $AKS_CLUSTER_GROUP_NAME \
124-
--name $AKS_NAME \
122+
--name $AKS_NAME \
125123
--enable-aad \
126124
--generate-ssh-keys
127125
```
@@ -212,7 +210,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
212210
213211
az monitor log-analytics workspace create `
214212
--resource-group $GROUP_NAME `
215-
--workspace-name $wORKSPACE_NAME
213+
--workspace-name $WORKSPACE_NAME
216214
```
217215
218216
---
@@ -224,13 +222,13 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
224222
```azurecli
225223
LOG_ANALYTICS_WORKSPACE_ID=$(az monitor log-analytics workspace show \
226224
--resource-group $GROUP_NAME \
227-
--workspace-name $wORKSPACE_NAME \
225+
--workspace-name $WORKSPACE_NAME \
228226
--query customerId \
229227
--output tsv)
230228
LOG_ANALYTICS_WORKSPACE_ID_ENC=$(printf %s $LOG_ANALYTICS_WORKSPACE_ID | base64 -w0) # Needed for the next step
231229
lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys \
232230
--resource-group $GROUP_NAME \
233-
--workspace-name $wORKSPACE_NAME \
231+
--workspace-name $WORKSPACE_NAME \
234232
--query primarySharedKey \
235233
--output tsv)
236234
lOG_ANALYTICS_KEY_ENC=$(printf %s $lOG_ANALYTICS_KEY | base64 -w0) # Needed for the next step
@@ -241,13 +239,13 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
241239
```azurepowershell
242240
$LOG_ANALYTICS_WORKSPACE_ID=$(az monitor log-analytics workspace show `
243241
--resource-group $GROUP_NAME `
244-
--workspace-name $wORKSPACE_NAME `
242+
--workspace-name $WORKSPACE_NAME `
245243
--query customerId `
246244
--output tsv)
247245
$LOG_ANALYTICS_WORKSPACE_ID_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($LOG_ANALYTICS_WORKSPACE_ID))# Needed for the next step
248246
$lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys `
249247
--resource-group $GROUP_NAME `
250-
--workspace-name $wORKSPACE_NAME `
248+
--workspace-name $WORKSPACE_NAME `
251249
--query primarySharedKey `
252250
--output tsv)
253251
$lOG_ANALYTICS_KEY_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($lOG_ANALYTICS_KEY))
@@ -294,7 +292,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
294292
--release-namespace $NAMESPACE \
295293
--configuration-settings "Microsoft.CustomLocation.ServiceAccount=default" \
296294
--configuration-settings "appsNamespace=${NAMESPACE}" \
297-
--configuration-settings "CLUSTER_NAME=${CONNECTED_ENVIRONMENT_NAME}" \
295+
--configuration-settings "clusterName=${CONNECTED_ENVIRONMENT_NAME}" \
298296
--configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" \
299297
--configuration-settings "logProcessor.appLogs.destination=log-analytics" \
300298
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" \
@@ -316,7 +314,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
316314
--release-namespace $NAMESPACE `
317315
--configuration-settings "Microsoft.CustomLocation.ServiceAccount=default" `
318316
--configuration-settings "appsNamespace=${NAMESPACE}" `
319-
--configuration-settings "CLUSTER_NAME=${CONNECTED_ENVIRONMENT_NAME}" `
317+
--configuration-settings "clusterName=${CONNECTED_ENVIRONMENT_NAME}" `
320318
--configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" `
321319
--configuration-settings "logProcessor.appLogs.destination=log-analytics" `
322320
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" `
@@ -335,7 +333,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
335333
| - | - |
336334
| `Microsoft.CustomLocation.ServiceAccount` | The service account created for the custom location. It's recommended that it 's set to the value `default`. |
337335
| `appsNamespace` | The namespace used to create the app definitions and revisions. It **must** match that of the extension release namespace. |
338-
| `CLUSTER_NAME` | The name of the Container Apps extension Kubernetes environment that will be created against this extension. |
336+
| `clusterName` | The name of the Container Apps extension Kubernetes environment that will be created against this extension. |
339337
| `logProcessor.appLogs.destination` | Optional. Destination for application logs. Accepts `log-analytics` or `none`, choosing none disables platform logs. |
340338
| `logProcessor.appLogs.logAnalyticsConfig.customerId` | Required only when `logProcessor.appLogs.destination` is set to `log-analytics`. The base64-encoded Log analytics workspace ID. This parameter should be configured as a protected setting. |
341339
| `logProcessor.appLogs.logAnalyticsConfig.sharedKey` | Required only when `logProcessor.appLogs.destination` is set to `log-analytics`. The base64-encoded Log analytics workspace shared key. This parameter should be configured as a protected setting. |4
@@ -474,7 +472,8 @@ Before you can start creating apps in the custom location, you need an [Azure Co
474472
az containerapp connected-env create \
475473
--resource-group $GROUP_NAME \
476474
--name $CONNECTED_ENVIRONMENT_NAME \
477-
--custom-location $CUSTOM_LOCATION_ID
475+
--custom-location $CUSTOM_LOCATION_ID \
476+
--location $LOCATION
478477
```
479478

480479
# [PowerShell](#tab/azure-powershell)
@@ -483,7 +482,8 @@ Before you can start creating apps in the custom location, you need an [Azure Co
483482
az containerapp connected-env create `
484483
--resource-group $GROUP_NAME `
485484
--name $CONNECTED_ENVIRONMENT_NAME `
486-
--custom-location $CUSTOM_LOCATION_ID
485+
--custom-location $CUSTOM_LOCATION_ID `
486+
--location $LOCATION
487487
```
488488

489489
---

articles/cosmos-db/nosql/how-to-delete-by-partition-key.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This article explains how to use the Azure Cosmos DB SDKs to delete all items by
2222
2323
## Feature overview
2424

25-
The delete by partition key feature is an asynchronous, background operation that allows you to delete all documents with the same logical partition key value, using the Comsos SDK.
25+
The delete by partition key feature is an asynchronous, background operation that allows you to delete all documents with the same logical partition key value, using the Cosmos SDK.
2626

2727
Because the number of documents to be deleted may be large, the operation runs in the background. Though the physical deletion operation runs in the background, the effects will be available immediately, as the documents to be deleted won't appear in the results of queries or read operations.
2828

articles/openshift/howto-create-a-storageclass.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,15 @@ apiVersion: storage.k8s.io/v1
8686
metadata:
8787
name: azure-file
8888
provisioner: kubernetes.io/azure-file
89+
mountOptions:
90+
- dir_mode=0777
91+
- file_mode=0777
92+
- uid=0
93+
- gid=0
94+
- mfsymlinks
95+
- cache=strict
96+
- actimeo=30
97+
- noperm
8998
parameters:
9099
location: $LOCATION
91100
secretNamespace: kube-system
@@ -99,6 +108,17 @@ EOF
99108
oc create -f azure-storageclass-azure-file.yaml
100109
```
101110

111+
Mount options for Azure Files will generally be dependent on the workload that you are deploying and the requirements of the application. Specifically for Azure files, there are additional parameters that you should consider using.
112+
113+
Mandatory parameters:
114+
- "mfsymlinks" to map symlinks to a form the client can use
115+
- "noperm" to disable permission checks on the client side
116+
117+
Recommended parameters:
118+
- "nossharesock" to disable reusing sockets if the client is already connected via an existing mount point
119+
- "actimeo=30" (or higher) to increase the time the CIFS client caches file and directory attributes
120+
- "nobrl" to disable sending byte range lock requests to the server and for applications which have challenges with posix locks
121+
102122
## Change the default StorageClass (optional)
103123

104124
The default StorageClass on ARO is called managed-premium and uses the azure-disk provisioner. Change this by issuing patch commands against the StorageClass manifests.

articles/openshift/tutorial-create-cluster.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ You will also need sufficient Azure Active Directory permissions (either a membe
7070
az provider register -n Microsoft.Authorization --wait
7171
```
7272
73-
1. Azure Red Hat Openshift is now available as a public preview in Azure government. If you are looking to deploy there, please follow these instructions:
74-
75-
> [!IMPORTANT]
76-
> ARO preview features are available on a self-service, opt-in basis. Preview features are provided "as is" and "as available," and they are excluded from the service-level agreements and limited warranty. Preview features are partially covered by customer support on a best-effort basis. As such, these features are not meant for production use.
77-
78-
```azurecli-interactive
79-
az feature register --namespace Microsoft.RedHatOpenShift --name preview
80-
```
8173
8274
### Get a Red Hat pull secret (optional)
8375

articles/synapse-analytics/sql-data-warehouse/load-data-from-azure-blob-storage-using-copy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The first step toward loading data is to login as LoaderRC20.
7878

7979
3. Select **Connect**.
8080

81-
4. When your connection is ready, you will see two server connections in Object Explorer. One connection as ServerAdmin and one connection as MedRCLogin.
81+
4. When your connection is ready, you will see two server connections in Object Explorer. One connection as ServerAdmin and one connection as LoaderRC20.
8282

8383
![Connection is successful](./media/load-data-from-azure-blob-storage-using-polybase/connected-as-new-login.png)
8484

0 commit comments

Comments
 (0)