Skip to content

Commit 6216ea0

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-java-resources
2 parents bb6bb24 + c5403fc commit 6216ea0

File tree

123 files changed

+2141
-1239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2141
-1239
lines changed

.openpublishing.redirection.defender-for-iot.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-training-sessions.md",
5+
"redirect_url": "https://techcommunity.microsoft.com/t5/microsoft-defender-for-iot-blog/microsoft-defender-for-iot-ninja-training/ba-p/2428899",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-manage-the-alert-event.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
611
"redirect_document_id": false
712
},
8-
{
9-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
13+
{ "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
1014
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
1115
"redirect_document_id": false
1216
},

articles/active-directory/roles/admin-units-assign-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The following Azure AD roles can be assigned with administrative unit scope. Add
5050
| [SharePoint Administrator](permissions-reference.md#sharepoint-administrator) | Can manage Microsoft 365 groups in the assigned administrative unit only. For SharePoint sites associated with Microsoft 365 groups in an administrative unit, can also update site properties (site name, URL, and external sharing policy) using the Microsoft 365 admin center. Cannot use the SharePoint admin center or SharePoint APIs to manage sites. |
5151
| [Teams Administrator](permissions-reference.md#teams-administrator) | Can manage Microsoft 365 groups in the assigned administrative unit only. Can manage team members in the Microsoft 365 admin center for teams associated with groups in the assigned administrative unit only. Cannot use the Teams admin center. |
5252
| [Teams Devices Administrator](permissions-reference.md#teams-devices-administrator) | Can perform management related tasks on Teams certified devices. |
53-
| [User Administrator](permissions-reference.md#user-administrator) | Can manage all aspects of users and groups, including resetting passwords for limited admins within the assigned administrative unit only. |
53+
| [User Administrator](permissions-reference.md#user-administrator) | Can manage all aspects of users and groups, including resetting passwords for limited admins within the assigned administrative unit only. Cannot currently manage users' profile photographs. |
5454
| [<Custom role>](custom-create.md) | Can perform actions that apply to users, groups, or devices, according to the definition of the custom role. |
5555

5656
Certain role permissions apply only to non-administrator users when assigned with the scope of an administrative unit. In other words, administrative unit scoped [Helpdesk Administrators](permissions-reference.md#helpdesk-administrator) can reset passwords for users in the administrative unit only if those users do not have administrator roles. The following list of permissions are restricted when the target of an action is another administrator:

articles/active-directory/saas-apps/officespace-software-provisioning-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Before configuring and enabling automatic user provisioning, you should decide w
4545

4646
## Set up OfficeSpace Software for provisioning
4747

48-
1. Sign in to your [OfficeSpace Software Admin Console](https://support.officespacesoftware.com/hc). Navigate to **Settings > Connectors**.
48+
1. Sign in to your [OfficeSpace Software Admin Console](https://support.officespacesoftware.com/s/). Navigate to **Settings > Connectors**.
4949

5050
![OfficeSpace Software Admin Console](media/officespace-software-provisioning-tutorial/settings.png)
5151

@@ -147,4 +147,4 @@ For more information on how to read the Azure AD provisioning logs, see [Reporti
147147

148148
## Next steps
149149

150-
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)
150+
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

articles/aks/tutorial-kubernetes-deploy-application.md

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
---
2-
title: Kubernetes on Azure tutorial - Deploy an application
2+
title: Kubernetes on Azure tutorial - Deploy an application
33
description: In this Azure Kubernetes Service (AKS) tutorial, you deploy a multi-container application to your cluster using a custom image stored in Azure Container Registry.
44
services: container-service
55
ms.topic: tutorial
6-
ms.date: 05/24/2021
7-
6+
ms.date: 01/04/2023
87
ms.custom: mvc, devx-track-azurepowershell
98

109
#Customer intent: As a developer, I want to learn how to deploy apps to an Azure Kubernetes Service (AKS) cluster so that I can deploy and run my own applications.
1110
---
1211

1312
# Tutorial: Run applications in Azure Kubernetes Service (AKS)
1413

15-
Kubernetes provides a distributed platform for containerized applications. You build and deploy your own applications and services into a Kubernetes cluster, and let the cluster manage the availability and connectivity. In this tutorial, part four of seven, a sample application is deployed into a Kubernetes cluster. You learn how to:
14+
Kubernetes provides a distributed platform for containerized applications. You build and deploy your own applications and services into a Kubernetes cluster and let the cluster manage the availability and connectivity. In this tutorial, part four of seven, you deploy a sample application into a Kubernetes cluster. You learn how to:
1615

1716
> [!div class="checklist"]
18-
> * Update a Kubernetes manifest file
19-
> * Run an application in Kubernetes
20-
> * Test the application
17+
>
18+
> * Update a Kubernetes manifest file.
19+
> * Run an application in Kubernetes.
20+
> * Test the application.
2121
22-
In later tutorials, this application is scaled out and updated.
22+
In later tutorials, you'll scale out and update your application.
2323

24-
This quickstart assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for Azure Kubernetes Service (AKS)][kubernetes-concepts].
24+
This quickstart assumes you have a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for Azure Kubernetes Service (AKS)][kubernetes-concepts].
2525

2626
> [!TIP]
27-
> AKS clusters can use GitOps for configuration management. This enables declarations of your cluster's state, which are pushed to source control, to be applied to the cluster automatically. To learn how to use GitOps to deploy an application with an AKS cluster, see the tutorial [Use GitOps with Flux v2][gitops-flux-tutorial] and follow the [prerequisites for Azure Kubernetes Service clusters][gitops-flux-tutorial-aks].
27+
> AKS clusters can use GitOps for configuration management. GitOp enables declarations of your cluster's state, which are pushed to source control, to be applied to the cluster automatically. To learn how to use GitOps to deploy an application with an AKS cluster, see the [prerequisites for Azure Kubernetes Service clusters][gitops-flux-tutorial-aks] in the [GitOps with Flux v2][gitops-flux-tutorial] tutorial.
2828
2929
## Before you begin
3030

31-
In previous tutorials, an application was packaged into a container image, this image was uploaded to Azure Container Registry, and a Kubernetes cluster was created.
31+
In previous tutorials, you packaged an application into a container image, uploaded the image to Azure Container Registry, and created a Kubernetes cluster.
3232

33-
To complete this tutorial, you need the pre-created `azure-vote-all-in-one-redis.yaml` Kubernetes manifest file. This file was downloaded with the application source code in a previous tutorial. Verify that you've cloned the repo, and that you have changed directories into the cloned repo. If you haven't done these steps, and would like to follow along, start with [Tutorial 1 – Create container images][aks-tutorial-prepare-app].
33+
To complete this tutorial, you need the pre-created `azure-vote-all-in-one-redis.yaml` Kubernetes manifest file. This file download was included with the application source code in a previous tutorial. Verify that you've cloned the repo and that you've changed directories into the cloned repo. If you haven't done these steps and would like to follow along, start with [Tutorial 1: Prepare an application for AKS][aks-tutorial-prepare-app].
3434

3535
### [Azure CLI](#tab/azure-cli)
3636

@@ -48,37 +48,37 @@ In these tutorials, an Azure Container Registry (ACR) instance stores the contai
4848

4949
### [Azure CLI](#tab/azure-cli)
5050

51-
Get the ACR login server name using the [az acr list][az-acr-list] command as follows:
51+
Get the ACR login server name using the [az acr list][az-acr-list] command.
5252

5353
```azurecli
5454
az acr list --resource-group myResourceGroup --query "[].{acrLoginServer:loginServer}" --output table
5555
```
5656

5757
### [Azure PowerShell](#tab/azure-powershell)
5858

59-
Get the ACR login server name using the [Get-AzContainerRegistry][get-azcontainerregistry] cmdlet as follows:
59+
Get the ACR login server name using the [Get-AzContainerRegistry][get-azcontainerregistry] cmdlet.
6060

6161
```azurepowershell
6262
(Get-AzContainerRegistry -ResourceGroupName myResourceGroup -Name <acrName>).LoginServer
6363
```
6464

6565
---
6666

67-
The sample manifest file from the git repo cloned in the first tutorial uses the images from Microsoft Container Registry (*mcr.microsoft.com*). Make sure that you're in the cloned *azure-voting-app-redis* directory, then open the manifest file with a text editor, such as `vi`:
67+
The sample manifest file from the git repo you cloned in the first tutorial uses the images from Microsoft Container Registry (*mcr.microsoft.com*). Make sure you're in the cloned *azure-voting-app-redis* directory, and then open the manifest file with a text editor, such as `vi`:
6868

6969
```console
7070
vi azure-vote-all-in-one-redis.yaml
7171
```
7272

73-
Replace *mcr.microsoft.com* with your ACR login server name. The image name is found on line 60 of the manifest file. The following example shows the default image name:
73+
Replace *mcr.microsoft.com* with your ACR login server name. You can find the image name on line 60 of the manifest file. The following example shows the default image name:
7474

7575
```yaml
7676
containers:
7777
- name: azure-vote-front
7878
image: mcr.microsoft.com/azuredocs/azure-vote-front:v1
7979
```
8080
81-
Provide your own ACR login server name so that your manifest file looks like the following example:
81+
Provide your own ACR login server name so your manifest file looks similar to the following example:
8282
8383
```yaml
8484
containers:
@@ -90,7 +90,7 @@ Save and close the file. In `vi`, use `:wq`.
9090

9191
## Deploy the application
9292

93-
To deploy your application, use the [kubectl apply][kubectl-apply] command. This command parses the manifest file and creates the defined Kubernetes objects. Specify the sample manifest file, as shown in the following example:
93+
To deploy your application, use the [`kubectl apply`][kubectl-apply] command, specifying the sample manifest file. This command parses the manifest file and creates the defined Kubernetes objects.
9494

9595
```console
9696
kubectl apply -f azure-vote-all-in-one-redis.yaml
@@ -111,13 +111,13 @@ service "azure-vote-front" created
111111

112112
When the application runs, a Kubernetes service exposes the application front end to the internet. This process can take a few minutes to complete.
113113

114-
To monitor progress, use the [kubectl get service][kubectl-get] command with the `--watch` argument.
114+
To monitor progress, use the [`kubectl get service`][kubectl-get] command with the `--watch` argument.
115115

116116
```console
117117
kubectl get service azure-vote-front --watch
118118
```
119119

120-
Initially the *EXTERNAL-IP* for the *azure-vote-front* service is shown as *pending*:
120+
Initially the *EXTERNAL-IP* for the *azure-vote-front* service shows as *pending*.
121121

122122
```output
123123
azure-vote-front LoadBalancer 10.0.34.242 <pending> 80:30676/TCP 5s
@@ -129,22 +129,23 @@ When the *EXTERNAL-IP* address changes from *pending* to an actual public IP add
129129
azure-vote-front LoadBalancer 10.0.34.242 52.179.23.131 80:30676/TCP 67s
130130
```
131131

132-
To see the application in action, open a web browser to the external IP address of your service:
132+
To see the application in action, open a web browser to the external IP address of your service.
133133

134134
:::image type="content" source="./media/container-service-kubernetes-tutorials/azure-vote.png" alt-text="Screenshot showing the container image Azure Voting App running in an AKS cluster opened in a local web browser" lightbox="./media/container-service-kubernetes-tutorials/azure-vote.png":::
135135

136-
If the application didn't load, it might be due to an authorization problem with your image registry. To view the status of your containers, use the `kubectl get pods` command. If the container images can't be pulled, see [Authenticate with Azure Container Registry from Azure Kubernetes Service](cluster-container-registry-integration.md).
136+
If the application doesn't load, it might be an authorization problem with your image registry. To view the status of your containers, use the `kubectl get pods` command. If you can't pull the container images, see [Authenticate with Azure Container Registry from Azure Kubernetes Service](cluster-container-registry-integration.md).
137137

138138
## Next steps
139139

140-
In this tutorial, a sample Azure vote application was deployed to a Kubernetes cluster in AKS. You learned how to:
140+
In this tutorial, you deployed a sample Azure vote application to a Kubernetes cluster in AKS. You learned how to:
141141

142142
> [!div class="checklist"]
143-
> * Update a Kubernetes manifest files
144-
> * Run an application in Kubernetes
145-
> * Test the application
143+
>
144+
> * Update a Kubernetes manifest file.
145+
> * Run an application in Kubernetes.
146+
> * Test the application.
146147

147-
Advance to the next tutorial to learn how to scale a Kubernetes application and the underlying Kubernetes infrastructure.
148+
In the next tutorial, you'll learn how to scale a Kubernetes application and the underlying Kubernetes infrastructure.
148149

149150
> [!div class="nextstepaction"]
150151
> [Scale Kubernetes application and infrastructure][aks-tutorial-scale]

articles/application-gateway/configuration-listeners.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ To configure a global custom error page, see [Azure PowerShell configuration](./
8585

8686
## TLS policy
8787

88-
You can centralize TLS/SSL certificate management and reduce encryption-decryption overhead for a backend server farm. Centralized TLS handling also lets you specify a central TLS policy that's suited to your security requirements. You can choose *default*, *predefined*, or *custom* TLS policy.
88+
You can centralize TLS/SSL certificate management and reduce encryption-decryption overhead for a backend server farm. Centralized TLS handling also lets you specify a central TLS policy that's suited to your security requirements. You can choose *predefined* or *custom* TLS policy.
8989

90-
You configure TLS policy to control TLS protocol versions. You can configure an application gateway to use a minimum protocol version for TLS handshakes from TLS1.0, TLS1.1, and TLS1.2. By default, SSL 2.0 and 3.0 are disabled and aren't configurable. For more information, see [Application Gateway TLS policy overview](./application-gateway-ssl-policy-overview.md).
90+
You configure TLS policy to control TLS protocol versions. You can configure an application gateway to use a minimum protocol version for TLS handshakes from TLS1.0, TLS1.1, TLS1.2, and TLS1.3. By default, SSL 2.0 and 3.0 are disabled and aren't configurable. For more information, see [Application Gateway TLS policy overview](./application-gateway-ssl-policy-overview.md).
9191

9292
After you create a listener, you associate it with a request-routing rule. That rule determines how requests that are received on the listener are routed to the back end.
9393

articles/application-gateway/ingress-controller-install-new.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ Follow the steps below to create an Azure Active Directory (Azure AD) [service p
4646
The `appId` and `password` values from the JSON output will be used in the following steps
4747
4848
49-
1. Use the `appId` from the previous command's output to get the `objectId` of the new service principal:
49+
1. Use the `appId` from the previous command's output to get the `id` of the new service principal:
5050
```azurecli
51-
objectId=$(az ad sp show --id $appId --query "objectId" -o tsv)
51+
objectId=$(az ad sp show --id $appId --query "id" -o tsv)
5252
```
5353
The output of this command is `objectId`, which will be used in the Azure Resource Manager template below
5454
@@ -250,8 +250,13 @@ Kubernetes. We'll use it to install the `application-gateway-kubernetes-ingress`
250250
nano helm-config.yaml
251251
```
252252
253+
> [!NOTE]
254+
> **For deploying to Sovereign Clouds (e.g., Azure Government)**, the `appgw.environment` configuration parameter must be added and set to the appropriate value as documented below.
255+
256+
253257
Values:
254258
- `verbosityLevel`: Sets the verbosity level of the AGIC logging infrastructure. See [Logging Levels](https://github.com/Azure/application-gateway-kubernetes-ingress/blob/463a87213bbc3106af6fce0f4023477216d2ad78/docs/troubleshooting.md#logging-levels) for possible values.
259+
- `appgw.environment`: Sets cloud environment. Possbile values: `AZURECHINACLOUD`, `AZUREGERMANCLOUD`, `AZUREPUBLICCLOUD`, `AZUREUSGOVERNMENTCLOUD`
255260
- `appgw.subscriptionId`: The Azure Subscription ID in which Application Gateway resides. Example: `a123b234-a3b4-557d-b2df-a0bc12de1234`
256261
- `appgw.resourceGroup`: Name of the Azure Resource Group in which Application Gateway was created. Example: `app-gw-resource-group`
257262
- `appgw.name`: Name of the Application Gateway. Example: `applicationgatewayd0f0`
@@ -347,4 +352,4 @@ kubectl apply -f aspnetapp.yaml
347352
348353
## Other Examples
349354
This [how-to guide](ingress-controller-expose-service-over-http-https.md) contains more examples on how to expose an AKS
350-
service via HTTP or HTTPS, to the Internet with Application Gateway.
355+
service via HTTP or HTTPS, to the Internet with Application Gateway.

articles/applied-ai-services/form-recognizer/containers/form-recognizer-container-install-run.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: applied-ai-services
88
ms.subservice: forms-recognizer
99
ms.topic: how-to
10-
ms.date: 11/29/2022
10+
ms.date: 01/04/2023
1111
ms.author: lajanuar
1212
monikerRange: 'form-recog-2.1.0'
1313
recommendations: false
@@ -246,7 +246,6 @@ services:
246246
azure-cognitive-service-layout:
247247
container_name: azure-cognitive-service-layout
248248
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout
249-
user: root
250249
environment:
251250
- EULA=accept
252251
- billing={FORM_RECOGNIZER_ENDPOINT_URI}

articles/automation/shared-resources/certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage certificates in Azure Automation
33
description: This article tells how to work with certificates for access by runbooks and DSC configurations.
44
services: automation
55
ms.subservice: shared-capabilities
6-
ms.date: 12/22/2020
6+
ms.date: 01/04/2023
77
ms.topic: conceptual
88
ms.custom: devx-track-azurepowershell
99
---
@@ -59,7 +59,7 @@ When you create a new certificate, you upload a .cer or .pfx file to Automation.
5959
1. From your Automation account, on the left-hand pane select **Certificates** under **Shared Resource**.
6060
1. On the **Certificates** page, select **Add a certificate**.
6161
1. In the **Name** field, type a name for the certificate.
62-
1. To browse for a **.cer** or **.pfx** file, under **Upload a certificate file**, choose **Select a file**. If you select a **.pfx** file, specify a password and indicate if it can be exported.
62+
1. To browse for a **.cer** or **.pfx** file, under **Upload a certificate file**, choose **Select a file**. If you select a **.pfx** file, specify a password and indicate if it can be exported. If you are using Azure Automation portal to upload certificates, it might fail for partner (CSP) accounts. We recommend that you use [PowerShell cmdlets](#powershell-cmdlets-to-access-certificates) as a workaround to overcome this issue.
6363
1. Select **Create** to save the new certificate asset.
6464

6565
### Create a new certificate with PowerShell

0 commit comments

Comments
 (0)