Skip to content

Commit 5a0d895

Browse files
Merge branch 'MicrosoftDocs:main' into main
2 parents 81f595f + 65b8889 commit 5a0d895

File tree

6 files changed

+55
-35
lines changed

6 files changed

+55
-35
lines changed

articles/azure-monitor/logs/log-analytics-overview.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Whether you work with the results of your queries interactively or use them with
1717
> [!TIP]
1818
> This article describes Log Analytics and its features. If you want to jump right into a tutorial, see [Log Analytics tutorial](./log-analytics-tutorial.md).
1919
20+
Here's a video version of this tutorial:
21+
22+
> [!VIDEO https://www.youtube.com/embed/-aMecR2Nrfc]
23+
2024
## Start Log Analytics
2125

2226
To start Log Analytics in the Azure portal, on the **Azure Monitor** menu select **Logs**. You'll also see this option on the menu for most Azure resources. No matter where you start Log Analytics, the tool is the same. But the menu you use to start Log Analytics determines the data that's available.
@@ -44,23 +48,24 @@ The top bar has controls for working with a query in the query window.
4448
| Scope | Specifies the scope of data used for the query. This could be all the data in a Log Analytics workspace or data for a particular resource across multiple workspaces. See [Query scope](./scope.md). |
4549
| Run button | Run the selected query in the query window. You can also select **Shift+Enter** to run a query. |
4650
| Time picker | Select the time range for the data available to the query. This action is overridden if you include a time filter in the query. See [Log query scope and time range in Azure Monitor Log Analytics](./scope.md). |
47-
| Save button | Save the query to **Query Explorer** for the workspace. |
48-
Copy button | Copy a link to the query, the query text, or the query results to the clipboard. |
49-
| New alert rule button | Create a new tab with an empty query. |
51+
| Save button | Save the query to a [query pack](./query-packs.md). Saved queries are available from: <ul><li> The **Other** section in the **Query Explorer** for the workspace</li><li>The **Other** section in the **Queries** tab in the [left sidebar](#left-sidebar) for the workspace</ul> |
52+
Share button | Copy a link to the query, the query text, or the query results to the clipboard. |
53+
| New alert rule button | Open the Create an alert rule page. Use this page to [create an alert rule](../alerts/alerts-create-new-alert-rule.md?tabs=log) with an alert type of [log alert](../alerts/alerts-types.md#log-alerts). The page opens with the [Conditions tab](../alerts/alerts-create-new-alert-rule.md?tabs=log#set-the-alert-rule-conditions) selected, and your query is added to the **Search query** field. |
5054
| Export button | Export the results of the query to a CSV file or the query to Power Query Formula Language format for use with Power BI. |
5155
| Pin to button | Pin the results of the query to an Azure dashboard or add them to an Azure workbook. |
5256
| Format query button | Arrange the selected text for readability. |
53-
| Example queries button | Open the example queries dialog that appears when you first open Log Analytics. |
54-
| Query Explorer button | Open **Query Explorer**, which provides access to saved queries in the workspace. |
57+
| Search job mode toggle | [Run search jobs](./search-jobs.md).
58+
| Queries button | Open **Query Explorer**, which provides access to saved queries in the workspace. |
5559

5660
### Left sidebar
5761

58-
The sidebar on the left lists tables in the workspace, sample queries, and filter options for the current query.
62+
The sidebar on the left lists tables in the workspace, sample queries, functions, and filter options for the current query.
5963

6064
| Tab | Description |
6165
|:---|:---|
6266
| Tables | Lists the tables that are part of the selected scope. Select **Group by** to change the grouping of the tables. Hover over a table name to display a dialog with a description of the table and options to view its documentation and preview its data. Expand a table to view its columns. Double-click a table or column name to add it to the query. |
6367
| Queries | List of example queries that you can open in the query window. This list is the same one that appears when you open Log Analytics. Select **Group by** to change the grouping of the queries. Double-click a query to add it to the query window or hover over it for other options. |
68+
| Functions | Lists the [functions](./functions.md) in the workspace. |
6469
| Filter | Creates filter options based on the results of a query. After you run a query, columns appear with different values from the results. Select one or more values, and then select **Apply & Run** to add a **where** command to the query and run it again. |
6570

6671
### Query window

articles/azure-vmware/ecosystem-disaster-recovery-vms.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ title: Disaster recovery solutions for Azure VMware Solution virtual machines
33
description: Learn about leading disaster recovery solutions for your Azure VMware Solution private cloud.
44
ms.topic: how-to
55
ms.service: azure-vmware
6-
ms.date: 11/29/2021
6+
ms.date: 11/29/2023
7+
ms.custom: engagement-fy23
78
---
89

910
# Disaster recovery solutions for Azure VMware Solution virtual machines (VMs)
1011

11-
One of the most important aspects of any Azure VMware Solution deployment is disaster recovery, which can be achieved by creating disaster recovery plans between different Azure VMware Solution regions or between Azure and an on-premises vSphere environment.
12+
One of the most important aspects of any Azure VMware Solution deployment is disaster recovery. You can create disaster recovery plans between different Azure VMware Solution regions or between Azure and an on-premises vSphere environment.
1213

1314
We currently offer customers the possibility to implement their disaster recovery plans using state-of-the-art VMware solution like [SRM](disaster-recovery-using-vmware-site-recovery-manager.md) or [HCX](deploy-disaster-recovery-using-vmware-hcx.md).
1415

15-
Following our principle of giving customers the choice to apply their investments in skills and technology we´ve collaborated with some of the leading partners in the industry.
16+
Following our principle of giving customers the choice to apply their investments in skills and technology, we collaborated with some of the leading partners in the industry.
1617

17-
You can find more information about their solutions in the links below:
18-
- [Jetstream](https://www.jetstreamsoft.com/2020/09/28/disaster-recovery-for-avs/)
19-
- [Zerto](https://www.zerto.com/solutions/use-cases/disaster-recovery/)
18+
You can find more information about their solutions in the following links:
19+
- [JetStream](https://www.jetstreamsoft.com/2020/09/28/disaster-recovery-for-avs/)
20+
- [Zerto](https://help.zerto.com/bundle/Install.AVS.HTML/page/Prerequisites_Zerto_AVS.htm)
2021
- [RiverMeadow](https://www.rivermeadow.com/disaster-recovery-azure-blob)

articles/virtual-network-manager/create-virtual-network-manager-portal.md

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,7 @@ In this quickstart, you deploy three virtual networks and use Azure Virtual Netw
2424
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
2525
- To modify dynamic network groups, you must be [granted access via Azure RBAC role](concept-network-groups.md#network-groups-and-azure-policy) assignment only. Classic Admin/legacy authorization is not supported.
2626

27-
## Create a Virtual Network Manager instance
28-
29-
Deploy a Virtual Network Manager instance with the defined scope and access that you need:
30-
31-
1. Sign in to the [Azure portal](https://portal.azure.com/).
32-
33-
1. Select **+ Create a resource** and search for **Network Manager**. Then select **Network Manager** > **Create** to begin setting up Virtual Network Manager.
34-
35-
1. On the **Basics** tab, enter or select the following information, and then select **Review + create**.
36-
37-
:::image type="content" source="./media/create-virtual-network-manager-portal/network-manager-basics-thumbnail.png" alt-text="Screenshot of basic information for creating a network manager." lightbox="./media/create-virtual-network-manager-portal/network-manager-basics-thumbnail.png":::
38-
39-
| Setting | Value |
40-
| ------- | ----- |
41-
| **Subscription** | Select the subscription where you want to deploy Virtual Network Manager. |
42-
| **Resource group** | Select **Create new** and enter **rg-learn-eastus-001**.
43-
| **Name** | Enter **vnm-learn-eastus-001**. |
44-
| **Region** | Enter **eastus** or a region of your choosing. Virtual Network Manager can manage virtual networks in any region. The selected region is where the Virtual Network Manager instance will be deployed. |
45-
| **Description** | *(Optional)* Provide a description about this Virtual Network Manager instance and the task it's managing. |
46-
| [Scope](concept-network-manager-scope.md#scope) | Choose **Select scopes** and then select your subscription.</br> Select **Add to selected scope** > **Select**. </br> Scope information defines the resources that Virtual Network Manager can manage. You can choose subscriptions and management groups.
47-
| [Features](concept-network-manager-scope.md#features) | Select **Connectivity** and **Security Admin** from the dropdown list. </br> **Connectivity** enables the creation of a full mesh or hub-and-spoke network topology between virtual networks within the scope. </br> **Security Admin** enables the creation of global network security rules. |
48-
49-
1. Select **Create** after your configuration passes validation.
27+
[!INCLUDE [virtual-network-manager-create-instance](../../includes/virtual-network-manager-create-instance.md)]
5028

5129
## Create virtual networks
5230

-19.9 KB
Loading
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
title: include file
3+
description: include file
4+
services: virtual-network-manager
5+
author: mbender
6+
ms.service: virtual-network-manager
7+
ms.topic: include
8+
ms.date: 11/29/2023
9+
ms.author: mbender-ms
10+
ms.custom:
11+
- include file
12+
---
13+
14+
## Create a Virtual Network Manager instance
15+
16+
Deploy a Virtual Network Manager instance with the defined scope and access that you need. You can create a Virtual Network Manager instance by using the Azure portal, Azure PowerShell, or Azure CLI. This article shows you how to create a Virtual Network Manager instance by using the Azure portal.
17+
18+
1. Sign in to the [Azure portal](https://portal.azure.com/).
19+
20+
1. Select **+ Create a resource** and search for **Network Manager**. Then select **Network Manager** > **Create** to begin setting up Virtual Network Manager.
21+
22+
1. On the **Basics** tab, enter or select the following information, and then select **Review + create**.
23+
24+
:::image type="content" source="./media/virtual-network-manager-create-instance/create-virtual-network-manager-instance.png" alt-text="Screenshot of basic information for creating a network manager.":::
25+
26+
| Setting | Value |
27+
| ------- | ----- |
28+
| **Subscription** | Select the subscription where you want to deploy Virtual Network Manager. |
29+
| **Resource group** | Select **Create new** and enter **rg-learn-eastus-001**.
30+
| **Name** | Enter **vnm-learn-eastus-001**. |
31+
| **Region** | Enter **eastus** or a region of your choosing. Virtual Network Manager can manage virtual networks in any region. The selected region is where the Virtual Network Manager instance will be deployed. |
32+
| **Description** | *(Optional)* Provide a description about this Virtual Network Manager instance and the task it's managing. |
33+
| [Scope](../articles/virtual-network-manager/concept-network-manager-scope.md#scope) | Choose **Select scopes** and then select your subscription.</br> Select **Add to selected scope** > **Select**. </br> Scope information defines the resources that Virtual Network Manager can manage. You can choose subscriptions and management groups.
34+
| [Features](../articles/virtual-network-manager/concept-network-manager-scope.md#features) | Select **Connectivity** and **Security Admin** from the dropdown list. </br> **Connectivity** enables the creation of a full mesh or hub-and-spoke network topology between virtual networks within the scope. </br> **Security Admin** enables the creation of global network security rules. |
35+
36+
2. Select **Create** after your configuration passes validation.

0 commit comments

Comments
 (0)