Skip to content

Commit abb6d9b

Browse files
authored
Merge branch 'main' into shseth/amaclient
2 parents 671dbcb + ffa444c commit abb6d9b

File tree

62 files changed

+725
-177
lines changed

Some content is hidden

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

62 files changed

+725
-177
lines changed

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
---
22
title: Deploy an extension-based Windows or Linux User Hybrid Runbook Worker in Azure Automation (Preview)
3-
description: This article tells how to deploy an extension-based Windows or Linux Hybrid Runbook Worker that you can use to run runbooks on Windows-based machines in your local datacenter or cloud environment.
3+
description: This article provides information about deploying the extension-based User Hybrid Runbook Worker to run runbooks on Windows or Linux machines in your on-premises datacenter or other cloud environment.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 03/17/2021
6+
ms.date: 04/13/2022
77
ms.topic: how-to
88
#Customer intent: As a developer, I want to learn about extension so that I can efficiently deploy Hybrid Runbook Workers.
99
---
1010

11-
# Deploy an extension-based Windows or Linux User Hybrid Runbook Worker in Automation (Preview)
11+
# Deploy an extension-based Windows or Linux User Hybrid Runbook Worker in Azure Automation (Preview)
1212

13-
The extension-based onboarding is only for **User** Hybrid Runbook Workers. For **System** Hybrid Runbook Worker onboarding, see [Deploy an agent-based Windows Hybrid Runbook Worker in Automation](./automation-windows-hrw-install.md) or [Deploy an agent-based Linux Hybrid Runbook Worker in Automation](./automation-linux-hrw-install.md).
13+
The extension-based onboarding is only for **User** Hybrid Runbook Workers. This article describes how to: deploy a user Hybrid Runbook Worker on a Windows or Linux machine, remove the worker, and remove a Hybrid Runbook Worker group.
1414

15-
You can use the user Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on an Azure or non-Azure machine, including servers registered with [Azure Arc-enabled servers](../azure-arc/servers/overview.md). From the machine or server that's hosting the role, you can run runbooks directly against it and against resources in the environment to manage those local resources.
15+
For **System** Hybrid Runbook Worker onboarding, see [Deploy an agent-based Windows Hybrid Runbook Worker in Automation](./automation-windows-hrw-install.md) or [Deploy an agent-based Linux Hybrid Runbook Worker in Automation](./automation-linux-hrw-install.md).
1616

17-
Azure Automation stores and manages runbooks and then delivers them to one or more chosen machines. This article describes how to: deploy a user Hybrid Runbook Worker on a Windows or Linux machine, remove the worker, and remove a Hybrid Runbook Worker group.
17+
You can use the user Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on an Azure or non-Azure machine, including servers registered with [Azure Arc-enabled servers](../azure-arc/servers/overview.md). From the machine or server that's hosting the role, you can run runbooks directly against it and against resources in the environment to manage those local resources.
1818

19-
After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid Runbook Worker](automation-hrw-run-runbooks.md) to learn how to configure your runbooks to automate processes in your on-premises datacenter or other cloud environment.
19+
Azure Automation stores and manages runbooks and then delivers them to one or more chosen machines. After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid Runbook Worker](automation-hrw-run-runbooks.md) to learn how to configure your runbooks to automate processes in your on-premises datacenter or other cloud environment.
2020

2121

2222
> [!NOTE]

articles/azure-arc/kubernetes/overview.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ services: azure-arc
44
ms.service: azure-arc
55
author: shashankbarsin
66
ms.author: shasb
7-
ms.date: 11/23/2021
7+
ms.date: 04/13/2022
88
ms.topic: overview
99
description: "This article provides an overview of Azure Arc-enabled Kubernetes."
1010
keywords: "Kubernetes, Arc, Azure, containers"
1111
---
1212

1313
# What is Azure Arc-enabled Kubernetes?
1414

15-
With Azure Arc-enabled Kubernetes, you can attach and configure Kubernetes clusters running anywhere. You can connect your clusters running on other public cloud providers (GCP, AWS) or clusters running on your on-premise data center (on VMware vSphere, Azure Stack HCI) to Azure Arc. When you connect a Kubernetes cluster to Azure Arc, it will:
16-
* Get an Azure Resource Manager representation with a unique ID.
17-
* Be placed in an Azure subscription and resource group.
18-
* Receive tags just like any other Azure resource.
15+
Azure Arc-enabled Kubernetes allows you to attach and configure Kubernetes clusters running anywhere. You can connect your clusters running on other public cloud providers (such as GCP or AWS) or clusters running on your on-premise data center (such as VMware vSphere or Azure Stack HCI) to Azure Arc.
1916

20-
Azure Arc-enabled Kubernetes supports industry-standard SSL to secure data in transit. For the connected clusters, data at rest is stored encrypted in an Azure Cosmos DB database to ensure data confidentiality.
17+
When you connect a Kubernetes cluster to Azure Arc, it will:
18+
* Be represented in Azure Resource Manager by a unique ID
19+
* Be placed in an Azure subscription and resource group
20+
* Receive tags just like any other Azure resource
2121

22-
Azure Arc-enabled Kubernetes supports the following scenarios for the connected clusters:
22+
Azure Arc-enabled Kubernetes supports industry-standard SSL to secure data in transit. For the connected clusters, data at rest is stored encrypted in an Azure Cosmos DB database to ensure confidentiality.
23+
24+
Azure Arc-enabled Kubernetes supports the following scenarios for connected clusters:
2325

2426
* [Connect Kubernetes](quickstart-connect-cluster.md) running outside of Azure for inventory, grouping, and tagging.
2527

@@ -39,7 +41,7 @@ Azure Arc-enabled Kubernetes supports the following scenarios for the connected
3941

4042
* Deploy machine learning workloads using [Azure Machine Learning for Kubernetes clusters](../../machine-learning/how-to-attach-arc-kubernetes.md?toc=/azure/azure-arc/kubernetes/toc.json).
4143

42-
* Create [custom locations](./custom-locations.md) as target locations for deploying Azure Arc-enabled Data Services (SQL Managed Instances, PostgreSQL Hyperscale.), [App Services on Azure Arc](../../app-service/overview-arc-integration.md) (including web, function, and logic apps) and [Event Grid on Kubernetes](../../event-grid/kubernetes/overview.md).
44+
* Create [custom locations](./custom-locations.md) as target locations for deploying Azure Arc-enabled Data Services (SQL Managed Instances, PostgreSQL Hyperscale.), [App Services on Azure Arc](../../app-service/overview-arc-integration.md) (including web, function, and logic apps), and [Event Grid on Kubernetes](../../event-grid/kubernetes/overview.md).
4345

4446
[!INCLUDE [azure-lighthouse-supported-service](../../../includes/azure-lighthouse-supported-service.md)]
4547

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ The following tables show gap analyses for the **log types** that are currently
7070
| **Performance counters** | Yes | Yes |
7171
| **Windows Event Logs** | Yes | Yes |
7272
| **Filtering by event ID** | Yes | No |
73-
| **Custom logs** | No | Yes |
74-
| **IIS logs** | No | Yes |
73+
| **Text logs** | Yes | Yes |
74+
| **IIS logs** | Yes | Yes |
7575
| **Application and service logs** | Yes | Yes |
7676
| **Multi-homing** | Yes | Yes |
7777

@@ -81,7 +81,7 @@ The following tables show gap analyses for the **log types** that are currently
8181
|---------|---------|---------|
8282
| **Syslog** | Yes | Yes |
8383
| **Performance counters** | Yes | Yes |
84-
| **Custom logs** | No | Yes |
84+
| **Text logs** | Yes | Yes |
8585
| **Multi-homing** | Yes | No |
8686

8787

articles/azure-monitor/agents/azure-monitor-agent-overview.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: references_regions
1010

1111
# Azure Monitor agent overview
1212
The Azure Monitor agent (AMA) collects monitoring data from the guest operating system of Azure virtual machines and delivers it to Azure Monitor. This article provides an overview of the Azure Monitor agent and includes information on how to install it and how to configure data collection.
13-
Here's an **introductory video** explaining all about this new agent, including a quick demo of how to set things up using the Azure Portal: [ITOps Talk: Azure Monitor Agent](https://www.youtube.com/watch?v=f8bIrFU8tCs)
13+
Here's an **introductory video** explaining all about this new agent, including a quick demo of how to set things up using the Azure portal: [ITOps Talk: Azure Monitor Agent](https://www.youtube.com/watch?v=f8bIrFU8tCs)
1414

1515
## Relationship to other agents
1616
Eventually, the Azure Monitor agent will replace the following legacy monitoring agents that are currently used by Azure Monitor to collect guest data from virtual machines ([view known gaps](../faq.yml)):
@@ -30,10 +30,7 @@ In addition to consolidating this functionality into a single agent, the Azure M
3030
- **Improved extension management:** The Azure Monitor agent uses a new method of handling extensibility that's more transparent and controllable than management packs and Linux plug-ins in the current Log Analytics agents.
3131

3232
### Current limitations
33-
When compared with the legacy agents, this new agent doesn't yet have full parity.
34-
- **Comparison with Log Analytics agents (MMA/OMS):**
35-
- Not all Log Analytics solutions are supported yet. [View supported features and services](#supported-services-and-features).
36-
- The support for collecting file based logs or IIS logs is in [private preview](https://aka.ms/amadcr-privatepreviews).
33+
Not all Log Analytics solutions are supported yet. [View supported features and services](#supported-services-and-features).
3734

3835
### Changes in data collection
3936
The methods for defining data collection for the existing agents are distinctly different from each other. Each method has challenges that are addressed with the Azure Monitor agent.
@@ -84,6 +81,7 @@ The Azure Monitor agent sends data to Azure Monitor Metrics (preview) or a Log A
8481
| Performance | Azure Monitor Metrics (preview)<sup>1</sup> - Insights.virtualmachine namespace<br>Log Analytics workspace - [Perf](/azure/azure-monitor/reference/tables/perf) table | Numerical values measuring performance of different aspects of operating system and workloads |
8582
| Windows event logs | Log Analytics workspace - [Event](/azure/azure-monitor/reference/tables/Event) table | Information sent to the Windows event logging system |
8683
| Syslog | Log Analytics workspace - [Syslog](/azure/azure-monitor/reference/tables/syslog)<sup>2</sup> table | Information sent to the Linux event logging system |
84+
| Text logs | Log Analytics workspace - custom table | Events sent to log file on agent machine. |
8785

8886
<sup>1</sup> [Click here](../essentials/metrics-custom-overview.md#quotas-and-limits) to review other limitations of using Azure Monitor Metrics. On Linux, using Azure Monitor Metrics as the only destination is supported in v1.10.9.0 or higher.
8987
<sup>2</sup> Azure Monitor Linux Agent v1.15.2 or higher supports syslog RFC formats including **Cisco Meraki, Cisco ASA, Cisco FTD, Sophos XG, Juniper Networks, Corelight Zeek, CipherTrust, NXLog, McAfee and CEF (Common Event Format)**.
@@ -100,16 +98,16 @@ The following table shows the current support for the Azure Monitor agent with A
10098

10199
| Azure Monitor feature | Current support | More information |
102100
|:---|:---|:---|
103-
| File based logs and Windows IIS logs | Private preview | [Sign-up link](https://aka.ms/amadcr-privatepreviews) |
101+
| Text logs and Windows IIS logs | Public preview | [Collect text logs with Azure Monitor agent (preview)](data-collection-text-log.md) |
104102
| Windows Client OS installer | Private preview | [Sign-up link](https://aka.ms/amadcr-privatepreviews) |
105103
| [VM insights](../vm/vminsights-overview.md) | Private preview | [Sign-up link](https://aka.ms/amadcr-privatepreviews) |
106104

107105
The following table shows the current support for the Azure Monitor agent with Azure solutions.
108106

109107
| Solution | Current support | More information |
110108
|:---|:---|:---|
111-
| [Change Tracking](../../automation/change-tracking/overview.md) | Supported as File Integrity Monitoring in the Microsoft Defender for Cloud private preview. | [Sign-up link](https://aka.ms/AMAgent) |
112-
| [Update Management](../../automation/update-management/overview.md) | Use Update Management v2 (private preview) that doesn't require an agent. | [Sign-up link](https://www.yammer.com/azureadvisors/threads/1064001355087872) |
109+
| [Change Tracking](../../automation/change-tracking/overview.md) | Supported as File Integrity Monitoring in the Microsoft Defender for Cloud Private Preview. | [Sign-up link](https://aka.ms/AMAgent) |
110+
| [Update Management](../../automation/update-management/overview.md) | Use Update Management v2 (Private Preview) that doesn't require an agent. | [Sign-up link](https://www.yammer.com/azureadvisors/threads/1064001355087872) |
113111

114112
## Costs
115113
There's no cost for the Azure Monitor agent, but you might incur charges for the data ingested. For details on Log Analytics data collection and retention and for customer metrics, see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/).
@@ -119,7 +117,7 @@ There's no cost for the Azure Monitor agent, but you might incur charges for the
119117
The Azure Monitor agent doesn't require any keys but instead requires a [system-assigned managed identity](../../active-directory/managed-identities-azure-resources/qs-configure-portal-windows-vm.md#system-assigned-managed-identity). You must have a system-assigned managed identity enabled on each virtual machine before you deploy the agent.
120118

121119
## Networking
122-
The Azure Monitor agent supports Azure service tags (both AzureMonitor and AzureResourceManager tags are required). It supports connecting via **direct proxies, Log Analytics gateway, and private links** as described below.
120+
The Azure Monitor agent supports Azure service tags (both *AzureMonitor* and *AzureResourceManager* tags are required). It supports connecting via **direct proxies, Log Analytics gateway, and private links** as described below.
123121

124122
### Firewall requirements
125123
| Cloud |Endpoint |Purpose |Port |Direction |Bypass HTTPS inspection|
@@ -135,7 +133,7 @@ The Azure Monitor agent supports Azure service tags (both AzureMonitor and Azure
135133
| Azure China |`<log-analytics-workspace-id>`.ods.opinsights.azure.cn |Ingest logs data |Port 443 |Outbound|Yes |
136134

137135

138-
If using private links on the agent, you must also add the [dce endpoints](../essentials/data-collection-endpoint-overview.md#components-of-a-data-collection-endpoint)
136+
If using private links on the agent, you must also add the [DCE endpoints](../essentials/data-collection-endpoint-overview.md#components-of-a-data-collection-endpoint)
139137

140138
### Proxy configuration
141139
If the machine connects through a proxy server to communicate over the internet, review requirements below to understand the network configuration required.
@@ -149,7 +147,7 @@ The Azure Monitor agent extensions for Windows and Linux can communicate either
149147

150148
![Flowchart to determine the values of settings and protectedSettings parameters when you enable the extension.](media/azure-monitor-agent-overview/proxy-flowchart.png)
151149

152-
2. After the values for the *settings* and *protectedSettings* parameters are determined, **provide these additional parameters** when you deploy the Azure Monitor agent by using PowerShell commands. Refer the following examples.
150+
2. After the values for the *settings* and *protectedSettings* parameters are determined, **provide these additional parameters** when you deploy the Azure Monitor agent by using PowerShell commands. Refer to the following examples.
153151

154152
# [Windows VM](#tab/PowerShellWindows)
155153

@@ -188,11 +186,11 @@ New-AzConnectedMachineExtension -Name AzureMonitorLinuxAgent -ExtensionType Azur
188186

189187
### Log Analytics gateway configuration
190188
1. Follow the instructions above to configure proxy settings on the agent and provide the IP address and port number corresponding to the gateway server. If you have deployed multiple gateway servers behind a load balancer, the agent proxy configuration is the virtual IP address of the load balancer instead.
191-
2. Add the **configuration endpoint URL** to fetch data collection rules to the allow list for the gateway
189+
2. Add the **configuration endpoint URL** to fetch data collection rules to the allowlist for the gateway
192190
`Add-OMSGatewayAllowedHost -Host global.handler.control.monitor.azure.com`
193191
`Add-OMSGatewayAllowedHost -Host <gateway-server-region-name>.handler.control.monitor.azure.com`
194192
(If using private links on the agent, you must also add the [dce endpoints](../essentials/data-collection-endpoint-overview.md#components-of-a-data-collection-endpoint))
195-
3. Add the **data ingestion endpoint URL** to the allow list for the gateway
193+
3. Add the **data ingestion endpoint URL** to the allowlist for the gateway
196194
`Add-OMSGatewayAllowedHost -Host <log-analytics-workspace-id>.ods.opinsights.azure.com`
197195
3. Restart the **OMS Gateway** service to apply the changes
198196
`Stop-Service -Name <gateway-name>`

0 commit comments

Comments
 (0)