Skip to content

Commit 6594f6d

Browse files
authored
Merge pull request #278423 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 6/17
2 parents d405a6c + 8715bae commit 6594f6d

File tree

319 files changed

+576
-502
lines changed

Some content is hidden

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

319 files changed

+576
-502
lines changed

articles/aks/azure-app-configuration.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Create the Azure App Configuration extension, which installs Azure App Configura
6363

6464
For example, install the latest version of Azure App Configuration Kubernetes Provider via the Azure App Configuration extension on your AKS cluster:
6565

66+
### [Azure CLI](#tab/cli)
67+
6668
```azurecli
6769
az k8s-extension create --cluster-type managedClusters \
6870
--cluster-name myAKSCluster \
@@ -72,20 +74,71 @@ az k8s-extension create --cluster-type managedClusters \
7274
--release-train preview
7375
```
7476

77+
### [Bicep](#tab/bicep)
78+
79+
Create a Bicep template using the following example.
80+
81+
```bicep
82+
@description('The name of the Managed Cluster resource.')
83+
param clusterName string
84+
85+
resource existingManagedCluster 'Microsoft.ContainerService/managedClusters@2024-02-01' existing = {
86+
name: clusterName
87+
}
88+
89+
resource appConfigExtension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = {
90+
name: 'appconfigurationkubernetesprovider'
91+
scope: existingManagedCluster
92+
properties: {
93+
autoUpgradeMinorVersion: true
94+
configurationSettings: {
95+
'global.clusterType': 'managedclusters'
96+
}
97+
extensionType: 'microsoft.appconfiguration'
98+
releaseTrain: 'preview'
99+
}
100+
}
101+
```
102+
103+
Deploy the Bicep template using the `az deployment group` command.
104+
105+
```azurecli
106+
az deployment group create \
107+
--resource-group myResourceGroup \
108+
--template-file ./my-bicep-file-path.bicep \
109+
--parameters clusterName=myAKSCluster
110+
```
111+
112+
---
113+
75114
### Configure automatic updates
76115

77116
If you create Azure App Configuration extension without specifying a version, `--auto-upgrade-minor-version` *is automatically enabled*, configuring the Azure App Configuration extension to automatically update its minor version on new releases.
78117

79118
You can disable auto update by specifying the `--auto-upgrade-minor-version` parameter and setting the value to `false`.
80119

120+
#### [Azure CLI](#tab/cli)
121+
81122
```azurecli
82123
--auto-upgrade-minor-version false
83124
```
84125

126+
#### [Bicep](#tab/bicep)
127+
128+
```bicep
129+
properties {
130+
autoUpgradeMinorVersion: false
131+
}
132+
```
133+
134+
---
135+
85136
### Targeting a specific version
86137

87138
The same command-line argument is used for installing a specific version of Azure App Configuration Kubernetes Provider or rolling back to a previous version. Set `--auto-upgrade-minor-version` to `false` and `--version` to the version of Azure App Configuration Kubernetes Provider you wish to install. If the `version` parameter is omitted, the extension installs the latest version.
88139

140+
#### [Azure CLI](#tab/cli)
141+
89142
```azurecli
90143
az k8s-extension create --cluster-type managedClusters \
91144
--cluster-name myAKSCluster \
@@ -97,6 +150,44 @@ az k8s-extension create --cluster-type managedClusters \
97150
--version 2.0.0-preview
98151
```
99152

153+
#### [Bicep](#tab/bicep)
154+
155+
Create a Bicep template using the following example.
156+
157+
```bicep
158+
@description('The name of the Managed Cluster resource.')
159+
param clusterName string
160+
161+
resource existingManagedCluster 'Microsoft.ContainerService/managedClusters@2024-02-01' existing = {
162+
name: clusterName
163+
}
164+
165+
resource appConfigExtension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = {
166+
name: 'appconfigurationkubernetesprovider'
167+
scope: existingManagedCluster
168+
properties: {
169+
autoUpgradeMinorVersion: false
170+
configurationSettings: {
171+
'global.clusterType': 'managedclusters'
172+
}
173+
extensionType: 'microsoft.appconfiguration'
174+
releaseTrain: 'preview'
175+
version: '2.0.0-preview'
176+
}
177+
}
178+
```
179+
180+
Deploy the Bicep template using the `az deployment group` command.
181+
182+
```azurecli
183+
az deployment group create \
184+
--resource-group myResourceGroup \
185+
--template-file ./my-bicep-file-path.bicep \
186+
--parameters clusterName=myAKSCluster
187+
```
188+
189+
---
190+
100191
## Extension versions
101192

102193
The Azure App Configuration extension supports the following version of Azure App Configuration Kubernetes Provider:

articles/azure-monitor/alerts/log-alert-rule-health.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.date: 02/08/2024
1515
[Azure Service Health](../../service-health/overview.md) monitors the health of your cloud resources, including log search alert rules. When a log search alert rule is healthy, the rule runs and the query executes successfully. This article explains how to view the health status of your log search alert rule, and tells you what to do if there are issues affecting your log search alert rules.
1616

1717
Azure Service Health monitors:
18-
- [Resource health](../../service-health/resource-health-overview.md): information about the health of your individual cloud resources, such as a specific log search alert rule.
18+
- [Resource health](../../service-health/resource-health-overview.md): information about the health of your individual cloud resources, such as a specific log search alert rule. See [here](../../service-health/resource-health-checks-resource-types.md) for the resource health checks performed on log search alert rules.
1919
- [Service health](../../service-health/service-health-overview.md): information about the health of the Azure services and regions you're using, which might affect your log search alert rule, including communications about outages, planned maintenance activities, and other health advisories.
2020

2121
> [!NOTE]

articles/communication-services/quickstarts/voice-video-calling/includes/teams-interop/teams-interop-ios.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ In this quickstart, you'll learn how to join a Teams meeting using the Azure Com
1414

1515
- A working [Communication Services calling iOS app](../../getting-started-with-calling.md).
1616
- A [Teams deployment](/deployoffice/teams-install).
17+
- The Minimum Version supported for Teams meeting ID and passcode join API : 2.11.0
1718
- An [access token](../../../identity/access-tokens.md).
1819

1920
We will use beta.12 of AzureCommunicationCalling SDK for this quickstart so we need to update the podfile and install the Pods again.

articles/communication-services/quickstarts/voice-video-calling/includes/teams-interop/teams-interop-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Find the finalized code for this quickstart on [GitHub](https://github.com/Azure
1717

1818
- A working [Communication Services calling web app](../../getting-started-with-calling.md).
1919
- A [Teams deployment](/deployoffice/teams-install).
20-
- The Minimum Version supported for Teams meetingId and passcode join API : 1.17.1
20+
- The Minimum Version supported for Teams meeting ID and passcode join API : 1.17.1
2121
- An [access token](../../../identity/access-tokens.md).
2222

2323
## Add the Teams UI controls

articles/governance/policy/samples/built-in-initiatives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy initiatives
33
description: List built-in policy initiatives for Azure Policy. Categories include Regulatory Compliance, Guest Configuration, and more.
4-
ms.date: 06/07/2024
4+
ms.date: 06/17/2024
55
ms.topic: sample
66
ms.custom: generated
77
---

articles/governance/policy/samples/built-in-policies.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy definitions
33
description: List built-in policy definitions for Azure Policy. Categories include Tags, Regulatory Compliance, Key Vault, Kubernetes, Guest Configuration, and more.
4-
ms.date: 06/07/2024
4+
ms.date: 06/17/2024
55
ms.topic: sample
66
ms.custom: generated
77
---
@@ -166,6 +166,10 @@ The name of each built-in links to the policy definition in the Azure portal. Us
166166

167167
[!INCLUDE [azure-policy-reference-policies-devcenter](../../../../includes/policy/reference/bycat/policies-devcenter.md)]
168168

169+
## DevOpsInfrastructure
170+
171+
[!INCLUDE [azure-policy-reference-policies-devopsinfrastructure](../../../../includes/policy/reference/bycat/policies-devopsinfrastructure.md)]
172+
169173
## ElasticSan
170174

171175
[!INCLUDE [azure-policy-reference-policies-elasticsan](../../../../includes/policy/reference/bycat/policies-elasticsan.md)]

articles/hdinsight/apache-ambari-email.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Tutorial: Configure Apache Ambari email notifications in Azure HDInsight
33
description: This article describes how to use SendGrid with Apache Ambari for email notifications.
44
ms.service: hdinsight
55
ms.topic: tutorial
6-
ms.date: 05/25/2023
6+
ms.date: 06/15/2024
77

88
#Customer intent: As a HDInsight user, I want to configure Apache Ambari to send email notifications.
99
---
@@ -36,7 +36,7 @@ In this tutorial, you learn how to:
3636

3737
1. From the Overview page, click **Open SaaS Account on publisher’s site**, to go the SendGrid webpage for your account.
3838

39-
:::image type="content" source="./media/apache-ambari-email/azure-portal-sendgrid-manage.png" alt-text="SendGrid overview in azure portal.":::
39+
:::image type="content" source="./media/apache-ambari-email/azure-portal-sendgrid-manage.png" alt-text="SendGrid overview in Azure portal.":::
4040

4141
1. From the left menu, navigate to your **Settings** and then **API Keys**.
4242

articles/hdinsight/apache-ambari-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Apache Ambari usage in Azure HDInsight
33
description: Discussion of how Apache Ambari is used in Azure HDInsight.
44
ms.service: hdinsight
55
ms.topic: conceptual
6-
ms.date: 05/10/2023
6+
ms.date: 06/15/2024
77
---
88

99
# Apache Ambari usage in Azure HDInsight
1010

11-
HDInsight uses Apache Ambari for cluster deployment and management. Ambari agents run on every node (headnode, worker node, zookeeper, and edgenode if exists). Ambari server runs only on headnode. Only one instance of Ambari server shall run at one time. This is controlled by HDInsight failover controller. When one of the headnodes is down for reboot or maintenance, the other headnode will become active and Ambari server on the second headnode will be started.
11+
HDInsight uses Apache Ambari for cluster deployment and management. Ambari agents run on every node provided if headnode, worker node, zookeeper, and edgenode are present. Ambari server runs only on headnode. Only one instance of Ambari server shall run at one time. This is controlled by HDInsight failover controller. When one of the headnodes is down for reboot or maintenance, the other headnode will become active and Ambari server on the second headnode will be started.
1212

1313
All cluster configuration should be done through the [Ambari UI](./hdinsight-hadoop-manage-ambari.md), any local change will be overwritten when the node is restarted.
1414

articles/hdinsight/cluster-availability-monitor-logs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: How to monitor cluster availability with Azure Monitor logs in HDInsight
33
description: Learn how to use Azure Monitor logs to monitor cluster health and availability.
44
ms.service: hdinsight
55
ms.topic: how-to
6-
ms.date: 05/23/2023
6+
ms.date: 06/15/2024
77
---
88

99
# How to monitor cluster availability with Azure Monitor logs in HDInsight
@@ -100,7 +100,7 @@ After these blades close, you should see your action group listed under the **Ac
100100
:::image type="content" source="media/cluster-availability-monitor-logs/portal-create-alert-rule-finish.png" alt-text="Portal creates alert rule finish.":::
101101

102102
> [!TIP]
103-
> The ability to specify **Severity** is a powerful tool that can be used when creating multiple alerts. For example, you could create one alert to raise a Warning (Sev 1) if a single head node goes down and another alert that raises Critical (Sev 0) in the unlikely event that both head nodes go down.
103+
> The ability to specify **Severity** is a powerful tool that can be used when creating multiple alerts. For example, you could create one alert to raise a Warning (severity 1) if a single head node goes down and another alert that raises Critical (severity 1) in the unlikely event that both head nodes go down.
104104
105105
When the condition for this alert is met, the alert will fire and you'll receive an email with the alert details like this:
106106

@@ -110,9 +110,9 @@ You can also view all alerts that have fired, grouped by severity, by going to *
110110

111111
:::image type="content" source="media/cluster-availability-monitor-logs/hdi-portal-oms-alerts.png" alt-text="Log Analytics workspace alerts.":::
112112

113-
Selecting on a severity grouping (i.e. **Sev 1,** as highlighted above) will show records for all alerts of that severity that have fired like below:
113+
When you select on a severity group (i.e. **severity 1,** as highlighted above) it will show records for all alerts of that severity that have fired like below:
114114

115-
:::image type="content" source="media/cluster-availability-monitor-logs/portal-oms-alerts-sev1.png" alt-text="Log Analytics workspace sev one alert.":::
115+
:::image type="content" source="media/cluster-availability-monitor-logs/portal-oms-alerts-sev1.png" alt-text="Screenshot showing Log Analytics workspace severity one alert.":::
116116

117117
## Next steps
118118

articles/hdinsight/cluster-reboot-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to reboot unresponsive VMs for Azure HDInsight clusters.
44
ms.custom: hdinsightactive
55
ms.service: hdinsight
66
ms.topic: how-to
7-
ms.date: 05/25/2023
7+
ms.date: 06/15/2024
88
---
99

1010
# Reboot VMs for HDInsight clusters

0 commit comments

Comments
 (0)