Skip to content

Commit 2de1857

Browse files
authored
Merge pull request #110836 from BethWilke/branch11
Editing several documents
2 parents 99e4715 + b9e3b60 commit 2de1857

8 files changed

+188
-193
lines changed

articles/automation/TOC.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
href: /powershell/scripting/dsc/overview/overview
263263
- name: Quickstarts
264264
items:
265-
- name: Getting Started
265+
- name: Get Started
266266
href: automation-dsc-getting-started.md
267267
displayName: DSC
268268
- name: Manage the configuration of a machine
@@ -278,31 +278,28 @@
278278
- name: Configure servers to a desired state and manage drift with State Configuration
279279
href: tutorial-configure-servers-desired-state.md
280280
displayName: DSC, compliance
281-
- name: Onboarding machines for management
282-
href: automation-dsc-onboarding.md
283-
displayName: DSC, state configuration
284-
- name: Compiling DSC configurations
281+
- name: Compile DSC configurations
285282
href: automation-dsc-compile.md
286283
displayName: state configuration, composite resources, configurationData
287284
- name: Remediate non-compliant DSC servers
288285
href: automation-dsc-remediate.md
289286
displayName: state configuration, DSC, remediate
290-
- name: Composing DSC Configurations using Composite Resources
287+
- name: Compose DSC configurations using composite resources
291288
href: compose-configurationwithcompositeresources.md
292-
- name: Continuous deployment using Chocolatey
289+
- name: Provide continuous deployment using Chocolatey
293290
href: automation-dsc-cd-chocolatey.md
294291
displayName: dsc, state configuration
295292
- name: Forward State Configuration reporting data to Azure Monitor logs
296293
href: automation-dsc-diagnostics.md
297294
displayName: DSC
298295
- name: Troubleshoot
299296
items:
300-
- name: Onboarding
297+
- name: Troubleshoot onboarding
301298
href: troubleshoot/onboarding.md
302299
displayName: troubleshoot
303300
- name: Troubleshoot State Configuration (DSC)
304301
href: troubleshoot/desired-state-configuration.md
305-
displayName: Desired State Configuration, troubleshoot
302+
displayName: state configuration, DSC, troubleshoot
306303
- name: Reference
307304
items:
308305
- name: Community Solutions

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

Lines changed: 98 additions & 114 deletions
Large diffs are not rendered by default.

articles/automation/automation-dsc-compile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Compiling configurations in Azure Automation State Configuration
2+
title: Compile DSC configurations in Azure Automation State Configuration
33
description: This article describes how to compile Desired State Configuration (DSC) configurations for Azure Automation.
44
services: automation
55
ms.subservice: dsc
66
ms.date: 04/06/2020
77
ms.topic: conceptual
88
---
9-
# Compiling DSC configurations in Azure Automation State Configuration
9+
# Compile DSC configurations in Azure Automation State Configuration
1010

1111
You can compile Desired State Configuration (DSC) configurations in Azure Automation State Configuration in the following ways:
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Getting started with Azure Automation State Configuration
2+
title: Get started with Azure Automation State Configuration
33
description: Explanation and examples of the most common tasks in Azure Automation State Configuration (DSC)
44
services: automation
55
ms.service: automation
@@ -10,7 +10,7 @@ ms.date: 04/15/2019
1010
ms.topic: conceptual
1111
manager: carmonm
1212
---
13-
# Getting started with Azure Automation State Configuration
13+
# Get started with Azure Automation State Configuration
1414

1515
This article explains how to do the most common tasks with Azure Automation State Configuration, such as creating, importing, and compiling configurations, onboarding machines to manage, and viewing reports. For an overview of what Azure Automation State Configuration is, see [Azure Automation State Configuration Overview](automation-dsc-overview.md). For Desired State Configuration (DSC) documentation, see [Windows PowerShell Desired State Configuration Overview](/powershell/scripting/dsc/overview/overview).
1616

articles/automation/automation-dsc-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure Automation State Configuration Overview
3-
description: An Overview of Azure Automation State Configuration (DSC), its terms, and known issues
2+
title: State Configuration overview
3+
description: An overview of Azure Automation State Configuration (DSC), its terms, and known issues
44
keywords: powershell dsc, desired state configuration, powershell dsc azure
55
services: automation
66
ms.service: automation
@@ -11,7 +11,7 @@ ms.date: 11/06/2018
1111
ms.topic: conceptual
1212
manager: carmonm
1313
---
14-
# Azure Automation State Configuration Overview
14+
# State Configuration overview
1515

1616
Azure Automation State Configuration is an Azure service that allows you to write, manage, and
1717
compile PowerShell Desired State Configuration (DSC)

articles/automation/automation-intro.md

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,87 @@
11
---
2-
title: Azure Automation Overview
2+
title: Azure Automation overview
33
description: Learn how to use Azure Automation to automate the lifecycle of infrastructure and applications.
44
services: automation
55
ms.subservice: process-automation
6-
keywords: azure automation, DSC, powershell, desired state configuration, update management, change tracking, inventory, runbooks, python, graphical
6+
keywords: azure automation, DSC, powershell, state configuration, update management, change tracking, DSC, inventory, runbooks, python, graphical
77
ms.date: 10/18/2018
88
ms.custom: mvc
99
ms.topic: overview
1010
---
1111
# An introduction to Azure Automation
1212

13-
Azure Automation delivers a cloud-based automation and configuration service that provides consistent management across your Azure and non-Azure environments. It consists of process automation, update management, and configuration features. Azure Automation provides complete control during deployment, operations, and decommissioning of workloads and resources.
1413
This article provides a brief overview of Azure Automation and answers some common questions. For more information about the different capabilities, visit the links throughout this overview.
1514

16-
## Azure Automation capabilities
15+
## About Azure Automation
1716

18-
![Automation overview capabilities](media/automation-overview/automation-overview.png)
17+
Azure Automation delivers a cloud-based automation and configuration service that supports consistent management across your Azure and non-Azure environments. It comprises process automation, configuration management, update management, shared capabilities, and heterogeneous features. Automation gives you complete control during deployment, operations, and decommissioning of workloads and resources.
1918

20-
### Process automation
19+
![Automation capabilities](media/automation-overview/automation-overview.png)
2120

22-
Azure Automation provides you the ability to automate frequent, time-consuming, and error-prone cloud management tasks. This automation helps you focus on work that adds business value. By reducing errors and boosting efficiency, it also helps to lower your operational costs. You can integrate Azure services and other public systems that are required in deploying, configuring, and managing your end to end processes. The service allows you to [author runbooks](automation-runbook-types.md) graphically, in PowerShell, or Python. By using a hybrid Runbook worker, you can unify management by orchestrating across on-premises environments. [Webhooks](automation-webhooks.md) provide a way to fulfill requests and ensure continuous delivery and operations by triggering automation from ITSM, DevOps, and monitoring systems.
21+
## Process automation
2322

24-
### Configuration management
23+
Process automation in Azure Automation allows you to automate frequent, time-consuming, and error-prone cloud management tasks. This service helps you focus on work that adds business value. By reducing errors and boosting efficiency, it also helps to lower your operational costs. The process automation operating environment is detailed in [Runbook execution in Azure Automation](automation-runbook-execution.md).
2524

26-
Azure Automation [desired state configuration](automation-dsc-overview.md) is a cloud-based solution for PowerShell DSC that provides services required for enterprise environments. Manage your DSC resources in Azure Automation and apply configurations to virtual or physical machines from a DSC Pull Server in the Azure cloud. It provides rich reports that inform you of important events such as when nodes have deviated from their assigned configuration. You can monitor and automatically update machine configuration across physical and virtual machines, Windows or Linux, in the cloud or on-premises.
25+
Process automation supports the integration of Azure services and other public systems required in deploying, configuring, and managing your end-to-end processes. The service allows you to author [runbooks](automation-runbook-types.md) graphically, in PowerShell, or using Python. By using a [Hybrid Runbook Worker](automation-hybrid-runbook-worker.md), you can unify management by orchestrating across on-premises environments. [Webhooks](automation-webhooks.md) let you fulfill requests and ensure continuous delivery and operations by triggering automation from ITSM, DevOps, and monitoring systems.
2726

28-
You can get inventory about in-guest resources for visibility into installed applications and other configuration items. A rich reporting and search capabilities are available to quickly find detailed information to help understand what is configured within the operating system. You can track changes across services, daemons, software, registry, and files to quickly identify what might be causing issues. Additionally, DSC can help you diagnose and alert when unwanted changes occur in your environment.
27+
## Configuration management
2928

30-
### Update management
29+
Azure Automation [state configuration](automation-dsc-overview.md) is a cloud-based solution for PowerShell desired state configuration (DSC) that provides services for enterprise environments. Using this feature, you can manage your DSC resources in Azure Automation and apply configurations to virtual or physical machines from a DSC pull server in the Azure cloud. You can monitor and automatically update machine configurations across physical and virtual machines, on Windows or Linux, in the cloud or on-premises. Inventory support allows you to query in-guest resources for visibility into installed applications and other configuration items.
30+
31+
The Azure Automation state configuration service provides rich reporting and search capabilities. You can use these features to locate detailed information about what is configured within an operating system. The service supports change tracking across services, daemons, software, registry, and files in your environment to help you diagnose unwanted changes and raise alerts. An important related feature is the reporting of major events, for example, events issued when nodes deviate from their assigned configurations.
3132

32-
Update Windows and Linux systems across hybrid environments with Azure Automation. You get visibility of update compliance across Azure, on-premises, and other clouds. You can create schedule deployments to orchestrate the installation of updates within a defined maintenance window. If an update should not be installed on a machine, you can exclude those updates from a deployment.
33+
## Update management
3334

34-
### <a name="shared-resources"></a>Shared resources
35+
Azure Automation includes the [update management](automation-update-management.md) solution for Windows and Linux systems across hybrid environments. With this solution, you get visibility into update compliance across Azure and other clouds, and on-premises. Update management allows you to create scheduled deployments that orchestrate the installation of updates within a defined maintenance window. If an update shouldn't be installed on a machine, you can use update management features to exclude it from a deployment.
3536

36-
Azure Automation consists of a set of shared resources that make it easier to automate and configure your environments at scale.
37+
## Shared capabilities
3738

38-
* **[Schedules](automation-schedules.md)** - Used in the service to trigger automation on predefined times.
39-
* **[Modules](automation-integration-modules.md)** - Modules are used to manage Azure and other systems. Import into the Automation Account for Microsoft, third party, community, or custom defined cmdlets and DSC resources.
40-
* **[Modules gallery](automation-runbook-gallery.md)** - Native integration to the PowerShell Gallery to view runbooks and import them into the Automation Account.
41-
* **[Python 2 packages](python-packages.md)** - Add Python 2 packages to your automation account to use in your Python runbooks.
42-
* **[Credentials](automation-credentials.md)** - Securely store sensitive information that can be used by runbooks and configurations at runtime.
43-
* **[Connections](automation-connections.md)** - Store a name / value pairs of information that contains common information when connecting to systems in connection resources. Connections are defined by the module author for use at runtime in runbooks and configurations.
44-
* **[Certificates](automation-certificates.md)** - Store and make available at runtime so they can be used for authentication and securing deployed resources.
45-
* **[Variables](automation-variables.md)** - Provide a way to hold content that can be used across runbooks and configurations. You can change values without having to modify any of the runbooks and configurations that reference them.
39+
Azure Automation offers a number of shared capabilities, including shared resources, role-based access control, flexible scheduling, source control integration, auditing, and tagging.
4640

47-
### Source control integration
41+
### <a name="shared-resources"></a>Shared resources
4842

49-
Azure Automation has the ability to [integrate with source control](source-control-integration.md) which promotes configuration as code where runbooks or configurations can be checked into a source control system.
43+
Azure Automation consists of a set of shared resources that make it easier to automate and configure your environments at scale.
44+
45+
* **[Schedules](automation-schedules.md)** - Trigger Automation operations at predefined times.
46+
* **[Modules](automation-integration-modules.md)** - Manage Azure and other systems. You can import modules into the Automation account for Microsoft, third-party, community, and custom-defined cmdlets and DSC resources.
47+
* **[Modules gallery](automation-runbook-gallery.md)** - Supports native integration with the PowerShell Gallery to let you view runbooks and import them into the Automation account. The gallery allows you to quickly get started integrating and authoring your processes from PowerShell gallery and Microsoft Script Center.
48+
* **[Python 2 packages](python-packages.md)** - Support Python 2 runbooks for your Automation account.
49+
* **[Credentials](automation-credentials.md)** - Securely store sensitive information that runbooks and configurations can use at runtime.
50+
* **[Connections](automation-connections.md)** - Store name-value pairs of common information for connections to systems. The module author defines connections in runbooks and configurations for use at runtime.
51+
* **[Certificates](automation-certificates.md)** - Define information to be used in authentication and securing of deployed resources when accessed by runbooks or DSC configurations at runtime.
52+
* **[Variables](automation-variables.md)** - Hold content that can be used across runbooks and configurations. You can change variable values without having to modify any of the runbooks or configurations that reference them.
5053

51-
### Role based access control
54+
### Role-based access control
5255

53-
Azure Automation supports Role Based Access Control to control access to the Automation Account and its resources, to learn more about configuration RBAC on your Automation Account,runbooks, and jobs, see [Role-based access control for Azure Automation](automation-role-based-access-control.md).
56+
Azure Automation supports role-based access control (RBAC) to regulate access to the Automation account and its resources. To learn more about configuring RBAC on your Automation account, runbooks, and jobs, see [Role-based access control for Azure Automation](automation-role-based-access-control.md).
5457

55-
### Windows and Linux
58+
### Source control integration
5659

57-
Azure Automation is designed to work across your hybrid cloud environment and also for Windows & Linux. It delivers a consistent way to automate and configure workloads deployed and the operating system they are running on.
60+
Azure Automation allows [source control integration](source-control-integration.md). This feature promotes configuration as code where runbooks or configurations can be checked into a source control system.
5861

59-
### Community gallery
62+
## Heterogeneous support (Windows and Linux)
6063

61-
Browse the [Automation gallery](automation-runbook-gallery.md) for runbooks and modules to quickly get started integrating and authoring your processes from PowerShell gallery and Microsoft Script Center.
64+
Automation is designed to work across your hybrid cloud environment and also your Windows and Linux systems. It delivers a consistent way to automate and configure deployed workloads and the operating systems that run them.
6265

6366
## Common scenarios for Automation
6467

65-
Azure Automation manages across the lifecycle of your infrastructure and applications. Transfer knowledge into the system on how the organization delivers and maintains workloads. Author in common languages like PowerShell, desired state configuration, Python, and graphical runbooks. Get a complete inventory of deployed resources for targeting, reporting, and compliance. Identify changes that can cause misconfiguration and improve operational compliance.
68+
Azure Automation supports management throughout the lifecycle of your infrastructure and applications. Common scenarios include:
6669

67-
* **Build / Deploy resources** - Deploy VMs across a hybrid environment using Runbooks and Azure Resource Manager templates. Integrate into development tools like Jenkins and Azure DevOps.
68-
* **Configure VMs** - Assess and configure Windows and Linux machines with the desired configuration for the infrastructure and application.
69-
* **Monitor** - Identify changes on machines that are causing issues and remediate or escalate to management systems.
70-
* **Protect** - Quarantine VM if security alert is raised. Set in-guest requirements.
71-
* **Govern** - Set up role-based access control for teams. Recover unused resources.
70+
* **Write runbooks** - Author PowerShell, PowerShell Workflow, graphical, Python 2, and DSC runbooks in common languages.
71+
* **Build and deploy resources** - Deploy virtual machines across a hybrid environment using runbooks and Azure Resource Manager templates. Integrate into development tools, such as Jenkins and Azure DevOps.
72+
* **Configure VMs** - Assess and configure Windows and Linux machines with configurations for the infrastructure and application.
73+
* **Share knowledge** - Transfer knowledge into the system on how your organization delivers and maintains workloads.
74+
* **Retrieve inventory** - Get a complete inventory of deployed resources for targeting, reporting, and compliance.
75+
* **Find changes** - Identify changes that can cause misconfiguration and improve operational compliance.
76+
* **Monitor** - Isolate machine changes that are causing issues and remediate or escalate them to management systems.
77+
* **Protect** - Quarantine machines if security alerts are raised. Set in-guest requirements.
78+
* **Govern** - Set up RBAC for teams. Recover unused resources.
7279

7380
[!INCLUDE [azure-lighthouse-supported-service](../../includes/azure-lighthouse-supported-service.md)]
7481

7582
## Pricing for Automation
7683

77-
You can review the price for Azure Automation on the [pricing](https://azure.microsoft.com/pricing/details/automation/) page.
84+
You can review the prices associated with Azure Automation on the [pricing](https://azure.microsoft.com/pricing/details/automation/) page.
7885

7986
## Next steps
8087

0 commit comments

Comments
 (0)