Skip to content

Commit ac4c585

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mg-sfi
2 parents f3e82a1 + 1c83ea1 commit ac4c585

File tree

313 files changed

+763
-687
lines changed

Some content is hidden

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

313 files changed

+763
-687
lines changed

articles/analysis-services/analysis-services-logging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The output should look something like this example:
115115

116116
```powershell
117117
StorageAccountId :
118-
/subscriptions/a23279b5-xxxx-xxxx-xxxx-47b7c6d423ea/resourceGroups/awsales_resgroup/providers/Microsoft.Storage/storageAccounts/awsaleslogs
118+
/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/awsales_resgroup/providers/Microsoft.Storage/storageAccounts/awsaleslogs
119119
ServiceBusRuleId :
120120
EventHubAuthorizationRuleId :
121121
Metrics
@@ -142,7 +142,7 @@ Logs
142142
143143
144144
WorkspaceId :
145-
Id : /subscriptions/a23279b5-xxxx-xxxx-xxxx-47b7c6d423ea/resourcegroups/awsales_resgroup/providers/microsoft.analysisservic
145+
Id : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/awsales_resgroup/providers/microsoft.analysisservic
146146
es/servers/awsales/providers/microsoft.insights/diagnosticSettings/service
147147
Name : service
148148
Type :

articles/application-gateway/for-containers/prometheus-grafana.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greglin
66
ms.service: azure-appgw-for-containers
77
ms.topic: article
8-
ms.date: 07/09/2024
8+
ms.date: 10/21/2024
99
ms.author: greglin
1010
---
1111

@@ -51,11 +51,11 @@ You can monitor Azure Application Gateway for Containers resources in the follow
5151

5252
Complete the steps to configure prometheus and grafana.
5353
1. Sign in to the [Azure portal](https://portal.azure.com) with your Azure account.
54-
2. In **Search resources, service, and docs**, type **Application Gateways for Containers** and select your Kubernetes Cluster name.
54+
2. In **Search resources, service, and docs**, type **Kubernetes services** and select your Kubernetes Cluster name.
5555

5656
[ ![A screenshot of kubernetes insights.](./media/prometheus-grafana/configure.png) ](./media/prometheus-grafana/configure.png#lightbox)
5757

58-
3. Under insights and select **Configure Monitoring**.
58+
3. Expand **Monitoring**, select **Insights**, and select **Configure Monitoring**.
5959

6060
[ ![A screenshot of monitoring metrics.](./media/prometheus-grafana/grafana-container.png) ](./media/prometheus-grafana/grafana-container.png#lightbox)
6161

articles/automation/automation-dsc-cd-chocolatey.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Set up Azure Automation continuous deployment with Chocolatey
33
description: This article tells how to set up continuous deployment with State Configuration and the Chocolatey package manager.
44
services: automation
55
ms.subservice: desired-state-config
6-
ms.date: 08/20/2024
6+
ms.date: 10/22/2024
77
ms.topic: how-to
88
ms.custom: references_regions, devx-track-azurepowershell
99
ms.service: azure-automation
@@ -13,6 +13,8 @@ ms.service: azure-automation
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
In a DevOps world, there are many tools to assist with various points in the continuous integration
1719
pipeline. Azure Automation [State Configuration][09] is a welcome new addition to the options that
1820
DevOps teams can employ.

articles/automation/automation-dsc-compile.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Compile DSC configurations in Azure Automation State Configuration
33
description: This article tells how to compile Desired State Configuration (DSC) configurations for Azure Automation.
44
services: automation
55
ms.subservice: desired-state-config
6-
ms.date: 08/20/2024
6+
ms.date: 10/22/2024
77
ms.topic: how-to
88
ms.custom: devx-track-azurepowershell
99
ms.service: azure-automation
@@ -13,6 +13,8 @@ ms.service: azure-automation
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
You can compile Desired State Configuration (DSC) configurations in Azure Automation State
1719
Configuration in the following ways:
1820

articles/automation/automation-dsc-diagnostics.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Integrate Azure Automation State Configuration with Azure Monitor Logs
33
description: This article tells how to send Desired State Configuration reporting data from Azure Automation State Configuration to Azure Monitor Logs.
44
services: automation
55
ms.subservice: desired-state-config
6-
ms.date: 08/20/2024
6+
ms.date: 10/22/2024
77
ms.topic: how-to
88
ms.custom: devx-track-azurepowershell
99
ms.service: azure-automation
@@ -13,6 +13,8 @@ ms.service: azure-automation
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
Azure Automation State Configuration retains node status data for 30 days. You can send node status
1719
data to [Azure Monitor Logs][05] if you prefer to retain this data for a longer period. Compliance
1820
status is visible in the Azure portal or with PowerShell, for nodes and for individual DSC resources

articles/automation/automation-dsc-extension-history.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Work with Azure Desired State Configuration extension version history
33
description: This article shares version history information for the Desired State Configuration (DSC) extension in Azure.
4-
ms.date: 02/17/2021
4+
ms.date: 10/22/2024
55
keywords: dsc, powershell, azure, extension
66
services: automation
77
ms.subservice: desired-state-config
@@ -13,6 +13,8 @@ ms.service: azure-automation
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
The Azure Desired State Configuration (DSC) VM [extension](/azure/virtual-machines/extensions/dsc-overview) is updated as-needed to support enhancements and new capabilities delivered by Azure, Windows Server, and the Windows Management Framework (WMF) that includes Windows PowerShell.
1719

1820
This article provides information about each version of the Azure DSC VM extension, what environments it supports, and comments and remarks on new features or changes.

articles/automation/automation-dsc-getting-started.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article tells how to do the most common tasks in Azure Automat
44
services: automation
55
ms.subservice: desired-state-config
66
ms.custom: devx-track-arm-template
7-
ms.date: 08/20/2024
7+
ms.date: 10/22/2024
88
ms.topic: how-to
99
ms.service: azure-automation
1010
---
@@ -13,6 +13,8 @@ ms.service: azure-automation
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
This article provides a step-by-step guide for doing the most common tasks with Azure Automation
1719
State Configuration, such as:
1820

articles/automation/automation-dsc-onboarding.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ ms.custom:
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
This article describes how you can set up your machines for management with Azure Automation State
1719
Configuration. For details of this service, see
1820
[Azure Automation State Configuration overview][17].

articles/automation/automation-dsc-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ keywords: powershell dsc, desired state configuration, powershell dsc azure
55
services: automation
66
ms.service: azure-automation
77
ms.subservice: desired-state-config
8-
ms.date: 08/20/2024
8+
ms.date: 10/22/2024
99
ms.topic: overview
1010
---
1111

1212
# Azure Automation State Configuration overview
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
Azure Automation State Configuration is an Azure configuration management service that allows you to write, manage, and
1719
compile PowerShell Desired State Configuration (DSC) [configurations](/powershell/dsc/configurations/configurations) for nodes in any cloud or on-premises datacenter. The service also imports [DSC Resources](/powershell/dsc/resources/resources), and assigns configurations to target nodes, all in the cloud. You can access Azure Automation State Configuration in the Azure portal by selecting **State configuration (DSC)** under **Configuration Management**.
1820

articles/automation/automation-dsc-remediate.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ ms.service: azure-automation
66
ms.subservice: desired-state-config
77
ms.custom: linux-related-content
88
ms.topic: conceptual
9-
ms.date: 07/17/2019
9+
ms.date: 10/22/2024
1010
---
1111

1212
# Remediate noncompliant Azure Automation State Configuration servers
1313

1414
[!INCLUDE [azure-automation-dsc-end-of-life](~/includes/dsc-automation/azure-automation-dsc-end-of-life.md)]
1515

16+
[!INCLUDE [automation-dsc-linux-retirement-announcement](./includes/automation-dsc-linux-retirement-announcement.md)]
17+
1618
When servers are registered with Azure Automation State Configuration, the configuration mode is set
1719
to `ApplyOnly`, `ApplyAndMonitor`, or `ApplyAndAutoCorrect`. If the mode isn't set to
1820
`ApplyAndAutoCorrect`, servers that drift from a compliant state for any reason remain noncompliant

0 commit comments

Comments
 (0)