Skip to content

Commit 6ec3977

Browse files
authored
Merge pull request #91122 from craigcaseyMSFT/vcraic1009a
fix broken links from CATS report
2 parents 6214bea + 429d0cb commit 6ec3977

10 files changed

+31
-31
lines changed

articles/automation/automation-dsc-configuration-based-on-stig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ in one large file.
4444

4545
Once the configurations have been generated,
4646
you can use the
47-
[DSC Configuration scripts](/powershell/dsc/configurations)
47+
[DSC Configuration scripts](/powershell/scripting/dsc/configurations/configurations)
4848
to generate MOF files
4949
and
5050
[upload the MOF files to Azure Automation](/azure/automation/tutorial-configure-servers-desired-state#create-and-upload-a-configuration-to-azure-automation).

articles/automation/automation-dsc-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ After you set up integration with Azure Monitor logs for your Automation State C
7979

8080
The **Log Search** blade opens, and you see a **DscNodeStatusData** operation for each State
8181
Configuration node, and a **DscResourceStatusData** operation for each [DSC
82-
resource](/powershell/dsc/resources) called in the Node configuration applied to that node.
82+
resource](/powershell/scripting/dsc/resources/resources) called in the Node configuration applied to that node.
8383

8484
The **DscResourceStatusData** operation contains error information for any DSC resources that failed.
8585

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ manager: carmonm
1212
---
1313
# Getting started with Azure Automation State Configuration
1414

15-
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/dsc/overview).
15+
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

1717
This article provides a step-by-step guide to using Azure Automation State Configuration. If you
1818
want a sample environment that is already set up without following the steps described in this
@@ -29,7 +29,7 @@ To complete the examples in this article, the following are required:
2929

3030
## Creating a DSC configuration
3131

32-
You create a simple [DSC configuration](/powershell/dsc/configurations) that ensures either the
32+
You create a simple [DSC configuration](/powershell/scripting/dsc/configurations/configurations) that ensures either the
3333
presence or absence of the **Web-Server** Windows Feature (IIS), depending on how you assign nodes.
3434

3535
1. Start [VSCode](https://code.visualstudio.com/docs) (or any text editor).
@@ -60,7 +60,7 @@ presence or absence of the **Web-Server** Windows Feature (IIS), depending on ho
6060
```
6161
1. Save the file as `TestConfig.ps1`.
6262
63-
This configuration calls one resource in each node block, the [WindowsFeature resource](/powershell/dsc/windowsfeatureresource), that ensures either the presence
63+
This configuration calls one resource in each node block, the [WindowsFeature resource](/powershell/scripting/dsc/reference/resources/windows/windowsfeatureresource), that ensures either the presence
6464
or absence of the **Web-Server** feature.
6565
6666
## Importing a configuration into Azure Automation
@@ -98,7 +98,7 @@ compiled into one or more node configurations (MOF document), and placed on the
9898
Server. For a more detailed description of compiling configurations in Azure Automation State
9999
Configuration, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md).
100100
For more information about compiling configurations, see
101-
[DSC Configurations](/powershell/dsc/configurations).
101+
[DSC Configurations](/powershell/scripting/dsc/configurations/configurations).
102102
103103
1. Sign in to the [Azure portal](https://portal.azure.com).
104104
1. On the left, click **All resources** and then the name of your Automation account.
@@ -217,7 +217,7 @@ On the blade for an individual report, you can see the following status informat
217217
- The name, IP address, and configuration mode of the node.
218218
219219
You can also click **View raw report** to see the actual data that the node sends to the server.
220-
For more information about using that data, see [Using a DSC report server](/powershell/dsc/reportserver).
220+
For more information about using that data, see [Using a DSC report server](/powershell/scripting/dsc/pull-server/reportserver).
221221
222222
It can take some time after a node is onboarded before the first report is available. You might
223223
need to wait up to 30 minutes for the first report after you onboard a node.
@@ -256,6 +256,6 @@ If you no longer want a node to be managed by Azure Automation DSC, you can unre
256256
257257
- [Azure Automation State Configuration overview](automation-dsc-overview.md)
258258
- [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md)
259-
- [Windows PowerShell Desired State Configuration Overview](/powershell/dsc/overview)
259+
- [Windows PowerShell Desired State Configuration Overview](/powershell/scripting/dsc/overview/overview)
260260
- [Azure Automation State Configuration cmdlets](/powershell/module/azurerm.automation/#automation)
261261
- [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/)

articles/automation/automation-dsc-onboarding.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Select an Azure virtual machine to onboard.
6464

6565
If the machine does not have the PowerShell desired state extension installed and the power state is running, click **Connect**.
6666

67-
Under **Registration**, enter the [PowerShell DSC Local Configuration Manager values](/powershell/dsc/managing-nodes/metaconfig)
67+
Under **Registration**, enter the [PowerShell DSC Local Configuration Manager values](/powershell/scripting/dsc/managing-nodes/metaConfig)
6868
required for your use case, and optionally a node configuration to assign to the VM.
6969

7070
![onboarding](./media/automation-dsc-onboarding/DSC_Onboarding_6.png)
@@ -123,7 +123,7 @@ can also be onboarded to Azure Automation State Configuration, as long as they h
123123
[outbound access to Azure](automation-dsc-overview.md#network-planning):
124124

125125
1. Make sure the latest version of [PowerShell Desired State Configuration for Linux](https://github.com/Microsoft/PowerShell-DSC-for-Linux) is installed on the machines you want to onboard to Azure Automation State Configuration.
126-
1. If the [PowerShell DSC Local Configuration Manager defaults](/powershell/dsc/metaconfig4) match your use case, and you want to onboard machines such that they **both** pull from and report to Azure Automation State Configuration:
126+
1. If the [PowerShell DSC Local Configuration Manager defaults](/powershell/scripting/dsc/managing-nodes/metaConfig4) match your use case, and you want to onboard machines such that they **both** pull from and report to Azure Automation State Configuration:
127127

128128
- On each Linux machine to onboard to Azure Automation State Configuration, use `Register.py` to onboard using the PowerShell DSC Local Configuration Manager defaults:
129129

@@ -157,7 +157,7 @@ The machine this command is run from must have the latest version of [WMF 5](htt
157157
158158
## Generating DSC metaconfigurations
159159
160-
To generically onboard any machine to Azure Automation State Configuration, a [DSC metaconfiguration](/powershell/dsc/metaconfig)
160+
To generically onboard any machine to Azure Automation State Configuration, a [DSC metaconfiguration](/powershell/scripting/dsc/managing-nodes/metaConfig)
161161
can be generated that tells the DSC
162162
agent to pull from and/or report to Azure Automation State Configuration. DSC
163163
metaconfigurations for Azure Automation State Configuration can be generated using either a
@@ -369,7 +369,7 @@ After registering a machine as a DSC node in Azure Automation State Configuratio
369369
number of reasons why you may need to reregister that node in the future:
370370
371371
- For versions of Windows Server prior to Windows Server 2019, each node automatically negotiates a unique certificate for authentication that expires after one year. Currently, the PowerShell DSC registration protocol cannot automatically renew certificates when they are nearing expiration, so you need to reregister the nodes after a year's time. Before reregistering, ensure that each node is running Windows Management Framework 5.0 RTM. If a node's authentication certificate expires, and the node is not reregistered, the node is unable to communicate with Azure Automation and is marked 'Unresponsive.' Reregistration performed 90 days or less from the certificate expiration time, or at any point after the certificate expiration time, will result in a new certificate being generated and used. A resolution to this issue is included in Windows Server 2019 and later.
372-
- To change any [PowerShell DSC Local Configuration Manager values](/powershell/dsc/metaconfig4) that were set during initial registration of the node, such as ConfigurationMode. Currently, these DSC agent values can only be changed through reregistration. The one exception is the Node Configuration assigned to the node -- this can be changed in Azure Automation DSC directly.
372+
- To change any [PowerShell DSC Local Configuration Manager values](/powershell/scripting/dsc/managing-nodes/metaConfig4) that were set during initial registration of the node, such as ConfigurationMode. Currently, these DSC agent values can only be changed through reregistration. The one exception is the Node Configuration assigned to the node -- this can be changed in Azure Automation DSC directly.
373373
374374
Reregistration can be performed in the same way you registered the node initially, using any of the
375375
onboarding methods described in this document. You do not need to unregister a node from Azure

articles/automation/automation-quickstart-dsc-configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ There are many different methods to onboard a machine and enable Desired State C
3838
2. Click **Add** to open the VM select page.
3939
3. Find the virtual machine you would like to enable DSC for. You can use the search field and filter options to find a specific virtual machine.
4040
4. Click on the virtual machine, and then select **Connect**
41-
5. Select the DSC settings appropriate for the virtual machine. If you have already prepared a configuration, you can specify it as *Node Configuration Name*. You can set the [configuration mode](https://docs.microsoft.com/powershell/dsc/metaconfig) to control the configuration behavior for the machine.
41+
5. Select the DSC settings appropriate for the virtual machine. If you have already prepared a configuration, you can specify it as *Node Configuration Name*. You can set the [configuration mode](https://docs.microsoft.com/powershell/scripting/dsc/managing-nodes/metaConfig) to control the configuration behavior for the machine.
4242
6. Click **OK**
4343

4444
![Onboarding an Azure VM to DSC](./media/automation-quickstart-dsc-configuration/dsc-onboard-azure-vm.png)
@@ -60,7 +60,7 @@ Modules contain DSC Resources and many can be found on the [PowerShell Gallery](
6060

6161
This quickstart uses a DSC configuration that configures Apache HTTP Server, MySQL, and PHP on the machine.
6262

63-
For information about DSC configurations, see [DSC configurations](https://docs.microsoft.com/powershell/dsc/configurations).
63+
For information about DSC configurations, see [DSC configurations](https://docs.microsoft.com/powershell/scripting/dsc/configurations/configurations).
6464

6565
In a text editor, type the following and save it locally as `LAMPServer.ps1`.
6666

@@ -139,7 +139,7 @@ In this quickstart, you onboarded a Linux VM to DSC, created a configuration for
139139
> [!div class="nextstepaction"]
140140
> [Continuous deployment to a VM using DSC and Chocolatey](./automation-dsc-cd-chocolatey.md)
141141
142-
* To learn more about PowerShell Desired State Configuration, see [PowerShell Desired State Configuration Overview](https://docs.microsoft.com/powershell/dsc/overview).
142+
* To learn more about PowerShell Desired State Configuration, see [PowerShell Desired State Configuration Overview](https://docs.microsoft.com/powershell/scripting/dsc/overview/overview).
143143
* To learn more about managing Automation DSC from PowerShell, see [Azure PowerShell](https://docs.microsoft.com/powershell/module/azurerm.automation/)
144144
* To learn how to forward DSC reports to Azure Monitor logs for reporting and alerting, see [Forwarding DSC Reporting to Azure Monitor logs](https://docs.microsoft.com/azure/automation/automation-dsc-diagnostics)
145145

articles/automation/compose-configurationwithcompositeresources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ manager: carmonm
1515

1616
When a resource needs to be managed with more than a single desired state configuration (DSC)
1717
configuration, the best path is to use [composite
18-
resources](/powershell/dsc/authoringresourcecomposite). A composite resource is a nested and
18+
resources](/powershell/scripting/dsc/resources/authoringresourcecomposite). A composite resource is a nested and
1919
parameterized configuration being used as a DSC resource within another configuration. This allows
2020
the creation of complex configurations while allowing the underlying composite resources
2121
(parameterized configurations) to be individually managed and built.

articles/automation/tutorial-configure-servers-desired-state.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To complete this tutorial, you will need:
2929
- An Azure Resource Manager VM (not Classic) running Windows Server 2008 R2 or later. For instructions on creating a VM, see
3030
[Create your first Windows virtual machine in the Azure portal](../virtual-machines/virtual-machines-windows-hero-tutorial.md)
3131
- Azure PowerShell module version 3.6 or later. Run `Get-Module -ListAvailable AzureRM` to find the version. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/azurerm/install-azurerm-ps).
32-
- Familiarity with Desired State Configuration (DSC). For information about DSC, see [Windows PowerShell Desired State Configuration Overview](https://docs.microsoft.com/powershell/dsc/overview)
32+
- Familiarity with Desired State Configuration (DSC). For information about DSC, see [Windows PowerShell Desired State Configuration Overview](/powershell/scripting/dsc/overview/overviews)
3333

3434
## Log in to Azure
3535

@@ -43,7 +43,7 @@ Connect-AzureRmAccount
4343

4444
For this tutorial, we will use a simple DSC configuration that ensures that IIS is installed on the VM.
4545

46-
For information about DSC configurations, see [DSC configurations](/powershell/dsc/configurations).
46+
For information about DSC configurations, see [DSC configurations](/powershell/scripting/dsc/configurations/configurations).
4747

4848
In a text editor, type the following and save it locally as `TestConfig.ps1`.
4949

@@ -73,7 +73,7 @@ Call the `Import-AzureRmAutomationDscConfiguration` cmdlet to upload the configu
7373

7474
A DSC configuration must be compiled into a node configuration before it can be assigned to a node.
7575

76-
For information about compiling configurations, see [DSC configurations](/powershell/dsc/configurations).
76+
For information about compiling configurations, see [DSC configurations](/powershell/scripting/dsc/configurations/configurations).
7777

7878
Call the `Start-AzureRmAutomationDscCompilationJob` cmdlet to compile the `TestConfig` configuration into a node configuration:
7979

@@ -121,7 +121,7 @@ Register-AzureRmAutomationDscNode -ResourceGroupName 'MyResourceGroup' -Automati
121121
For more information about setting configuration properties for a managed node, see
122122
[Register-AzureRmAutomationDscNode](/powershell/module/azurerm.automation/register-azurermautomationdscnode).
123123

124-
For more information about DSC configuration settings, see [Configuring the Local Configuration Manager](/powershell/dsc/metaconfig).
124+
For more information about DSC configuration settings, see [Configuring the Local Configuration Manager](/powershell/scripting/dsc/managing-nodes/metaConfig).
125125

126126
## Assign a node configuration to a managed node
127127

@@ -138,7 +138,7 @@ Set-AzureRmAutomationDscNode -ResourceGroupName 'MyResourceGroup' -AutomationAcc
138138
This assigns the node configuration named `TestConfig.WebServer` to the registered DSC node named `DscVm`.
139139
By default, the DSC node is checked for compliance with the node configuration every 30 minutes.
140140
For information about how to change the compliance check interval, see
141-
[Configuring the Local Configuration Manager](/PowerShell/DSC/metaConfig).
141+
[Configuring the Local Configuration Manager](/powershell/scripting/dsc/managing-nodes/metaConfig).
142142

143143
## Working with Partial Configurations
144144

articles/azure-functions/functions-consumption-costs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The following behaviors of your functions can impact the execution time:
6161

6262
## View execution data
6363

64-
In [your invoice](/billing/billing-download-azure-invoice.md), you can view the cost-related data of **Total Executions - Functions** and **Execution Time - Functions**, along with the actual billed costs. However, this invoice data is a monthly aggregate for a past invoice period.
64+
In [your invoice](/azure/billing/billing-download-azure-invoice), you can view the cost-related data of **Total Executions - Functions** and **Execution Time - Functions**, along with the actual billed costs. However, this invoice data is a monthly aggregate for a past invoice period.
6565

6666
To better understand the cost impact of your functions, you can use Azure Monitor to view cost-related metrics currently being generated by your function apps. You can use either [Azure Monitor metrics explorer](../azure-monitor/platform/metrics-getting-started.md) in the [Azure portal] or REST APIs to get this data.
6767

articles/azure-resource-manager/template-tutorial-export-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: jgao
1313

1414
# Tutorial: Use exported template from the Azure portal
1515

16-
In this tutorial series, you've created a template to deploy an Azure storage account. In the next two tutorials, you add an *App Service plan* and a *website*. Instead of creating templates from scratch, you learn how to export templates from the Azure portal and how to use sample templates from the [Azure Quickstart templates](/resources/templates/). You customize those templates for your use. This tutorial focuses on exporting templates, and customizing the result for your template. It takes about **14 minutes** to complete.
16+
In this tutorial series, you've created a template to deploy an Azure storage account. In the next two tutorials, you add an *App Service plan* and a *website*. Instead of creating templates from scratch, you learn how to export templates from the Azure portal and how to use sample templates from the [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/). You customize those templates for your use. This tutorial focuses on exporting templates, and customizing the result for your template. It takes about **14 minutes** to complete.
1717

1818
## Prerequisites
1919

0 commit comments

Comments
 (0)