Skip to content

Commit 73ed635

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aprilupdates
2 parents d57f6fa + 85a2de3 commit 73ed635

File tree

9 files changed

+86
-81
lines changed

9 files changed

+86
-81
lines changed

articles/azure-monitor/platform/alerts-common-schema-definitions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Any alert instance describes the resource that was affected and the cause of the
167167
"SearchIntervalInMinutes": "15",
168168
"Threshold": 10000,
169169
"Operator": "Less Than",
170-
"SearchResult": {
170+
"SearchResults": {
171171
"tables": [
172172
{
173173
"name": "PrimaryResult",
@@ -230,7 +230,7 @@ Any alert instance describes the resource that was affected and the cause of the
230230
"Threshold": 10000,
231231
"Operator": "Less Than",
232232
"ApplicationId": "8e20151d-75b2-4d66-b965-153fb69d65a6",
233-
"SearchResult": {
233+
"SearchResults": {
234234
"tables": [
235235
{
236236
"name": "PrimaryResult",

articles/bastion/bastion-connect-vm-scale-set.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Connect to a Windows virtual machine scale set using Azure Bastion | Microsoft Docs'
33
description: In this article, learn how to connect to an Azure virtual machine scale set using Azure Bastion.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 02/03/2020
10-
ms.author: cherylmc
10+
ms.author: charwen
1111

1212
---
1313

articles/bastion/bastion-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Azure Bastion FAQ | Microsoft Docs
33
description: The FAQ for Azure Bastion
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 12/09/2019
10-
ms.author: cherylmc
10+
ms.author: charwen
1111
---
1212
# Azure Bastion FAQ
1313

articles/bastion/bastion-vm-copy-paste.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Copy and paste to and from a virtual machine: Azure Bastion'
33
description: In this article, learn how copy and paste to and from an Azure VM using Bastion.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 02/03/2020
10-
ms.author: cherylmc
10+
ms.author: charwen
1111
# Customer intent: I want to copy and paste to and from VMs using Azure Bastion.
1212

1313
---

articles/bastion/bastion-vm-full-screen.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Azure Bastion: View virtual machine session: full screen'
33
description: In this article, learn how to change the view to full screen.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 02/03/2020
10-
ms.author: cherylmc
10+
ms.author: charwen
1111
# Customer intent: I want to manage my VM experience using Azure Bastion.
1212

1313
---

articles/bastion/diagnostic-logs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Enable and work with Azure Bastion diagnostic logs'
33
description: In this article, learn how to enable and work with Azure Bastion diagnostic logs.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 02/03/2020
10-
ms.author: cherylmc
10+
ms.author: charwen
1111

1212
---
1313

@@ -40,7 +40,7 @@ To access your diagnostics logs, you can directly use the storage account that y
4040
2. As you navigate to inside the container, you see various folders in your blog. These folders indicate the resource hierarchy for your Azure Bastion resource.
4141

4242
![add diagnostic setting](./media/diagnostic-logs/2-resource-h.png)
43-
3. Navigate to the full hierarchy of your Azure Bastion resource whose diagnostics logs you wish to access/view. The ‘y=’, ‘m=’, ‘d=’, ‘h=’ and ‘m=’ indicate the year, month, day, hour, and minute respectively for the diagnostic logs.
43+
3. Navigate to the full hierarchy of your Azure Bastion resource whose diagnostics logs you wish to access/view. The 'y=', 'm=', 'd=', 'h=' and 'm=' indicate the year, month, day, hour, and minute respectively for the diagnostic logs.
4444

4545
![select storage location](./media/diagnostic-logs/3-resource-location.png)
4646
4. Locate the json file created by Azure Bastion that contains the diagnostics log data for the time-period navigated to.

articles/bastion/session-monitoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Azure Bastion session monitoring and management | Microsoft Docs'
33
description: In this article, learn how to select an ongoing session and force-disconnect or delete it.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 02/03/2020
10-
ms.author: cherylmc
10+
ms.author: charwen
1111

1212
---
1313

articles/bastion/troubleshoot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: 'Troubleshoot Azure Bastion | Microsoft Docs'
33
description: In this article, learn how to troubleshoot Azure Bastion.
44
services: bastion
5-
author: cherylmc
5+
author: charwen
66

77
ms.service: bastion
88
ms.topic: conceptual
99
ms.date: 10/16/2019
10-
ms.author: cherylmc
10+
ms.author: charwen
1111

1212
---
1313

0 commit comments

Comments
 (0)