Skip to content

Commit be2ebb2

Browse files
authored
Merge branch 'master' into fw-snat
2 parents d3c72cc + 72980f9 commit be2ebb2

File tree

47 files changed

+1689
-231
lines changed

Some content is hidden

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

47 files changed

+1689
-231
lines changed

articles/aks/use-multiple-node-pools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ az aks nodepool add \
479479
> [!NOTE]
480480
> You can also use the `--tags` parameter when using [az aks nodepool update][az-aks-nodepool-update] command as well as during cluster creation. During cluster creation, the `--tags` parameter applies the tag to the initial node pool created with the cluster. All tag names must adhere to the limitations in [Use tags to organize your Azure resources][tag-limitation]. Updating a node pool with the `--tags` parameter updates any existing tag values and appends any new tags. For example, if your node pool had *dept=IT* and *costcenter=9999* for tags and you updated it with *team=dev* and *costcenter=111* for tags, you nodepool would have *dept=IT*, *costcenter=111*, and *team=dev* for tags.
481481

482-
The following example output from the [az aks nodepool list][az-aks-nodepool-list] command shows that *taggednodepool* is *Creating* nodes with the specified *tag*:
482+
The following example output from the [az aks nodepool list][az-aks-nodepool-list] command shows that *tagnodepool* is *Creating* nodes with the specified *tag*:
483483

484484
```console
485485
$ az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster

articles/azure-monitor/platform/alerts-metric-create-templates.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,15 +1504,15 @@ az group deployment create \
15041504

15051505
## Template for a metric alert that monitors multiple resources
15061506

1507-
The previous sections described sample Azure Resource Manager templates to create metric alerts that monitor a single resource. Azure Monitor now supports monitoring multiple resources with a single metric alert rule. This feature is currently only supported in Azure public cloud and only for virtual Machines, SQL Databases, SQL Elastic Pools and Databox Edge Devices.
1507+
The previous sections described sample Azure Resource Manager templates to create metric alerts that monitor a single resource. Azure Monitor now supports monitoring multiple resources (of the same type) with a single metric alert rule, for resources that exist in the same Azure region. This feature is currently only supported in Azure public cloud and only for Virtual machines, SQL server databases, SQL server elastic pools and Databox edge devices. Also, this feature is only available for platform metrics, and isn't supported for custom metrics.
15081508

15091509
Dynamic Thresholds alerts rule can also help create tailored thresholds for hundreds of metric series (even different types) at a time, which results in fewer alert rules to manage.
15101510

15111511
This section will describe Azure Resource Manager templates for three scenarios to monitor multiple resources with a single rule.
15121512

15131513
- Monitoring all virtual machines (in one Azure region) in one or more resource groups.
1514-
- Monitoring all virtual machines (in one Azure region) in a subscription
1515-
- Monitoring a list of virtual machines (in one Azure region) in a subscription.
1514+
- Monitoring all virtual machines (in one Azure region) in a subscription.
1515+
- Monitoring a list of virtual machines (in one Azure region) in a subscription.
15161516

15171517
### Static threshold alert on all virtual machines in one or more resource groups
15181518

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ Increasing look-back periods and number of violations can also allow filtering a
122122

123123
## Monitoring at scale using metric alerts in Azure Monitor
124124

125-
So far, you have seen how a single metric alert could be used to monitor one or many metric time-series related to a single Azure resource. Many times, you might want the same alert rule applied to many resources. Azure Monitor also supports monitoring multiple resources with one metric alert rule. This feature is currently supported only on virtual machines, SQL server databases, SQL server elastic pools and data box edge devices. Also, a single metric alert can monitor resources in one Azure region.
125+
So far, you have seen how a single metric alert could be used to monitor one or many metric time-series related to a single Azure resource. Many times, you might want the same alert rule applied to many resources. Azure Monitor also supports monitoring multiple resources (of the same type) with one metric alert rule, for resources that exist in the same Azure region. This feature is currently supported only in Azure public cloud and only for virtual machines, SQL server databases, SQL server elastic pools and Data box edge devices. Also, this feature is only available for platform metrics, and isn't supported for custom metrics.
126126

127-
You can specify the scope of monitoring by a single metric alert in one of three ways:
127+
You can specify the scope of monitoring by a single metric alert rule in one of three ways:
128128

129129
- as a list of virtual machines in one Azure region within a subscription
130130
- all virtual machines (in one Azure region) in one or more resource groups in a subscription
131131
- all virtual machines (in one Azure region) in one subscription
132132

133-
Creating metric alert rules that monitor multiple resources is like [creating any other metric alert](alerts-metric.md) that monitors a single resource. Only difference is that you would select all the resources you want to monitor. You can also create these rules through [Azure Resource Manager templates](../../azure-monitor/platform/alerts-metric-create-templates.md#template-for-a-metric-alert-that-monitors-multiple-resources). You will receive individual notifications for each virtual machine.
133+
Creating metric alert rules that monitor multiple resources is like [creating any other metric alert](alerts-metric.md) that monitors a single resource. Only difference is that you would select all the resources you want to monitor. You can also create these rules through [Azure Resource Manager templates](../../azure-monitor/platform/alerts-metric-create-templates.md#template-for-a-metric-alert-that-monitors-multiple-resources). You will receive individual notifications for each monitored resource.
134134

135135
## Typical latency
136136

0 commit comments

Comments
 (0)