Skip to content

Commit 27ebced

Browse files
kainawrothkainawroth
committed
Moving forward with table based on feedback
1 parent 07e3986 commit 27ebced

File tree

1 file changed

+37
-60
lines changed

1 file changed

+37
-60
lines changed

‎articles/azure-monitor/agents/diagnostics-extension-overview.md

Lines changed: 37 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ The following tables list the data that can be collected by the Windows and Linu
4848

4949
### Windows diagnostics extension (WAD)
5050

51-
| Data source | Description |
52-
| --- | --- |
53-
| Windows event logs | Events from Windows event log. |
54-
| Performance counters | Numerical values measuring performance of different aspects of operating system and workloads. |
55-
| IIS logs | Usage information for IIS websites running on the guest operating system. |
56-
| Application logs | Trace messages written by your application. |
57-
| .NET EventSource logs |Code writing events using the .NET [EventSource](/dotnet/api/system.diagnostics.tracing.eventsource) class. |
58-
| [Manifest-based ETW logs](/windows/desktop/etw/about-event-tracing) |Event tracing for Windows events generated by any process. |
59-
| Crash dumps (logs) | Information about the state of the process if an application crashes. |
60-
| File-based logs | Logs created by your application or service. |
61-
| Agent diagnostic logs | Information about Azure Diagnostics itself. |
51+
| Data source | Description |
52+
|---------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------|
53+
| Windows event logs | Events from Windows event log. |
54+
| Performance counters | Numerical values measuring performance of different aspects of operating system and workloads. |
55+
| IIS logs | Usage information for IIS websites running on the guest operating system. |
56+
| Application logs | Trace messages written by your application. |
57+
| .NET EventSource logs | Code writing events using the .NET [EventSource](/dotnet/api/system.diagnostics.tracing.eventsource) class. |
58+
| [Manifest-based ETW logs](/windows/desktop/etw/about-event-tracing) | Event tracing for Windows events generated by any process. |
59+
| Crash dumps (logs) | Information about the state of the process if an application crashes. |
60+
| File-based logs | Logs created by your application or service. |
61+
| Agent diagnostic logs | Information about Azure Diagnostics itself. |
6262

6363
### Linux diagnostics extension (LAD)
6464

65-
| Data source | Description |
66-
| --- | --- |
67-
| Syslog | Events sent to the Linux event logging system |
68-
| Performance counters | Numerical values measuring performance of different aspects of operating system and workloads |
69-
| Log files | Entries sent to a file-based log |
65+
| Data source | Description |
66+
|----------------------|-----------------------------------------------------------------------------------------------|
67+
| Syslog | Events sent to the Linux event logging system |
68+
| Performance counters | Numerical values measuring performance of different aspects of operating system and workloads |
69+
| Log files | Entries sent to a file-based log |
7070

7171
## Data destinations
7272

@@ -76,24 +76,24 @@ Configure one or more *data sinks* to send data to other destinations. The follo
7676

7777
### Windows diagnostics extension (WAD)
7878

79-
| Destination | Description |
80-
|:---|:---|
81-
| Azure Monitor Metrics | Collect performance data to Azure Monitor Metrics. See [Send Guest OS metrics to the Azure Monitor metric database](../essentials/collect-custom-metrics-guestos-resource-manager-vm.md). |
82-
| Event hubs | Use Azure Event Hubs to send data outside of Azure. See [Streaming Azure Diagnostics data to Azure Event Hubs](diagnostics-extension-stream-event-hubs.md). |
83-
| Azure Storage blobs | Write data to blobs in Azure Storage in addition to tables. |
84-
| Application Insights | Collect data from applications running in your VM to Application Insights to integrate with other application monitoring. See [Send diagnostic data to Application Insights](diagnostics-extension-to-application-insights.md). |
79+
| Destination | Description |
80+
|:----------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
81+
| Azure Monitor Metrics | Collect performance data to Azure Monitor Metrics. See [Send Guest OS metrics to the Azure Monitor metric database](../essentials/collect-custom-metrics-guestos-resource-manager-vm.md). |
82+
| Event hubs | Use Azure Event Hubs to send data outside of Azure. See [Streaming Azure Diagnostics data to Azure Event Hubs](diagnostics-extension-stream-event-hubs.md). |
83+
| Azure Storage blobs | Write data to blobs in Azure Storage in addition to tables. |
84+
| Application Insights | Collect data from applications running in your VM to Application Insights to integrate with other application monitoring. See [Send diagnostic data to Application Insights](diagnostics-extension-to-application-insights.md). |
8585

8686
You can also collect WAD data from storage into a Log Analytics workspace to analyze it with Azure Monitor Logs, although the Log Analytics agent is typically used for this functionality. It can send data directly to a Log Analytics workspace and supports solutions and insights that provide more functionality. See [Collect Azure diagnostic logs from Azure Storage](diagnostics-extension-logs.md).
8787

8888
### Linux diagnostics extension (LAD)
8989

9090
LAD writes data to tables in Azure Storage. It supports the sinks in the following table.
9191

92-
| Destination | Description |
93-
|:---|:---|
94-
| Event hubs | Use Azure Event Hubs to send data outside of Azure. |
95-
| Azure Storage blobs | Write data to blobs in Azure Storage in addition to tables. |
96-
| Azure Monitor Metrics | Install the Telegraf agent in addition to LAD. See [Collect custom metrics for a Linux VM with the InfluxData Telegraf agent](../essentials/collect-custom-metrics-linux-telegraf.md).
92+
| Destination | Description |
93+
|:----------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
94+
| Event hubs | Use Azure Event Hubs to send data outside of Azure. |
95+
| Azure Storage blobs | Write data to blobs in Azure Storage in addition to tables. |
96+
| Azure Monitor Metrics | Install the Telegraf agent in addition to LAD. See [Collect custom metrics for a Linux VM with the InfluxData Telegraf agent](../essentials/collect-custom-metrics-linux-telegraf.md). |
9797

9898
## Installation and configuration
9999

@@ -103,35 +103,14 @@ You can also install and configure both the Windows and Linux diagnostics extens
103103

104104
See the following articles for information on installing and configuring the diagnostics extension for Windows and Linux:
105105

106-
- [Install and configure Azure Diagnostics extension for Windows](diagnostics-extension-windows-install.md)
107-
- [Use Linux diagnostics extension to monitor metrics and logs](../../virtual-machines/extensions/diagnostics-linux.md)
106+
* [Install and configure Azure Diagnostics extension for Windows](diagnostics-extension-windows-install.md)
107+
* [Use Linux diagnostics extension to monitor metrics and logs](../../virtual-machines/extensions/diagnostics-linux.md)
108108

109109
## Supported operating systems
110110

111111
The following tables list the operating systems that are supported by WAD and LAD. See the documentation for each agent for unique considerations and for the installation process. See Telegraf documentation for its supported operating systems. All operating systems are assumed to be x64. x86 is not supported for any operating system.
112112

113-
### Option 1
114-
115-
#### Windows
116-
117-
* Windows Server 2019
118-
* Windows Server 2016, 2016 Core
119-
* Windows Server 2012 R2, 2012
120-
* Windows 10 Enterprise (including multi-session) and Pro (Server scenarios only)
121-
122-
#### Linux
123-
124-
* CentOS Linux 7, 6.5+
125-
* Debian 9, 7
126-
* OpenSUSE 13.1+
127-
* Oracle Linux 7, 6.4+
128-
* Red Hat Enterprise Linux Server 7, 6.7+
129-
* SUSE Linux Enterprise Server 12 SP5, 12
130-
* Ubuntu 20.04 LTS, 18.04 LTS, 16.04 LTS, 14.04 LTS
131-
132-
### Option 2
133-
134-
#### Windows
113+
### Windows
135114

136115
| Operating system | Support |
137116
|:--------------------------------------------------------------------------------------------|:-------:|
@@ -151,9 +130,9 @@ The following tables list the operating systems that are supported by WAD and LA
151130
| Windows 10 1803 (RS4) and higher | ❌ |
152131
| Windows 10 Enterprise (including multi-session) and Pro (Server scenarios only<sup>1</sup>) | ✅ |
153132

154-
<sup>1</sup> Running the OS on server hardware, for example, machines that are always connected, always turned on, and not running other workloads (PC, office, browser)<br>
133+
<sup>1</sup> Running the OS on server hardware, for example, machines that are always connected, always turned on, and not running other workloads.
155134

156-
#### Linux
135+
### Linux
157136

158137
| Operating system | Support |
159138
|:------------------------------------------------------|:-------:|
@@ -188,20 +167,18 @@ The following tables list the operating systems that are supported by WAD and LA
188167
| Ubuntu 16.04 LTS | ✅ |
189168
| Ubuntu 14.04 LTS | ✅ |
190169

191-
<sup>1</sup> Requires Python (2 or 3) to be installed on the machine.<br>
192-
193-
-->
170+
<sup>1</sup> Requires Python (2 or 3) to be installed on the machine.
194171

195172
## Other documentation
196173

197174
See the following articles for more information.
198175

199176
### Azure Cloud Services (classic) web and worker roles
200177

201-
- [Introduction to Azure Cloud Services monitoring](../../cloud-services/cloud-services-how-to-monitor.md)
202-
- [Enabling Azure Diagnostics in Azure Cloud Services](../../cloud-services/cloud-services-dotnet-diagnostics.md)
203-
- [Application Insights for Azure Cloud Services](../app/azure-web-apps-net-core.md)<br>
204-
- [Trace the flow of an Azure Cloud Services application with Azure Diagnostics](../../cloud-services/cloud-services-dotnet-diagnostics-trace-flow.md)
178+
* [Introduction to Azure Cloud Services monitoring](../../cloud-services/cloud-services-how-to-monitor.md)
179+
* [Enabling Azure Diagnostics in Azure Cloud Services](../../cloud-services/cloud-services-dotnet-diagnostics.md)
180+
* [Application Insights for Azure Cloud Services](../app/azure-web-apps-net-core.md)
181+
* [Trace the flow of an Azure Cloud Services application with Azure Diagnostics](../../cloud-services/cloud-services-dotnet-diagnostics-trace-flow.md)
205182

206183
### Azure Service Fabric
207184

0 commit comments

Comments
 (0)