Skip to content

Commit aadb2e2

Browse files
authored
Merge pull request #259761 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 11/29
2 parents d8c9de2 + 8c1b6e3 commit aadb2e2

File tree

62 files changed

+354
-254
lines changed

Some content is hidden

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

62 files changed

+354
-254
lines changed

articles/azure-monitor/alerts/alerts-create-new-alert-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ To edit an existing alert rule:
343343
|Field |Description |
344344
|---------|---------|
345345
|Enable upon creation| Select for the alert rule to start running as soon as you're done creating it.|
346-
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met for a specific time range. The time range differs based on the frequency of the alert:<br>**1 minute**: The alert condition isn't met for 10 minutes.<br>**5-15 minutes**: The alert condition isn't met for three frequency periods.<br>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.<br>**11 to 12 hours**: The alert condition isn't met for one frequency period.|
346+
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met for a specific time range. The time range differs based on the frequency of the alert:<br>**1 minute**: The alert condition isn't met for 10 minutes.<br>**5-15 minutes**: The alert condition isn't met for three frequency periods.<br>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.<br>**11 to 12 hours**: The alert condition isn't met for one frequency period. <br><br>Note that stateful log alerts have these limitations:<br> - they can trigger up to 300 alerts per evaluation.<br> - you can have a maximum of 5000 alerts with the `fired` alert condition.|
347347
|Mute actions |Select to set a period of time to wait before alert actions are triggered again. If you select this checkbox, the **Mute actions for** field appears to select the amount of time to wait after an alert is fired before triggering actions again.|
348348
|Check workspace linked storage|Select if logs workspace linked storage for alerts is configured. If no linked storage is configured, the rule isn't created.|
349349

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ The alert condition for stateful alerts is `fired`, until it is considered resol
7777

7878
For stateful alerts, while the alert itself is deleted after 30 days, the alert condition is stored until the alert is resolved, to prevent firing another alert, and so that notifications can be sent when the alert is resolved.
7979

80+
Stateful log alerts have these limitations:
81+
- they can trigger up to 300 alerts per evaluation.
82+
- you can have a maximum of 5000 alerts with the `fired` alert condition.
83+
8084
This table describes when a stateful alert is considered resolved:
8185

8286
|Alert type |The alert is resolved when |

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ Log alerts can measure two different things, which can be used for different mon
129129
- **Table rows**: The number of rows returned can be used to work with events such as Windows event logs, Syslog, and application exceptions.
130130
- **Calculation of a numeric column**: Calculations based on any numeric column can be used to include any number of resources. An example is CPU percentage.
131131

132-
You can configure if log alerts are [stateful or stateless](alerts-overview.md#alerts-and-state). This feature is currently in preview.
132+
You can configure if log alerts are [stateful or stateless](alerts-overview.md#alerts-and-state). This feature is currently in preview.
133+
Note that stateful log alerts have these limitations:
134+
- they can trigger up to 300 alerts per evaluation.
135+
- you can have a maximum of 5000 alerts with the `fired` alert condition.
133136

134137
> [!NOTE]
135138
> Log alerts work best when you're trying to detect specific data in the logs, as opposed to when you're trying to detect a lack of data in the logs. Because logs are semi-structured data, they're inherently more latent than metric data on information like a VM heartbeat. To avoid misfires when you're trying to detect a lack of data in the logs, consider using [metric alerts](#metric-alerts). You can send data to the metric store from logs by using [metric alerts for logs](alerts-metric-logs.md).

articles/azure-monitor/autoscale/autoscale-get-started.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Get started with autoscale in Azure
33
description: "Learn how to scale your resource web app, cloud service, virtual machine, or Virtual Machine Scale Set in Azure."
44
ms.author: edbaynash
55
ms.topic: conceptual
6-
ms.date: 04/10/2023
6+
ms.date: 11/29/2023
77
---
88
# Get started with autoscale in Azure
99

@@ -75,7 +75,7 @@ Follow the steps below to create your first autoscale setting.
7575

7676
:::image type="content" source="./media/autoscale-get-started/instance-limits.png" lightbox="./media/autoscale-get-started/instance-limits.png" alt-text="A screenshot showing the configure tab of the autoscale setting page with configured rules.":::
7777

78-
You have successfully created your first scale setting to autoscale your web app based on CPU usage. When CPU usage is greater than 70%, an additional instance is added, up to a maximum of 3 instances. When CPU usage is below 20%, an instance is removed up to a minimum of 1 instance. By default there will be 1 instance.
78+
You have successfully created your first scale setting to autoscale your web app based on CPU usage. When CPU usage is greater than 70%, an additional instance is added, up to a maximum of 3 instances. When CPU usage is below 20%, an instance is removed up to a minimum of 1 instance. By default there will be 1 instance.
7979

8080
## Scheduled scale conditions
8181

@@ -121,7 +121,7 @@ You have now defined a scale condition for a specific day. When CPU usage is gre
121121

122122
### View the history of your resource's scale events
123123

124-
Whenever your resource has any scaling event, it is logged in the activity log. You can view the history of the scale events in the **Run history** tab.
124+
Whenever your resource has any scaling event, it's logged in the activity log. You can view the history of the scale events in the **Run history** tab.
125125

126126
:::image type="content" source="./media/autoscale-get-started/run-history.png" lightbox="./media/autoscale-get-started/run-history.png" alt-text="A screenshot showing the run history tab in autoscale settings.":::
127127

@@ -135,7 +135,7 @@ You can make changes in JSON directly, if necessary. These changes will be refle
135135

136136
### Cool-down period effects
137137

138-
Autoscale uses a cool-down period with is the amount of time to wait after a scale operation before scaling again. For example, if the cooldown is 10 minutes, Autoscale won't attempt to scale again until 10 minutes after the previous scale action. The cooldown period allows the metrics to stabilize and avoids scaling more than once for the same condition. For more information, see [Autoscale evaluation steps](autoscale-understanding-settings.md#autoscale-evaluation).
138+
Autoscale uses a cool-down period. This period is the amount of time to wait after a scale operation before scaling again. The cool-down period allows the metrics to stabilize and avoids scaling more than once for the same condition. Cool-down applies to both scale-in and scale-out events. For example, if the cooldown is set to 10 minutes and Autoscale has just scaled-in, Autoscale won't attempt to scale again for another 10 minutes in either direction. For more information, see [Autoscale evaluation steps](autoscale-understanding-settings.md#autoscale-evaluation).
139139

140140
### Flapping
141141

articles/azure-monitor/autoscale/autoscale-understanding-settings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article explains autoscale settings, how they work, and how th
44
author: EdB-MSFT
55
ms.service: azure-monitor
66
ms.topic: conceptual
7-
ms.date: 11/02/2022
7+
ms.date: 11/29/2023
88
ms.subservice: autoscale
99
ms.custom: ignite-2022
1010
ms.author: edbaynash
@@ -120,7 +120,7 @@ The following table describes the elements in the preceding autoscale setting's
120120
| rule | scaleAction | Action |The action to take when the metricTrigger of the rule is triggered. |
121121
| scaleAction | direction | Operation |"Increase" to scale out, or "Decrease" to scale in.|
122122
| scaleAction | value |Instance count |How much to increase or decrease the capacity of the resource. |
123-
| scaleAction | cooldown | Cool down (minutes)|The amount of time to wait after a scale operation before scaling again. For example, if **cooldown = "PT10M"**, autoscale doesn't attempt to scale again for another 10 minutes. The cooldown is to allow the metrics to stabilize after the addition or removal of instances. |
123+
| scaleAction | cooldown | Cool down (minutes)|The amount of time to wait after a scale operation before scaling again. The cooldown period comes into effect after a scale-in or a scale-out event. For example, if **cooldown = "PT10M"**, autoscale doesn't attempt to scale again for another 10 minutes. The cooldown is to allow the metrics to stabilize after the addition or removal of instances. |
124124

125125
## Autoscale profiles
126126

@@ -242,7 +242,7 @@ There are three types of autoscale profiles:
242242

243243
## Autoscale evaluation
244244

245-
Autoscale settings can have multiple profiles. Each profile can have multiple rules. Each time the autoscale job runs, it begins by choosing the applicable profile for that time. Autoscale then evaluates the minimum and maximum values, any metric rules in the profile, and decides if a scale action is necessary. The autoscale job runs every 30 to 60 seconds, depending on the resource type.
245+
Autoscale settings can have multiple profiles. Each profile can have multiple rules. Each time the autoscale job runs, it begins by choosing the applicable profile for that time. Autoscale then evaluates the minimum and maximum values, any metric rules in the profile, and decides if a scale action is necessary. The autoscale job runs every 30 to 60 seconds, depending on the resource type. After a scale action occurs, the autoscale job waits for the cooldown period before it scales again. The cooldown period applies to both scale-out and scale-in actions.
246246

247247
### Which profile will autoscale use?
248248

articles/dns/delegate-subdomain.md

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,72 +5,67 @@ services: dns
55
author: greg-lindsay
66
ms.service: dns
77
ms.topic: how-to
8-
ms.date: 09/27/2022
8+
ms.date: 11/28/2023
99
ms.author: greglin
1010
---
1111

1212
# Delegate an Azure DNS subdomain
1313

14-
You can use the Azure portal to delegate a DNS subdomain. For example, if you own the contoso.com domain, you may delegate a subdomain called *engineering* to another separate zone that you can administer separately from the contoso.com zone.
14+
You can use the Azure portal to delegate a DNS subdomain. For example, if you own the *adatum.com* domain, you can delegate a subdomain called *engineering.adatum.com* to another separate zone that you can administer separately from the adatum.com zone.
1515

16-
If you prefer, you can also delegate a subdomain using [Azure PowerShell](delegate-subdomain-ps.md).
16+
You can also delegate a subdomain using [Azure PowerShell](delegate-subdomain-ps.md).
1717

1818
## Prerequisites
1919

20-
To delegate an Azure DNS subdomain, you must first delegate your public domain to Azure DNS. See [Delegate a domain to Azure DNS](./dns-delegate-domain-azure-dns.md) for instructions on how to configure your name servers for delegation. Once your domain is delegated to your Azure DNS zone, you can delegate your subdomain.
20+
To delegate an Azure DNS subdomain, the parent public domain must first be delegated to Azure DNS. See [Delegate a domain to Azure DNS](./dns-delegate-domain-azure-dns.md) for instructions on how to configure your name servers for delegation. Once your domain is delegated to Azure DNS, you can delegate a subdomain.
2121

2222
> [!NOTE]
23-
> Contoso.com is used as an example throughout this article. Substitute your own domain name for contoso.com.
23+
> The `adatum.com` zone is used as an example of a parent DNS zone and `engineering.adatum.com` is used for the subdomain. Substitute your own domain names for these domains.
2424
25-
## Create a zone for your subdomain
25+
## Delegate a subdomain
2626

27-
First, create the zone for the **engineering** subdomain.
27+
The **engineering.adatum.com** subdomain can already exist. If it doesn't exist, it is created.
2828

29-
1. From the Azure portal, select **+ Create a resource**.
29+
To delegate the **engineering** subdomain under **adatum.com**:
3030

31-
1. Search for **DNS zone** and then select **Create**.
31+
1. From the Azure portal, search for **DNS zones** and select the **adatum.com** parent zone.
32+
2. Select **+ Child zone** and enter **engineering** next to **Name**. The **Create DNS zone** window opens.
3233

33-
1. On the **Create DNS zone** page, select the resource group for your zone. You may want to use the same resource group as the parent zone to keep similar resources together.
34+
![A screenshot showing creation of a child DNS zone.](./media/delegate-subdomain/new-child-zone.png)
3435

35-
1. Enter `engineering.contoso.com` for the **Name** and then select **Create**.
36+
3. If desired, change the **Subscription** and **Resource group**. In this example, we use the same subscription and resource group as the parent zone.
37+
4. Select **Review create**, and then select **Create**.
38+
5. When deployment is complete, select **Go to resource** to view the new delegated zone: **engineering.adatum.com**.
3639

37-
1. After the deployment succeeds, go to the new zone.
40+
[ ![A screenshot showing contents of the child zone.](./media/delegate-subdomain/child-zone-contents.png) ](./media/delegate-subdomain/child-zone-contents.png#lightbox)
3841

39-
## Note the name servers
42+
6. Select the parent **adatum.com** zone again and notice that an **NS** record has been added with the name **engineering** and contents the same as NS records in the child zone. You might need to refresh the page. These are the Azure DNS nameservers that are authoritative for the subdomain (child zone).
4043

41-
Next, note the four name servers for the engineering subdomain.
44+
[ ![A screenshot showing contents of the parent zone.](./media/delegate-subdomain/parent-zone-contents.png) ](./media/delegate-subdomain/parent-zone-contents.png#lightbox)
4245

43-
On the **engineering** zone overview page, note the four name servers for the zone. You'll need these name servers at a later time.
46+
## Manual entry of NS records (optional)
4447

45-
## Create a test record
46-
47-
Create an **A** record to use for testing. For example, create a **www** A record and configure it with a **10.10.10.10** IP address.
48-
49-
## Create an NS record
50-
51-
Next, create a name server (NS) record for the **engineering** zone.
48+
If desired, you can also create your subdomain and add the subdomain NS record manually.
5249

53-
1. Navigate to the zone for the parent domain.
50+
To create a new subdomain zone, use **Create a resource > DNS zone** and create a zone named **engineering.adatum.com**.
5451

55-
1. Select **+ Record set** at the top of the overview page.
52+
To create a subdomain delegation manually, add a new NS record set (**+ Record set** option) to the parent zone **adatum.com** with the name: **engineering** and specify each of the nameserver entries that are listed in the subdomain (child) zone.
5653

57-
1. On the **Add record set** page, type **engineering** in the **Name** text box.
54+
<br><img src="./media/delegate-subdomain/add-ns-record-set.png" alt="A screenshot showing how to add an NS record set." width="50%">
5855

59-
1. For **Type**, select **NS**.
56+
This method doesn't use the **+ Child zone** option, but both methods result in the same delegation.
6057

61-
1. Under **Name server**, enter the four name servers that you noted previously from the **engineering** zone.
58+
## Create a test record
6259

63-
1. Select **OK** to save the record.
60+
Next, create an **A** record in the **engineering.adatum.com** zone to use for testing. For example, create a **www** A record and configure it with a **10.10.10.10** IP address.
6461

6562
## Test the delegation
6663

6764
Use nslookup to test the delegation.
6865

69-
1. Open a PowerShell window.
70-
71-
1. At command prompt, type `nslookup www.engineering.contoso.com.`
72-
73-
1. You should receive a non-authoritative answer showing the address **10.10.10.10**.
66+
1. Open a command prompt.
67+
2. At command prompt, type `nslookup www.engineering.adatum.com.`
68+
3. You should receive a non-authoritative answer showing the address **10.10.10.10**.
7469

7570
## Next steps
7671

articles/dns/dns-operations-recordsets-portal.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: dns
55
author: greg-lindsay
66
ms.service: dns
77
ms.topic: how-to
8-
ms.date: 09/27/2022
8+
ms.date: 11/27/2023
99
ms.author: greglin
1010
---
1111

@@ -21,9 +21,9 @@ To create a record set in the Azure portal, see [Create DNS records by using the
2121

2222
## View a record set
2323

24-
1. In the Azure portal, go to the **DNS zone** overview page.
24+
1. In the Azure portal, go to the **DNS zones** overview page.
2525

26-
1. Search for the record set and select it will open the record set properties.
26+
1. Select your DNS zone. The current record sets are displayed.
2727

2828
:::image type="content" source="./media/dns-operations-recordsets-portal/overview.png" alt-text="Screenshot of contosotest.com zone overview page.":::
2929

articles/dns/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
ms.topic: landing-page
1212
author: greg-lindsay
1313
ms.author: greglin
14-
ms.date: 09/27/2022
14+
ms.date: 11/27/2023
1515

1616
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1717

40.8 KB
Loading
209 KB
Loading

0 commit comments

Comments
 (0)