Skip to content

Commit 22dfaaf

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into perfFix
2 parents 998a170 + 4395dc6 commit 22dfaaf

18 files changed

+38
-36
lines changed

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.workload: identity
1010
ms.topic: tutorial
11-
ms.date: 03/15/2023
11+
ms.date: 03/16/2023
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---

articles/aks/includes/keda/current-version-callout.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ ms.author: tomkerkhove
88
---
99

1010
> [!IMPORTANT]
11-
> The KEDA add-on installs version *2.7.0* of KEDA on your cluster.
11+
> The KEDA add-on installs version *2.7.0* of KEDA on your cluster.
12+
>
13+
> Due to [KEDA's Kubernetes Compatibility policy](https://keda.sh/docs/latest/operate/cluster/#kubernetes-compatibility), the managed KEDA addon is will only be supported in Kubernetes versions <= 1.25 when generally available. Please follow the [release notes](https://github.com/Azure/AKS/releases) to be notified for additional Kubernetes version support.

articles/aks/keda-about.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ Learn more about how KEDA works in the [official KEDA documentation][keda-archit
3030

3131
## Installation and version
3232

33-
>[!WARNING]
34-
> The managed KEDA addon will not be supported in K8s version 1.26 at GA. Please follow the [release notes](https://github.com/Azure/AKS/releases) to be notified when it will be supported.
33+
[!INCLUDE [Current version callout](./includes/keda/current-version-callout.md)]
3534

3635
KEDA can be added to your Azure Kubernetes Service (AKS) cluster by enabling the KEDA add-on using an [ARM template][keda-arm] or [Azure CLI][keda-cli].
3736

3837
The KEDA add-on provides a fully supported installation of KEDA that is integrated with AKS.
3938

40-
[!INCLUDE [Current version callout](./includes/keda/current-version-callout.md)]
41-
4239
## Capabilities and features
4340

4441
KEDA provides the following capabilities and features:

articles/aks/keda-deploy-add-on-arm.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ This article shows you how to deploy the Kubernetes Event-driven Autoscaling (KE
1616

1717
## Prerequisites
1818

19-
>[!WARNING]
20-
> The managed KEDA addon will not be supported in K8s version 1.26 at GA. Please follow the [release notes](https://github.com/Azure/AKS/releases) to be notified when it will be supported.
21-
2219
- An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
2320
- [Azure CLI installed](/cli/azure/install-azure-cli).
2421
- Firewall rules are configured to allow access to the Kubernetes API server. ([learn more][aks-firewall-requirements])

articles/aks/keda-deploy-add-on-cli.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ This article shows you how to install the Kubernetes Event-driven Autoscaling (K
1616

1717
## Prerequisites
1818

19-
>[!WARNING]
20-
> The managed KEDA addon will not be supported in K8s version 1.26 at GA. Please follow the [release notes](https://github.com/Azure/AKS/releases) to be notified when it will be supported.
21-
2219
- An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
2320
- [Azure CLI installed](/cli/azure/install-azure-cli).
2421
- Firewall rules are configured to allow access to the Kubernetes API server. ([learn more][aks-firewall-requirements])

articles/aks/keda-integrations.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ ms.author: tomkerkhove
1111

1212
The Kubernetes Event-driven Autoscaling (KEDA) add-on integrates with features provided by Azure and open source projects.
1313

14-
>[!WARNING]
15-
> The managed KEDA addon will not be supported in K8s version 1.26 at GA. Please follow the [release notes](https://github.com/Azure/AKS/releases) to be notified when it will be supported.
14+
[!INCLUDE [Current version callout](./includes/keda/current-version-callout.md)]
1615

1716
[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
1817

articles/automation/automation-solution-vm-management-config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Azure Automation Start/Stop VMs during off-hours
33
description: This article tells how to configure the Start/Stop VMs during off-hours feature to support different use cases or scenarios.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 03/07/2023
6+
ms.date: 03/16/2023
77
ms.topic: conceptual
88
ms.custom: engagement-fy23
99
---
@@ -12,7 +12,7 @@ ms.custom: engagement-fy23
1212

1313
> [!NOTE]
1414
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md),
15-
which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared on March 31st 2023.
15+
which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared soon.
1616

1717
This article describes how to configure the [Start/Stop VMs during off-hours](automation-solution-vm-management.md) feature to support the described scenarios. You can also learn how to:
1818

articles/automation/automation-solution-vm-management-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ title: Query logs from Azure Automation Start/Stop VMs during off-hours
33
description: This article tells how to use Azure Monitor to query log data generated by Start/Stop VMs during off-hours.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 02/28/2023
6+
ms.date: 03/16/2023
77
ms.topic: conceptual
88
ms.custom: engagement-fy23
99
---
1010

1111
# Query logs from Start/Stop VMs during off-hours
1212

1313
> [!NOTE]
14-
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared on March 31st 2023.
14+
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared soon.
1515
1616
Azure Automation forwards two types of records to the linked Log Analytics workspace: job logs and job streams. This article reviews the data available for [query](../azure-monitor/logs/log-query-overview.md) in Azure Monitor.
1717

articles/automation/automation-solution-vm-management-remove.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ title: Remove Azure Automation Start/Stop VMs during off-hours overview
33
description: This article describes how to remove the Start/Stop VMs during off-hours feature and unlink an Automation account from the Log Analytics workspace.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 02/28/2023
6+
ms.date: 03/16/2023
77
ms.topic: conceptual
88
ms.custom: engagement-fy23
99
---
1010

1111
# Remove Start/Stop VMs during off-hours from Automation account
1212

1313
> [!NOTE]
14-
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared on March 31st 2023.
14+
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared soon.
1515
1616
After you enable the Start/Stop VMs during off-hours feature to manage the running state of your Azure VMs, you may decide to stop using it. Removing this feature can be done using one of the following methods based on the supported deployment models:
1717

articles/automation/automation-solution-vm-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ title: Azure Automation Start/Stop VMs during off-hours overview
33
description: This article describes the Start/Stop VMs during off-hours feature, which starts or stops VMs on a schedule and proactively monitor them from Azure Monitor Logs.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 02/28/2023
6+
ms.date: 03/16/2023
77
ms.topic: conceptual
88
ms.custom: devx-track-azurepowershell, engagement-fy23
99
---
1010

1111
# Start/Stop VMs during off-hours overview
1212

1313
> [!NOTE]
14-
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared on March 31st 2023.
14+
> Start/Stop VM during off-hours version 1 is unavailable in the marketplace now as it will retire by 30 September 2023. We recommend you start using [version 2](../azure-functions/start-stop-vms/overview.md), which is now generally available. The new version offers all existing capabilities and provides new features, such as multi-subscription support from a single Start/Stop instance. If you have the version 1 solution already deployed, you can still use the feature, and we will provide support until 30 September 2023. The details of the announcement will be shared soon.
1515
1616
The Start/Stop VMs during off-hours feature start or stops enabled Azure VMs. It starts or stops machines on user-defined schedules, provides insights through Azure Monitor logs, and sends optional emails by using [action groups](../azure-monitor/alerts/action-groups.md). The feature can be enabled on both Azure Resource Manager and classic VMs for most scenarios.
1717

0 commit comments

Comments
 (0)