Skip to content

Commit

Permalink
fixing arm links
Browse files Browse the repository at this point in the history
  • Loading branch information
tfitzmac committed Dec 21, 2016
1 parent eb74e8c commit c6190a5
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion articles/log-analytics/log-analytics-azure-vm-extension.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ By using Azure Resource Manager, you can create a simple template (in JSON forma

By including the Log Analytics agent as part of your Resource Manager template, you can ensure that each virtual machine is pre-configured to report to your Log Analytics workspace.

For more information about Resource Manager templates, see [Authoring Azure Resource Manager templates](../resource-group-authoring-templates.md).
For more information about Resource Manager templates, see [Authoring Azure Resource Manager templates](../azure-resource-manager/resource-group-authoring-templates.md).

Following is an example of a Resource Manager template that's used for deploying a virtual machine that's running Windows with the Microsoft Monitoring Agent extension installed. This template is a typical virtual machine template, with the following additions:

Expand Down
2 changes: 1 addition & 1 deletion articles/log-analytics/log-analytics-sccm.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ You can connect System Center Configuration Manager to Log Analytics in OMS to s

There are a number of steps needed to connect Configuration Manager to OMS, so here's a quick rundown of the overall process:

1. In the Azure Management Portal, register Configuration Manager as a Web Application and/or Web API app, and ensure that you have the client ID and client secret key from the registration from Azure Active Directory. See [Use portal to create Active Directory application and service principal that can access resources](../resource-group-create-service-principal-portal.md) for detailed information about how accomplish this step.
1. In the Azure Management Portal, register Configuration Manager as a Web Application and/or Web API app, and ensure that you have the client ID and client secret key from the registration from Azure Active Directory. See [Use portal to create Active Directory application and service principal that can access resources](../azure-resource-manager/resource-group-create-service-principal-portal.md) for detailed information about how accomplish this step.
2. In the Azure Management Portal, [provide Configuration Manager (the registered web app) with permission to access OMS](#provide-configuration-manager-with-permissions-to-oms).
3. In Configuration Manager, [add a connection using the Add OMS Connection Wizard](#add-an-oms-connection-to-configuration-manager).
4. In Configuration Manager, you can [update the connection properties](#update-oms-connection-properties) if the password or client secret key ever expires or is lost.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: richrund

---
# Manage Log Analytics using Azure Resource Manager templates
You can use [Azure Resource Manager templates](../resource-group-authoring-templates.md) to create and configure Log Analytics workspaces. Examples of the tasks you can perform with templates include:
You can use [Azure Resource Manager templates](../azure-resource-manager/resource-group-authoring-templates.md) to create and configure Log Analytics workspaces. Examples of the tasks you can perform with templates include:

* Create a workspace
* Add a solution
Expand Down
2 changes: 1 addition & 1 deletion articles/log-analytics/log-analytics-view-designer.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ To delete an existing view, open the view by clicking on its tile in the main OM
![Delete a view](media/log-analytics-view-designer/edit-menu-delete.png)

### Export an existing view
You can export a view to a JSON file that you can import into another workspace or use in an [Azure Resource Manager template](../resource-group-authoring-templates.md). To export an existing view, open the view by clicking on its tile in the main OMS dashboard. Then click the **Export** button to create a file in the browser's download folder. The name of the file will be the name of the view with the extension *omsview*.
You can export a view to a JSON file that you can import into another workspace or use in an [Azure Resource Manager template](../azure-resource-manager/resource-group-authoring-templates.md). To export an existing view, open the view by clicking on its tile in the main OMS dashboard. Then click the **Export** button to create a file in the browser's download folder. The name of the file will be the name of the view with the extension *omsview*.

![Export a view](media/log-analytics-view-designer/edit-menu-export.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Get-AzureRmResource |? { $_.ResourceType -Like "*MachineLearning/workspaces*"} |
After the workspace is provisioned, you can also automate many Azure Machine Learning Studio tasks using the [PowerShell Module for Azure Machine Learning](http://aka.ms/amlps).

## Next Steps
* Learn more about [authoring Azure Resource Manager Templates](../resource-group-authoring-templates.md).
* Learn more about [authoring Azure Resource Manager Templates](../azure-resource-manager/resource-group-authoring-templates.md).
* Have a look at the [Azure Quickstart Templates Repository](https://github.com/Azure/azure-quickstart-templates).
* Watch this video about [Azure Resource Manager](https://channel9.msdn.com/Events/Ignite/2015/C9-39).

Expand Down
8 changes: 4 additions & 4 deletions articles/marketplace-consumer/mytemplates-getstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: vybavar

---
# Get started with private Templates on the Azure Portal
An [Azure Resource Manager](../resource-group-authoring-templates.md) template is a declarative template used to define your deployment. You can define the resources to deploy for a solution, and specify parameters and variables that enable you to input values for different environments. The template consists of JSON and expressions which you can use to construct values for your deployment.
An [Azure Resource Manager](../azure-resource-manager/resource-group-authoring-templates.md) template is a declarative template used to define your deployment. You can define the resources to deploy for a solution, and specify parameters and variables that enable you to input values for different environments. The template consists of JSON and expressions which you can use to construct values for your deployment.

You can use the new **Templates** capability in the [Azure Portal](https://portal.azure.com) along with the **Microsoft.Gallery** resource provider as an extension of the [Azure Marketplace](https://azure.microsoft.com/marketplace/) to enable users to create, manage and deploy private templates from a personal library.

Expand Down Expand Up @@ -126,7 +126,7 @@ Click **Select** and **Ok**. You can now see the users or groups you added to th
>
## Next steps
* To learn about creating Resource Manager templates, see [Authoring templates](../resource-group-authoring-templates.md)
* To understand the functions you can use in an Resource Manager template, see [Template functions](../resource-group-template-functions.md)
* For guidance on designing your templates, see [Best practices for designing Azure Resource Manager templates](../best-practices-resource-manager-design-templates.md)
* To learn about creating Resource Manager templates, see [Authoring templates](../azure-resource-manager/resource-group-authoring-templates.md)
* To understand the functions you can use in an Resource Manager template, see [Template functions](../azure-resource-manager/resource-group-template-functions.md)
* For guidance on designing your templates, see [Best practices for designing Azure Resource Manager templates](../azure-resource-manager/best-practices-resource-manager-design-templates.md)

Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Read the process thoroughly before beginning and understand where and why each s
## Developing building blocks
You must decide on the building blocks of your solution before you proceed with your solution template on the Publishing Portal. Below are some links to the documents that can help you in the process:

1. [Best practices for designing Azure Resource Manager templates](../best-practices-resource-manager-design-templates.md)
2. [Authoring Azure Resource Manager templates](../resource-group-authoring-templates.md)
1. [Best practices for designing Azure Resource Manager templates](../azure-resource-manager/best-practices-resource-manager-design-templates.md)
2. [Authoring Azure Resource Manager templates](../azure-resource-manager/resource-group-authoring-templates.md)
3. Azure Quickstart templates:
* [https://azure.microsoft.com/en-us/documentation/templates/](https://azure.microsoft.com/documentation/templates/)
* [https://github.com/azure/azure-quickstart-templates](https://github.com/azure/azure-quickstart-templates)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ You might also be interested in these related articles:

* VM images: [About Virtual Machine Images in Azure](https://msdn.microsoft.com/library/azure/dn790290.aspx)
* VM extensions: [VM Agent and VM Extensions Overview](https://msdn.microsoft.com/library/azure/dn832621.aspx) and [Azure VM Extensions and Features](https://msdn.microsoft.com/library/azure/dn606311.aspx)
* Azure Resource Manager: [Authoring Azure ARM Templates](../resource-group-authoring-templates.md) and [Simple ARM Template Examples](https://github.com/rjmax/ArmExamples)
* Azure Resource Manager: [Authoring Azure Resource Manager Templates](../azure-resource-manager/resource-group-authoring-templates.md) and [Simple Template Examples](https://github.com/rjmax/ArmExamples)
* Storage account throttles: [How to Monitor for Storage Account Throttling](http://blogs.msdn.com/b/mast/archive/2014/08/02/how-to-monitor-for-storage-account-throttling.aspx) and [Premium storage](../storage/storage-premium-storage.md#premium-storage-scalability-and-performance-targets)

[img-pubportal-menu-sol-templ]:media/marketplace-publishing-solution-template-creation/pubportal-menu-solution-templates.png
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This is an appendix documentation to [Authenticate with Mobile Engagement REST A
This describes an alternate way to do the One-time setup for setting up your authentication for the Mobile Engagement REST APIs using the Azure Portal.

> [!NOTE]
> The instructions below are based on this [Active Directory guide](../resource-group-create-service-principal-portal.md) and customized for what is required for authentication for Mobile Engagement APIs. So refer to it if you want to understand the steps below in detail.
> The instructions below are based on this [Active Directory guide](../azure-resource-manager/resource-group-create-service-principal-portal.md) and customized for what is required for authentication for Mobile Engagement APIs. So refer to it if you want to understand the steps below in detail.
>
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ ms.author: johnkem

---
# Create a metric alert with a Resource Manager template
This article shows how you can use an [Azure Resource Manager template](../resource-group-authoring-templates.md) to configure Azure metric alerts. This enables you to automatically set up alerts on your resources when they are created to ensure that all resources are monitored correctly.
This article shows how you can use an [Azure Resource Manager template](../azure-resource-manager/resource-group-authoring-templates.md) to configure Azure metric alerts. This enables you to automatically set up alerts on your resources when they are created to ensure that all resources are monitored correctly.

The basic steps are as follows:

1. Create a template as a JSON file that describes how to create the alert.
2. [Deploy the template using any deployment method](../resource-group-template-deploy.md).
2. [Deploy the template using any deployment method](../azure-resource-manager/resource-group-template-deploy.md).

Below we describe how to create a Resource Manager template first for an alert alone, then for an alert during the creation of another resource.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ms.author: johnkem

---
# Automatically enable Diagnostic Settings at resource creation using a Resource Manager template
In this article we show how you can use an [Azure Resource Manager template](../resource-group-authoring-templates.md) to configure Diagnostic Settings on a resource when it is created. This enables you to automatically start streaming your Diagnostic Logs and metrics to Event Hubs, archiving them in a Storage Account, or sending them to Log Analytics when a resource is created.
In this article we show how you can use an [Azure Resource Manager template](../azure-resource-manager/resource-group-authoring-templates.md) to configure Diagnostic Settings on a resource when it is created. This enables you to automatically start streaming your Diagnostic Logs and metrics to Event Hubs, archiving them in a Storage Account, or sending them to Log Analytics when a resource is created.

The method for enabling Diagnostic Logs using a Resource Manager template depends on the resource type.

Expand All @@ -30,7 +30,7 @@ In this article we describe how to configure diagnostics using either method.
The basic steps are as follows:

1. Create a template as a JSON file that describes how to create the resource and enable diagnostics.
2. [Deploy the template using any deployment method](../resource-group-template-deploy.md).
2. [Deploy the template using any deployment method](../azure-resource-manager/resource-group-template-deploy.md).

Below we give an example of the template JSON file you need to generate for non-Compute and Compute resources.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,6 @@ Each event in the Activity Log has a JSON blob similar to this example:
| nextLink |Continuation token to fetch the next set of results when they are broken up into multiple responses. Typically needed when there are more than 200 records. |

## Next Steps
* [Learn more about the Activity Log (formerly Audit Logs)](../resource-group-audit.md)
* [Learn more about the Activity Log (formerly Audit Logs)](../azure-resource-manager/resource-group-audit.md)
* [Stream the Azure Activity Log to Event Hubs](monitoring-stream-activity-logs-event-hubs.md)

2 changes: 1 addition & 1 deletion articles/monitoring-and-diagnostics/monitoring-partners.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Sumo Logic is a secure, cloud-native, machine data analytics service, delivering
[Learn more.][sumologic-doc]

## Next Steps
* [Learn more about the Activity Log (formerly Audit Logs)](../resource-group-audit.md)
* [Learn more about the Activity Log (formerly Audit Logs)](../azure-resource-manager/resource-group-audit.md)
* [Stream the Azure Activity Log to Event Hubs](monitoring-stream-activity-logs-event-hubs.md)

<!--Connectors Documentation-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Besides working with various metric data points, as this article demonstrates, t
## Authenticating Azure Monitor Requests
The first step is to authenticate the request.

All the tasks executed against the Azure Monitor API use the Azure Resource Manager authentication model. Therefore, all requests must be authenticated with Azure Active Directory (Azure AD). One approach to authenticate the client application is to create an Azure AD service principal and retrieve the authentication (JWT) token. The following sample script demonstrates creating an Azure AD service principal via PowerShell. For a more detailed walk-through, refer to the documentation on [using Azure PowerShell to create a service principal to access resources](../azure-resource-manager/resource-group-authenticate-service-principal.md#create-service-principal-with-password). It is also possible to [create a service principle via the Azure portal](../resource-group-create-service-principal-portal.md).
All the tasks executed against the Azure Monitor API use the Azure Resource Manager authentication model. Therefore, all requests must be authenticated with Azure Active Directory (Azure AD). One approach to authenticate the client application is to create an Azure AD service principal and retrieve the authentication (JWT) token. The following sample script demonstrates creating an Azure AD service principal via PowerShell. For a more detailed walk-through, refer to the documentation on [using Azure PowerShell to create a service principal to access resources](../azure-resource-manager/resource-group-authenticate-service-principal.md#create-service-principal-with-password). It is also possible to [create a service principle via the Azure portal](../azure-resource-manager/resource-group-create-service-principal-portal.md).

```PowerShell
$subscriptionId = "{azure-subscription-id}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ The **resources** element defines the different resources included in your manag
]

### Dependencies
The **dependsOn** elements specifies a [dependency](../resource-group-define-dependencies.md) on another resource. When the solution is installed, a resource is not created until all of its dependencies have been created. For example, your solution might [start a runbook](operations-management-suite-solutions-resources-automation.md#runbooks) when it's installed using a [job resource](operations-management-suite-solutions-resources-automation.md#automation-jobs). The job resource would be dependent on the runbook resource to make sure that the runbook is created before the job is created.
The **dependsOn** elements specifies a [dependency](../azure-resource-manager/resource-group-define-dependencies.md) on another resource. When the solution is installed, a resource is not created until all of its dependencies have been created. For example, your solution might [start a runbook](operations-management-suite-solutions-resources-automation.md#runbooks) when it's installed using a [job resource](operations-management-suite-solutions-resources-automation.md#automation-jobs). The job resource would be dependent on the runbook resource to make sure that the runbook is created before the job is created.

### OMS workspace and Automation account
Management solutions require an [OMS workspace](../log-analytics/log-analytics-manage-access.md) to contain views and an [Automation account](../automation/automation-security-overview.md#automation-account-overview) to contain runbooks and related resources. These must be available before the resources in the solution are created and should not be defined in the solution itself. The user will [specify a workspace and account](operations-management-suite-solutions.md#oms-workspace-and-automation-account) when they deploy your solution, but as the author you should consider the following points.
Expand Down Expand Up @@ -225,7 +225,7 @@ This would resolve to a name like the following.


### Dependencies
The solution resource must have a [dependency](../resource-group-define-dependencies.md) on every other resource in the solution since they need to exist before the solution can be created. You do this by adding an entry for each resource in the **dependsOn** element.
The solution resource must have a [dependency](../azure-resource-manager/resource-group-define-dependencies.md) on every other resource in the solution since they need to exist before the solution can be created. You do this by adding an entry for each resource in the **dependsOn** element.

### Properties
The solution resource has the properties in the following table. This includes the resources referenced and contained by the solution which defines how the resource is managed after the solution is installed. Each resource in the solution should be listed in either the **referencedResources** or the **containedResources** property.
Expand Down
Loading

0 comments on commit c6190a5

Please sign in to comment.