Skip to content

Commit 8e0c291

Browse files
authored
Merge pull request #279592 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a0630e7 + e1dab13 commit 8e0c291

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

articles/aks/use-node-taints.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ This article assumes you have an existing AKS cluster. If you need an AKS cluste
250250
az aks nodepool update \
251251
--cluster-name $CLUSTER_NAME \
252252
--name $NODE_POOL_NAME \
253+
--resource-group $RESOURCE_GROUP_NAME \
253254
--node-taints "sku=gpu:NoSchedule"
254255
```
255256
@@ -260,6 +261,7 @@ This article assumes you have an existing AKS cluster. If you need an AKS cluste
260261
```azurecli-interactive
261262
az aks nodepool update \
262263
--cluster-name $CLUSTER_NAME \
264+
--resource-group $RESOURCE_GROUP_NAME \
263265
--name $NODE_POOL_NAME \
264266
--node-taints ""
265267
```
@@ -295,7 +297,7 @@ When you remove all initialization taint occurrences from node pool replicas, th
295297
az aks update \
296298
--resource-group $RESOURCE_GROUP_NAME \
297299
--name $CLUSTER_NAME \
298-
--node-init-taints "sku=gpu:NoSchedule"
300+
--node-init-taints ""
299301
```
300302
301303
## Check that the taint has been removed from the node

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Migration is a complex task. Start planning your migration to Azure Monitor Agen
1919

2020
> [!IMPORTANT]
2121
> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). You can expect the following when you use the MMA or OMS agent after this date.
22-
> - **Data upload:** Cloud ingestion services will gradually reduce support for MMA agents, which may result in decreased support and potential compatibility issues for MMA agents over time. Ingestion for MMA will be unchanged until Febuary 1 2025.
23-
> - **Installation:** The ability to install the legacy agents will be removed from the Azure Portal and installation policies for legacy agents will be removed. You can still install the MMA agents extension as well as perfrom offline installations.
22+
> - **Data upload:** Cloud ingestion services will gradually reduce support for MMA agents, which may result in decreased support and potential compatibility issues for MMA agents over time. Ingestion for MMA will be unchanged until February 1 2025.
23+
> - **Installation:** The ability to install the legacy agents will be removed from the Azure Portal and installation policies for legacy agents will be removed. You can still install the MMA agents extension as well as perform offline installations.
2424
> - **Customer Support:** You will not be able to get support for legacy agent issues.
25-
> - **OS Support:** Support for new Linux or Windows distros, incluing service packs won't be added after the deprecation of the legacy agents.
25+
> - **OS Support:** Support for new Linux or Windows distros, including service packs, won't be added after the deprecation of the legacy agents.
2626
2727
## Before you begin
2828

articles/operator-nexus/howto-install-cli-extensions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: travisneely
66
ms.service: azure-operator-nexus
77
ms.custom: devx-track-azurecli
88
ms.topic: include
9-
ms.date: 02/08/2024
9+
ms.date: 06/28/2024
1010
# ms.custom: template-include
1111
---
1212

@@ -74,15 +74,15 @@ Example output:
7474
```output
7575
Name Version
7676
----------------------- -------------
77-
monitor-control-service 0.2.0
77+
monitor-control-service 0.4.1
7878
connectedmachine 0.7.0
79-
connectedk8s 1.6.5
79+
connectedk8s 1.7.3
8080
k8s-extension 1.4.3
8181
networkcloud 1.1.0
82-
k8s-configuration 1.7.0
83-
managednetworkfabric 4.2.0
82+
k8s-configuration 2.0.0
83+
managednetworkfabric 6.2.0
8484
customlocation 0.1.3
85-
ssh 2.0.2
85+
ssh 2.0.4
8686
```
8787

8888
<!-- LINKS - External -->

0 commit comments

Comments
 (0)