Skip to content

Commit 66d1794

Browse files
authored
Merge pull request #157994 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 f729c19 + 8b3ac21 commit 66d1794

File tree

8 files changed

+29
-15
lines changed

8 files changed

+29
-15
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ The following samples show public client applications (desktop or mobile applica
8383
| Desktop tutorial (.NET Core) - Optionally using:</p>- the cross platform token cache</p>- custom web UI | ![This image shows the .NET/C# logo](media/sample-v2-code/logo_NETcore.png) | [Authorization code](msal-authentication-flows.md#authorization-code)| [ms-identity-dotnet-desktop-tutorial](https://github.com/azure-samples/ms-identity-dotnet-desktop-tutorial) | |
8484
| Desktop (WPF) | ![This image shows the .NET desktop/C# logo](media/sample-v2-code/logo_NET.png) | [Authorization code](msal-authentication-flows.md#authorization-code)| [dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi) |
8585
| Desktop (Console) | ![Image that shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | |
86+
| Desktop (Console) | ![Image that shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Authorization code](msal-authentication-flows.md#authorization-code) | [active-directory-dotnetcore-daemon-v2](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/tree/master/1-Call-MSGraph) |[active-directory-dotnetcore-daemon-v2](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/blob/master/2-Call-OwnApi/README.md) |
87+
| Desktop (Console) <br> Use certificates instead of secrets | ![Image that shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Authorization code](msal-authentication-flows.md#authorization-code) | [active-directory-dotnetcore-daemon-v2](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/tree/master/1-Call-MSGraph#variation-daemon-application-using-client-credentials-with-certificates) |[active-directory-dotnetcore-daemon-v2](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/tree/master/2-Call-OwnApi#variation-daemon-application-using-client-credentials-with-certificates) |
8688
| Desktop (Console) | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) | |
8789
| Desktop (Console) | ![This is the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NETcore.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[dotnetcore-up-v2](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) | |
8890
| Desktop (Console) with WAM | ![This is the logo for .NET/C# (Desktop)](media/sample-v2-code/logo_NETcore.png) | Interactive with [Web Account Manager](/windows/uwp/security/web-account-manager) (WAM) |[dotnet-native-uwp-wam](https://github.com/azure-samples/active-directory-dotnet-native-uwp-wam) | |

articles/aks/kubernetes-action.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ jobs:
9393
steps:
9494
- uses: actions/checkout@main
9595

96-
# Connect to Azure Container registry (ACR)
96+
# Connect to Azure Container Registry (ACR)
9797
- uses: azure/docker-login@v1
9898
with:
9999
login-server: ${{ env.REGISTRY_NAME }}.azurecr.io
100100
username: ${{ secrets.REGISTRY_USERNAME }}
101101
password: ${{ secrets.REGISTRY_PASSWORD }}
102102

103-
# Container build and push to a Azure Container registry (ACR)
103+
# Container build and push to a Azure Container Registry (ACR)
104104
- run: |
105105
docker build . -t ${{ env.REGISTRY_NAME }}.azurecr.io/${{ env.APP_NAME }}:${{ github.sha }}
106106
docker push ${{ env.REGISTRY_NAME }}.azurecr.io/${{ env.APP_NAME }}:${{ github.sha }}
@@ -162,14 +162,14 @@ jobs:
162162
steps:
163163
- uses: actions/checkout@main
164164
165-
# Connect to Azure Container registry (ACR)
165+
# Connect to Azure Container Registry (ACR)
166166
- uses: azure/docker-login@v1
167167
with:
168168
login-server: ${{ env.REGISTRY_NAME }}.azurecr.io
169169
username: ${{ secrets.REGISTRY_USERNAME }}
170170
password: ${{ secrets.REGISTRY_PASSWORD }}
171171
172-
# Container build and push to a Azure Container registry (ACR)
172+
# Container build and push to a Azure Container Registry (ACR)
173173
- run: |
174174
docker build . -t ${{ env.REGISTRY_NAME }}.azurecr.io/${{ env.APP_NAME }}:${{ github.sha }}
175175
docker push ${{ env.REGISTRY_NAME }}.azurecr.io/${{ env.APP_NAME }}:${{ github.sha }}

articles/azure-monitor/agents/agent-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If you are using an older version of the agent, you must have the Virtual Machin
5252
- Ubuntu, Debian: `apt-get install -y python2`
5353
- SUSE: `zypper install -y python2`
5454

55-
The python2 executable must be aliased to *python*. Following is one method that you can use to set this alias:
55+
Again, only if you are using an older version of the agent, the python2 executable must be aliased to *python*. Following is one method that you can use to set this alias:
5656

5757
1. Run the following command to remove any existing aliases.
5858

articles/azure-monitor/logs/data-collector-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Use this format to encode the **SharedKey** signature string:
6868
```
6969
StringToSign = VERB + "\n" +
7070
Content-Length + "\n" +
71-
Content-Type + "\n" +
72-
x-ms-date + "\n" +
71+
Content-Type + "\n" +
72+
"x-ms-date:" + x-ms-date + "\n" +
7373
"/api/logs";
7474
```
7575

@@ -652,4 +652,4 @@ While the Data Collector API should cover most of your needs to collect free-for
652652
## Next steps
653653
- Use the [Log Search API](./log-query-overview.md) to retrieve data from the Log Analytics workspace.
654654

655-
- Learn more about how [create a data pipeline with the Data Collector API](create-pipeline-datacollector-api.md) using Logic Apps workflow to Azure Monitor.
655+
- Learn more about how [create a data pipeline with the Data Collector API](create-pipeline-datacollector-api.md) using Logic Apps workflow to Azure Monitor.

articles/azure-monitor/logs/move-workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The workspace source and destination subscriptions must exist within the same Az
4040
> - If you have already moved the workspace, disable all active rules under **Analytics** and re-enable them after five minutes. This should be an effective solution in most cases, though, to reiterate, it is unsupported and undertaken at your own risk.
4141
>
4242
> **Re-create alerts**
43-
> - All alerts must be re-created after a move because the permissions are based on the Azure Resource ID of the workspace, which changes during a workspace move.
43+
> - All alerts must be re-created after a workspace move or rename operation because the permissions are based on the Azure Resource ID of the workspace, which changes during a workspace move or resource name change.
4444
>
4545
> **Update resource paths**
4646
> - After a workspace move, any Azure or external resources that point to the workspace must be reviewed and updated to point to the new resource target path.

articles/azure-sql/database/elastic-jobs-tsql-create-manage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ EXEC jobs.sp_add_jobstep
202202
@output_credential_name = 'job_credential',
203203
@output_server_name = 'server1.database.windows.net',
204204
@output_database_name = '<resultsdb>',
205-
@output_table_name = '<resutlstable>';
205+
@output_table_name = '<resultstable>';
206206

207207
--Create a job to monitor pool performance
208208

@@ -250,7 +250,7 @@ SELECT elastic_pool_name , end_time, elastic_pool_dtu_limit, avg_cpu_percent, av
250250
@output_credential_name = 'job_credential',
251251
@output_server_name = 'server1.database.windows.net',
252252
@output_database_name = 'resultsdb',
253-
@output_table_name = 'resutlstable';
253+
@output_table_name = 'resultstable';
254254
```
255255

256256
## View job definitions

articles/container-instances/tutorial-docker-compose.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ az acr repository show --name <acrName> --repository azure-vote-front
169169

170170
[!INCLUDE [container-instances-create-docker-context](../../includes/container-instances-create-docker-context.md)]
171171

172-
## Deploy application to Azure Container instances
172+
## Deploy application to Azure Container Instances
173173

174174
Next, change to the ACI context. Subsequent Docker commands run in this context.
175175

@@ -243,4 +243,4 @@ In this tutorial, you used Docker Compose to switch from running a multi-contain
243243
244244
You can also use the [Docker extension for Visual Studio Code](https://aka.ms/VSCodeDocker) for an integrated experience to develop, run, and manage containers, images, and contexts.
245245

246-
If you want to take advantage of more features in Azure Container Instances, use Azure tools to specify a multi-container group. For example, see the tutorials to deploy a container group using the Azure CLI with a [YAML file](container-instances-multi-container-yaml.md), or deploy using an [Azure Resource Manager template](container-instances-multi-container-group.md).
246+
If you want to take advantage of more features in Azure Container Instances, use Azure tools to specify a multi-container group. For example, see the tutorials to deploy a container group using the Azure CLI with a [YAML file](container-instances-multi-container-yaml.md), or deploy using an [Azure Resource Manager template](container-instances-multi-container-group.md).

articles/lighthouse/how-to/monitor-at-scale.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,19 @@ We recommend creating these workspaces directly in the customer tenants. This wa
2626
You can create a Log Analytics workspace by using the [Azure portal](../../azure-monitor/logs/quick-create-workspace.md), by using [Azure CLI](../../azure-monitor/logs/quick-create-workspace-cli.md), or by using [Azure PowerShell](../../azure-monitor/logs/powershell-workspace-configuration.md).
2727

2828
> [!IMPORTANT]
29-
> Even if all of the workspaces are created in the customer tenant, the Microsoft.Insights resource provider must also be registered on a subscription in the managing tenant. If your managing tenant doesn't have a subscription, you'll need to create one, then [register the resource provider](../../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider).
29+
> Even if all the workspaces are created in the customer tenant, the Microsoft.Insights resource provider must also be registered on a subscription in the managing tenant. If your managing tenant doesn't have an existing Azure subscription, you can register the resource provider manually by using the following PowerShell commands:
30+
>
31+
> ```powershell
32+
> $ManagingTenantId = "your-managing-Azure-AD-tenant-id"
33+
>
34+
> # Authenticate as a user with admin rights on the managing tenant
35+
> Connect-AzAccount -Tenant $ManagingTenantId
36+
>
37+
> # Register the Microsoft.Insights resource providers Application Ids
38+
> New-AzADServicePrincipal -ApplicationId 1215fb39-1d15-4c05-b2e3-d519ac3feab4
39+
> New-AzADServicePrincipal -ApplicationId 6da94f3c-0d67-4092-a408-bb5d1cb08d2d
40+
> ```
41+
>
3042
3143
## Deploy policies that log data
3244
@@ -62,4 +74,4 @@ alertsmanagementresources
6274

6375
- Try out the [Activity Logs by Domain](https://github.com/Azure/Azure-Lighthouse-samples/tree/master/templates/workbook-activitylogs-by-domain) workbook on GitHub.
6476
- Explore this [MVP-built sample workbook](https://github.com/scautomation/Azure-Automation-Update-Management-Workbooks), which tracks patch compliance reporting by [querying Update Management logs](../../automation/update-management/query-logs.md) across multiple Log Analytics workspaces.
65-
- Learn about other [cross-tenant management experiences](../concepts/cross-tenant-management-experience.md).
77+
- Learn about other [cross-tenant management experiences](../concepts/cross-tenant-management-experience.md).

0 commit comments

Comments
 (0)