Skip to content

Commit 45a5398

Browse files
author
JiayueHu
authored
Merge pull request #198317 from MicrosoftDocs/main
Publish to live, May 16th 8AM
2 parents fa512a1 + f770e06 commit 45a5398

23 files changed

+150
-261
lines changed

articles/app-service/tutorial-networking-isolate-vnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Because your Key Vault and Cognitive Services resources will sit behind [private
9292
9393
## Create private endpoints
9494
95-
1. In the private endpoint subnet of your virtual network, create a private endpoint for your key vault.
95+
1. In the private endpoint subnet of your virtual network, create a private endpoint for your Cognitive Service.
9696
9797
```azurecli-interactive
9898
# Get Cognitive Services resource ID
@@ -198,4 +198,4 @@ This command may take a minute to run.
198198
## Next steps
199199

200200
- [Integrate your app with an Azure virtual network](overview-vnet-integration.md)
201-
- [App Service networking features](networking-features.md)
201+
- [App Service networking features](networking-features.md)

articles/azure-functions/functions-bindings-timer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ Expressed as a string, the `TimeSpan` format is `hh:mm:ss` when `hh` is less tha
318318
|--------------|----------------|
319319
| "01:00:00" | every hour |
320320
| "00:01:00" | every minute |
321-
| "25:00:00" | every 25 days |
321+
| "25:00:00:00"| every 25 days |
322322
| "1.00:00:00" | every day |
323323

324324
### Scale-out

articles/azure-functions/functions-deployment-slots.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Some configuration settings are slot-specific. The following lists detail which
5656
* Custom domain names
5757
* Non-public certificates and TLS/SSL settings
5858
* Scale settings
59-
* WebJobs schedulers
6059
* IP restrictions
6160
* Always On
6261
* Diagnostic settings
@@ -69,7 +68,6 @@ Some configuration settings are slot-specific. The following lists detail which
6968
* Connection strings (can be configured to stick to a slot)
7069
* Handler mappings
7170
* Public certificates
72-
* WebJobs content
7371
* Hybrid connections *
7472
* Virtual network integration *
7573
* Service endpoints *

articles/azure-monitor/alerts/alerts-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can also [create log alert rules using Azure Resource Manager templates](../
3737
1. Write a query that will find the log events for which you want to create an alert. You can use the [alert query examples article](../logs/queries.md) to understand what you can discover or [get started on writing your own query](../logs/log-analytics-tutorial.md). Also, [learn how to create optimized alert queries](alerts-log-query.md).
3838
1. From the top command bar, Select **+ New Alert rule**.
3939

40-
:::image type="content" source="media/alerts-log/alerts-create-new-alert-rule.png" alt-text="Create new alert rule.":::
40+
:::image type="content" source="media/alerts-log/alerts-create-new-alert-rule.png" alt-text="Create new alert rule." lightbox="media/alerts-log/alerts-create-new-alert-rule-expanded.png":::
4141

4242
1. The **Condition** tab opens, populated with your log query.
4343

articles/azure-monitor/alerts/itsmc-troubleshoot-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ The following sections identify common symptoms, possible causes, and resolution
102102
* [Sync the connector](itsmc-resync-servicenow.md).
103103
* Check the [dashboard](itsmc-dashboard.md) and review the errors in the section for connector status. Then review the [common errors and their resolutions](itsmc-dashboard-errors.md)
104104

105-
### Configuration Item is blank in incidents received from ServiceNow
105+
### In the incidents received from ServiceNow, the configuration item is blank
106106
**Cause**: There can be several reasons for this:
107-
* Only Log alerts supports the configuration item but the alert is another type of alert
108-
* To contain the configuration item, the search results must include the **Computer** or **Resource** column
109-
* The values in the configuration item field do not match an entry in the CMDB
107+
* The alert is not a log alert. Configuration items are only supported by log alerts.
108+
* The search results do not include the **Computer** or **Resource** column.
109+
* The values in the configuration item field do not match an entry in the CMDB.
110110

111111
**Resolution**:
112-
* Check whether it is log alert - if not configuration item not supported
113-
* Check whether search results have column Computer or Resource -if not it should be added to the query
114-
* Check whether values in the columns Computer/Resource are identical to the values in CMDB- if not a new entry should be added to the CMDB
112+
* Check if the alert is a log alert. If it isn't a log alert, configuration items are not supported.
113+
* If the search results do not have a Computer or Resource column, add them to the query.
114+
* Check that the values in the Computer and Resource columns are identical to the values in the CMDB. If they are not, add a new entry to the CMDB with the matching values.
116 KB
Loading
-28.2 KB
Loading

articles/container-instances/container-instances-egress-ip-address.md

Lines changed: 46 additions & 145 deletions
Large diffs are not rendered by default.

articles/container-instances/container-instances-nat-gateway.md

Lines changed: 47 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.topic: conceptual
66
ms.service: container-instances
77
services: container-instances
88
ms.author: macolso
9-
ms.date: 02/28/2022
9+
ms.date: 05/03/2022
1010
---
1111

1212
# Configure a NAT gateway for static IP address for outbound traffic from a container group
@@ -15,131 +15,100 @@ Setting up a [container group](container-instances-container-groups.md) with an
1515

1616
This article provides steps to configure a container group in a [virtual network](container-instances-virtual-network-concepts.md) integrated with a [Network Address Translation (NAT) gateway](../virtual-network/nat-gateway/nat-overview.md). By configuring a NAT gateway to SNAT a subnet address range delegated to Azure Container Instances (ACI), you can identify outbound traffic from your container groups. The container group egress traffic will use the public IP address of the NAT gateway. A single NAT gateway can be used by multiple container groups deployed in the virtual network's subnet delegated to ACI.
1717

18-
In this article you use the Azure CLI to create the resources for this scenario:
18+
In this article, you use the Azure CLI to create the resources for this scenario:
1919

20-
* Container groups deployed on a delegated subnet [in the virtual network](container-instances-vnet.md)
20+
* Container groups deployed on a delegated subnet [in the virtual network](container-instances-vnet.md)
2121
* A NAT gateway deployed in the network with a static public IP address
2222

2323
You then validate egress from example container groups through the NAT gateway.
2424

2525
> [!NOTE]
26-
> The ACI service recommends integrating with a NAT gateway for containerized workoads that have static egress but not static ingress requirements. For ACI architecture that supports both static ingress and egress, please see the following tutorial: [Use Azure Firewall for ingress and egress](container-instances-egress-ip-address.md).
27-
## Before you begin
28-
You must satisfy the following requirements to complete this tutorial:
26+
> The ACI service recommends integrating with a NAT gateway for containerized workloads that have static egress but not static ingress requirements. For ACI architecture that supports both static ingress and egress, please see the following tutorial: [Use Azure Firewall for ingress and egress](container-instances-egress-ip-address.md).
2927
30-
**Azure CLI**: You must have Azure CLI version installed on your local computer. If you need to install or upgrade, see [Install the Azure CLI][azure-cli-install]
28+
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
29+
30+
[!INCLUDE [azure-cli-prepare-your-environment.md](../../includes/azure-cli-prepare-your-environment.md)]
31+
32+
[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../includes/cli-launch-cloud-shell-sign-in.md)]
33+
34+
> [!NOTE]
35+
> To download the complete script, go to [full script](https://github.com/Azure-Samples/azure-cli-samples/blob/master/container-instances/nat-gateway.sh).
36+
37+
## Get started
38+
39+
This tutorial makes use of a randomized variable. If you are using an existing resource group, modify the value of this variable appropriately.
40+
41+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="variable":::
42+
43+
**Azure resource group**: If you don't have an Azure resource group already, create a resource group with the [az group create][az-group-create] command. Modify the location value as appropriate.
44+
45+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="creategroup":::
3146

32-
**Azure resource group**: If you don't have an Azure resource group already, create a resource group with the [az group create][az-group-create] command. Below is an example.
33-
```azurecli
34-
az group create --name myResourceGroup --location eastus
35-
```
3647
## Deploy ACI in a virtual network
3748

38-
In a typical case, you might already have an Azure virtual network in which to deploy a container group. For demonstration purposes, the following commands create a virtual network and subnet when the container group is created. The subnet is delegated to Azure Container Instances.
49+
In a typical case, you might already have an Azure virtual network in which to deploy a container group. For demonstration purposes, the following commands create a virtual network and subnet when the container group is created. The subnet is delegated to Azure Container Instances.
3950

4051
The container group runs a small web app from the `aci-helloworld` image. As shown in other articles in the documentation, this image packages a small web app written in Node.js that serves a static HTML page.
4152

42-
> [!TIP]
43-
> To simplify the following command examples, use an environment variable for the resource group's name:
44-
> ```console
45-
> export RESOURCE_GROUP_NAME=myResourceGroup
46-
> ```
47-
> This tutorial will make use of the environment variable going forward.
4853
Create the container group with the [az container create][az-container-create] command:
4954

50-
```azurecli
51-
az container create \
52-
--name appcontainer \
53-
--resource-group $RESOURCE_GROUP_NAME \
54-
--image mcr.microsoft.com/azuredocs/aci-helloworld \
55-
--vnet aci-vnet \
56-
--vnet-address-prefix 10.0.0.0/16 \
57-
--subnet aci-subnet \
58-
--subnet-address-prefix 10.0.0.0/24
59-
```
55+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="container":::
6056

6157
> [!NOTE]
62-
> Adjust the value of `--subnet address-prefix` for the IP address space you need in your subnet. The smallest supported subnet is /29, which provides eight IP addresses. Some >IP addresses are reserved for use by Azure, which you can read more about [here](../virtual-network/ip-services/private-ip-addresses.md).
58+
> Adjust the value of `--subnet address-prefix` for the IP address space you need in your subnet. The smallest supported subnet is /29, which provides eight IP addresses. Some >IP addresses are reserved for use by Azure, which you can read more about [here](../virtual-network/ip-services/private-ip-addresses.md).
59+
6360
## Create a public IP address
6461

6562
In the following sections, use the Azure CLI to deploy an Azure NAT gateway in the virtual network. For background, see [Quickstart: Create a NAT gateway using Azure CLI](../virtual-network/nat-gateway/quickstart-create-nat-gateway-cli.md).
6663

67-
First, use the [az network vnet public-ip create][az-network-public-ip-create] to create a public IP address for the NAT gateway. This will be used to access the Internet. You will receive a warning about an upcoming breaking change where Standard SKU IP addresses will be availability zone aware by default. You can learn more about the use of availability zones and public IP addresses [here](../virtual-network/ip-services/virtual-network-network-interface-addresses.md).
64+
First, use the [az network vnet public-ip create][az-network-public-ip-create] to create a public IP address for the NAT gateway. This will be used to access the Internet. You will receive a warning about an upcoming breaking change where Standard SKU IP addresses will be availability zone aware by default. You can learn more about the use of availability zones and public IP addresses [here](../virtual-network/ip-services/virtual-network-network-interface-addresses.md).
6865

69-
```azurecli
70-
az network public-ip create \
71-
--name myPublicIP \
72-
--resource-group $RESOURCE_GROUP_NAME \
73-
--sku standard \
74-
--allocation static
75-
```
66+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="publicip":::
7667

77-
Store the public IP address in a variable. We will use this later during the validation step.
68+
Store the public IP address in a variable for use during the validation step later in this script.
7869

79-
```azurecli
80-
NG_PUBLIC_IP="$(az network public-ip show \
81-
--name myPublicIP \
82-
--resource-group $RESOURCE_GROUP_NAME \
83-
--query ipAddress --output tsv)"
84-
```
70+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="storeip":::
8571

8672
## Deploy a NAT gateway into a virtual network
8773

8874
Use the following [az network nat gateway create][az-network-nat-gateway-create] to create a NAT gateway that uses the public IP you created in the previous step.
8975

90-
```azurecli
91-
az network nat gateway create \
92-
--resource-group $RESOURCE_GROUP_NAME \
93-
--name myNATgateway \
94-
--public-ip-addresses myPublicIP \
95-
--idle-timeout 10
96-
```
76+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="natgateway":::
77+
9778
## Configure NAT service for source subnet
9879

99-
We'll configure the source subnet **aci-subnet** to use a specific NAT gateway resource **myNATgateway** with [az network vnet subnet update][az-network-vnet-subnet-update]. This command will activate the NAT service on the specified subnet.
80+
We'll configure the source subnet **aci-subnet** to use a specific NAT gateway resource **myNATgateway** with [az network vnet subnet update][az-network-vnet-subnet-update]. This command will activate the NAT service on the specified subnet.
10081

101-
```azurecli
102-
az network vnet subnet update \
103-
--resource-group $RESOURCE_GROUP_NAME \
104-
--vnet-name aci-vnet \
105-
--name aci-subnet \
106-
--nat-gateway myNATgateway
107-
```
82+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="subnet":::
10883

10984
## Test egress from a container group
11085

111-
Test inbound access to the *appcontainer* running in the virtual network by browsing to the firewall's public IP address. Previously, you stored the public IP address in variable $NG_PUBLIC_IP
86+
Test inbound access to the `appcontainer` running in the virtual network by browsing to the firewall's public IP address. Previously, you stored the public IP address in variable $NG_PUBLIC_IP
11287

11388
Deploy the following sample container into the virtual network. When it runs, it sends a single HTTP request to `http://checkip.dyndns.org`, which displays the IP address of the sender (the egress IP address). If the application rule on the firewall is configured properly, the firewall's public IP address is returned.
11489

115-
```azurecli
116-
az container create \
117-
--resource-group $RESOURCE_GROUP_NAME \
118-
--name testegress \
119-
--image mcr.microsoft.com/azuredocs/aci-tutorial-sidecar \
120-
--command-line "curl -s http://checkip.dyndns.org" \
121-
--restart-policy OnFailure \
122-
--vnet aci-vnet \
123-
--subnet aci-subnet
124-
```
90+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="sidecar":::
12591

12692
View the container logs to confirm the IP address is the same as the public IP address we created in the first step of the tutorial.
12793

128-
```azurecli
129-
az container logs \
130-
--resource-group $RESOURCE_GROUP_NAME \
131-
--name testegress
132-
```
94+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="viewlogs":::
13395

13496
Output is similar to:
13597

13698
```console
13799
<html><head><title>Current IP Check</title></head><body>Current IP Address: 52.142.18.133</body></html>
138100
```
139-
This IP address should match the public IP address created in the first step of the tutorial.
140101

141-
```Bash
142-
echo $NG_PUBLIC_IP
102+
This IP address should match the public IP address created in the first step of the tutorial.
103+
104+
:::code language="azurecli" source="~/azure_cli_scripts/container-instances/nat-gateway.sh" id="echo":::
105+
106+
## Clean up resources
107+
108+
When no longer needed, you can use [az group delete](/cli/azure/group) to remove the resource group and all related resources as follows. The `--no-wait` parameter returns control to the prompt without waiting for the operation to complete. The `--yes` parameter confirms that you wish to delete the resources without an additional prompt to do so.
109+
110+
```azurecli-interactive
111+
az group delete --name $resourceGroup --yes --no-wait
143112
```
144113

145114
## Next steps

articles/defender-for-cloud/alerts-reference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ At the bottom of this page, there's a table describing the Microsoft Defender fo
2222

2323
## <a name="alerts-windows"></a>Alerts for Windows machines
2424

25+
Microsoft Defender for Servers Plan 2 provides unique detections and alerts, in addition to the ones provided by Microsoft Defender for Endpoint. The alerts provided for Windows machines are:
26+
2527
[Further details and notes](defender-for-servers-introduction.md)
2628

2729
| Alert (alert type) | Description | MITRE tactics<br>([Learn more](#intentions)) | Severity |
@@ -134,6 +136,8 @@ At the bottom of this page, there's a table describing the Microsoft Defender fo
134136

135137
## <a name="alerts-linux"></a>Alerts for Linux machines
136138

139+
Microsoft Defender for Servers Plan 2 provides unique detections and alerts, in addition to the ones provided by Microsoft Defender for Endpoint. The alerts provided for Linux machines are:
140+
137141
[Further details and notes](defender-for-servers-introduction.md)
138142

139143
|Alert (alert type)|Description|MITRE tactics<br>([Learn more](#intentions))|Severity|

0 commit comments

Comments
 (0)