You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/active-directory/app-provisioning/functions-for-customizing-application-data.md
+20-1Lines changed: 20 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -34,7 +34,7 @@ The syntax for Expressions for Attribute Mappings is reminiscent of Visual Basic
34
34
* For string constants, if you need a backslash ( \ ) or quotation mark ( " ) in the string, it must be escaped with the backslash ( \ ) symbol. For example: "Company name: \\"Contoso\\""
Copy file name to clipboardExpand all lines: articles/active-directory/develop/reference-v2-libraries.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -89,7 +89,7 @@ See also [Scenarios by supported platforms and languages](authentication-flows-a
89
89
90
90
| Platform | Library name | Tested version | Source code | Sample |
91
91
|:---:|:---:|:---:|:---:|:---:|
92
-
||[Hello.js](https://adodson.com/hello.js/)| Version 1.13.5 |[Hello.js](https://github.com/MrSwitch/hello.js)|[SPA](https://github.com/Azure-Samples/active-directory-javascript-graphapi-web-v2)|
92
+
||[Hello.js](https://adodson.com/hello.js/)| Version 1.13.5 |[Hello.js](https://github.com/MrSwitch/hello.js)|[SPA](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2)|
Copy file name to clipboardExpand all lines: articles/azure-monitor/platform/agents-overview.md
+9-6Lines changed: 9 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -10,8 +10,8 @@ ms.author: bwren
10
10
ms.date: 02/14/2020
11
11
---
12
12
13
+
# Overview of Azure Monitor agents
13
14
14
-
# Overview of Azure Monitor agents
15
15
Virtual machines and other compute resources require an agent to collect monitoring data to measure the performance and availability of their guest operating system and workloads. This article describes the agents used by Azure Monitor and helps you determine which you need to meet the requirements for your particular environment.
16
16
17
17
> [!NOTE]
@@ -20,6 +20,7 @@ Virtual machines and other compute resources require an agent to collect monitor
20
20
You may have a specific set of requirements that can't be completely met with a single agent for a particular virtual machine. For example, you may want to use metric alerts which requires Azure diagnostics extension but also want to leverage the functionality of Azure Monitor for VMs which requires the Log Analytics agent and the Dependency agent. In cases such as this, you can use multiple agents, and this is a common scenario for customers who require functionality from each.
21
21
22
22
## Summary of agents
23
+
23
24
The following tables provide a quick comparison of the Azure Monitor agents for Windows and Linux. Further detail on each is provided in the section below.
24
25
25
26
### Windows agents
@@ -42,11 +43,12 @@ The following tables provide a quick comparison of the Azure Monitor agents for
42
43
| Data sent to | Azure Storage<br>Event Hub | Azure Monitor Metrics | Azure Monitor Logs | Azure Monitor Logs |
43
44
44
45
## Log Analytics agent
46
+
45
47
The [Log Analytics agent](log-analytics-agent.md) collects monitoring data from the guest operating system and workloads of virtual machines in Azure, other cloud providers, and on-premises. It collects data into a Log Analytics workspace. The Log Analytics agent is the same agent used by System Center Operations Manager, and you can multihome agent computers to communicate with your management group and Azure Monitor simultaneously. This agent is also required by certain insights and solutions in Azure Monitor.
46
48
47
49
48
50
> [!NOTE]
49
-
> The Log Analytics agent for Windows is often referred to as Microsoft Management Agent (MMA). The Log Analytics agent for Linux is often referred to as OMS agent.
51
+
> The Log Analytics agent for Windows is often referred to as Microsoft Monitoring Agent (MMA). The Log Analytics agent for Linux is often referred to as OMS agent.
50
52
51
53
52
54
@@ -64,6 +66,7 @@ Limitations of the Log Analytics agent include:
64
66
- Cannot send data to Azure Monitor Metrics, Azure Storage, or Azure Event Hubs.
65
67
66
68
## Azure diagnostics extension
69
+
67
70
The [Azure Diagnostics extension](diagnostics-extension-overview.md) collects monitoring data from the guest operating system and workloads of Azure virtual machines and other compute resources. It primarily collects data into Azure Storage but also allows you to define data sinks to also send data to other destinations such as Azure Monitor Metrics and Azure Event Hubs.
68
71
69
72
Use Azure diagnostic extension if you need to:
@@ -78,9 +81,8 @@ Limitations of Azure diagnostics extension include:
78
81
- Can only be used with Azure resources.
79
82
- Limited ability to send data to Azure Monitor Logs.
80
83
81
-
82
-
83
84
## Telegraf agent
85
+
84
86
The [InfluxData Telegraf agent](collect-custom-metrics-linux-telegraf.md) is used to collect performance data from Linux computers to Azure Monitor Metrics.
85
87
86
88
Use Telegraf agent if you need to:
@@ -90,24 +92,25 @@ Use Telegraf agent if you need to:
90
92
91
93
92
94
## Dependency agent
95
+
93
96
The Dependency agent collects discovered data about processes running on the virtual machine and external process dependencies.
94
97
95
98
Use the Dependency agent if you need to:
96
99
97
100
* Use the Map feature [Azure Monitor for VMs](../insights/vminsights-overview.md) or the [Service Map](../insights/service-map.md) solution.
98
101
99
-
100
102
Consider the following when using the Dependency agent:
101
103
102
104
- The Dependency agent requires the Log Analytics agent to be installed on the same virtual machine.
103
105
- On Linux VMs, the Log Analytics agent must be installed before the Azure Diagnostic Extension.
104
106
105
-
106
107
## Extensions compared to agents
108
+
107
109
The Log Analytics extension for [Windows](../../virtual-machines/extensions/oms-windows.md) and [Linux](../../virtual-machines/extensions/oms-linux.md) install the Log Analytics agent on Azure virtual machines. The Azure Monitor Dependency extension for [Windows](../../virtual-machines/extensions/agent-dependency-windows.md) and [Linux](../../virtual-machines/extensions/agent-dependency-linux.md) install the Dependency agent on Azure virtual machines. These are the same agents described above but allow you to manage them through [virtual machine extensions](../../virtual-machines/extensions/overview.md). You should use extensions to install and manage the agents whenever possible.
108
110
109
111
110
112
## Next steps
113
+
111
114
Get more details on each of the agents at the following:
112
115
113
116
-[Overview of the Log Analytics agent](log-analytics-agent.md)
Copy file name to clipboardExpand all lines: articles/azure-resource-manager/templates/deployment-script-template.md
+11-3Lines changed: 11 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -72,7 +72,7 @@ The benefits of deployment script:
72
72
73
73
-**Azure PowerShell version 3.0.0, 2.8.0 or 2.7.0** or **Azure CLI version 2.0.80, 2.0.79, 2.0.78 or 2.0.77**. You don't need these versions for deploying templates. But these versions are needed for testing deployment scripts locally. See [Install the Azure PowerShell module](/powershell/azure/install-az-ps). You can use a preconfigured Docker image. See [Configure development environment](#configure-development-environment).
74
74
75
-
## Sample template
75
+
## Sample templates
76
76
77
77
The following json is an example. The latest template schema can be found [here](/azure/templates/microsoft.resources/deploymentscripts).
78
78
@@ -125,6 +125,15 @@ Property value details:
125
125
-**cleanupPreference**. Specify the preference of cleaning up deployment resources when the script execution gets in a terminal state. Default setting is **Always**, which means deleting the resources despite the terminal state (Succeeded, Failed, Canceled). To learn more, see [Clean up deployment script resources](#clean-up-deployment-script-resources).
126
126
-**retentionInterval**: Specify the interval for which the service retains the deployment script resources after the deployment script execution reaches a terminal state. The deployment script resources will be deleted when this duration expires. Duration is based on the [ISO 8601 pattern](https://en.wikipedia.org/wiki/ISO_8601). The default value is **P1D**, which means seven days. This property is used when cleanupPreference is set to *OnExpiration*. The *OnExpiration* property is not enabled currently. To learn more, see [Clean up deployment script resources](#clean-up-deployment-script-resources).
127
127
128
+
### Additional samples
129
+
130
+
-[create and assign a certificate to a key vault](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/deployment-script/deploymentscript-keyvault.json)
131
+
132
+
-[create and assign a user-assigned managed identity to a resource group, and run a deployment script](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/deployment-script/deploymentscript-keyvault-mi.json).
133
+
134
+
> [!NOTE]
135
+
> It is recommended to create a user-assigned identity and grant permissions in advance. You might get sign-in and permission related errors if you create the identity and grant permissions in the same template where you run deployment scripts. It takes some time before the permissions to become effective.
136
+
128
137
## Use inline scripts
129
138
130
139
The following template has one resource defined with the `Microsoft.Resources/deploymentScripts` type.
@@ -134,7 +143,7 @@ The following template has one resource defined with the `Microsoft.Resources/de
134
143
> [!NOTE]
135
144
> Because the inline deployment scripts are enclosed in double quotes, the strings inside the deployment scripts need to be enclosed in single quotes instead. The escape character for PowerShell is **\**. You can also consider using string substitution as it is shown in the previous JSON sample. See the default value of the name parameter.
136
145
137
-
The script takes one parameter, and output the parameter value. **DeploymentScriptOutputs** is used for storing outputs. In the outputs section, the **value** line shows how to access the stored values. `Write-Output` is used for debugging purpose. To learn how to access the output file, see [Debug deployment scripts](#debug-deployment-scripts). For the property descriptions, see [Sample template](#sample-template).
146
+
The script takes one parameter, and output the parameter value. **DeploymentScriptOutputs** is used for storing outputs. In the outputs section, the **value** line shows how to access the stored values. `Write-Output` is used for debugging purpose. To learn how to access the output file, see [Debug deployment scripts](#debug-deployment-scripts). For the property descriptions, see [Sample templates](#sample-templates).
138
147
139
148
To run the script, select **Try it** to open Azure Cloud Shell, and then paste the following code into the shell pane.
140
149
@@ -213,7 +222,6 @@ Deployment script outputs must be saved in the AZ_SCRIPTS_OUTPUT_PATH location,
213
222
You can control how PowerShell responds to non-terminating errors by using the [**$ErrorActionPreference**](/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-7#erroractionpreference
214
223
) variable in your deployment script. The deployment script engine doesn't set/change the value. Despite the value you set for $ErrorActionPreference, deployment script sets the resource provisioning state to *Failed* when the script encounters an error.
215
224
216
-
217
225
## Debug deployment scripts
218
226
219
227
The script service creates a [storage account](../../storage/common/storage-account-overview.md) and a [container instance](../../container-instances/container-instances-overview.md) for script execution. Both resources have the **azscripts** suffix in the resource names.
Copy file name to clipboardExpand all lines: articles/backup/backup-azure-backup-exchange-server.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -32,8 +32,8 @@ Before you continue, make sure that all the [prerequisites](backup-azure-dpm-int
32
32
33
33
To install the DPM protection agent on the Exchange server, follow these steps:
34
34
35
-
1. Make sure that the firewalls are correctly configured. See [Configure firewall exceptions for the agent](https://docs.microsoft.com/previous-versions/system-center/system-center-2012-R2/hh758204(v=sc.12)).
36
-
2. Install the agent on the Exchange server by clicking **Management > Agents > Install** in DPM Administrator Console. See [Install the DPM protection agent](https://docs.microsoft.com/previous-versions/system-center/system-center-2012-R2/hh758186(v=sc.12)) for detailed steps.
35
+
1. Make sure that the firewalls are correctly configured. See [Configure firewall exceptions for the agent](https://docs.microsoft.com/system-center/dpm/configure-firewall-settings-for-dpm?view=sc-dpm-2019).
36
+
2. Install the agent on the Exchange server by clicking **Management > Agents > Install** in DPM Administrator Console. See [Install the DPM protection agent](https://docs.microsoft.com/system-center/dpm/deploy-dpm-protection-agent?view=sc-dpm-2019) for detailed steps.
37
37
38
38
## Create a protection group for the Exchange server
Copy file name to clipboardExpand all lines: articles/backup/backup-azure-exchange-mabs.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -17,8 +17,8 @@ Before you continue, make sure that Azure Backup Server is [installed and prepar
17
17
18
18
To install the MABS protection agent on the Exchange server, follow these steps:
19
19
20
-
1. Make sure that the firewalls are correctly configured. See [Configure firewall exceptions for the agent](https://docs.microsoft.com/previous-versions/system-center/system-center-2012-R2/hh758204(v=sc.12)).
21
-
2. Install the agent on the Exchange server by clicking **Management > Agents > Install** in MABS Administrator Console. See [Install the MABS protection agent](https://docs.microsoft.com/previous-versions/system-center/system-center-2012-R2/hh758186(v=sc.12)) for detailed steps.
20
+
1. Make sure that the firewalls are correctly configured. See [Configure firewall exceptions for the agent](hhttps://docs.microsoft.com/system-center/dpm/configure-firewall-settings-for-dpm?view=sc-dpm-2019).
21
+
2. Install the agent on the Exchange server by clicking **Management > Agents > Install** in MABS Administrator Console. See [Install the MABS protection agent](https://docs.microsoft.com/system-center/dpm/deploy-dpm-protection-agent?view=sc-dpm-2019) for detailed steps.
22
22
23
23
## Create a protection group for the Exchange server
0 commit comments