Skip to content

Commit a329aba

Browse files
authored
Merge pull request #277274 from alexbuckgit/alexbuckgit/docutune-autopr-20240605-130753-9041697-ignore-build
[BULK] - DocuTune - Minor formatting and syntax fixes (part 5)
2 parents 541260b + 2ce8f42 commit a329aba

File tree

4 files changed

+69
-71
lines changed

4 files changed

+69
-71
lines changed

articles/mysql/flexible-server/how-to-server-logs-cli.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ az mysql flexible-server server-logs list --resource-group <myresourcegroup> --s
4343

4444
Here are the details for the above command
4545

46-
LastModifiedTime | Name | ResourceGroup | SizeInKb | TypePropertiesType | Url
47-
---|---|---|---|---|---|
48-
2022-08-01T11:09:48+00:00 | mysql-slow-serverlogdemo-2022073111.log | myresourcegroup | 10947 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022073111.log?`
49-
2022-08-02T11:10:00+00:00 | mysql-slow-serverlogdemo-2022080111.log | myresourcegroup | 10927 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080111.log?`
50-
2022-08-03T11:10:12+00:00 | mysql-slow-serverlogdemo-2022080211.log | myresourcegroup | 10936 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080211.log?`
51-
2022-08-03T11:12:00+00:00 | mysql-slow-serverlogdemo-2022080311.log | myresourcegroup | 8920 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080311.log?`
52-
46+
| LastModifiedTime | Name | ResourceGroup | SizeInKb | TypePropertiesType | Url |
47+
|---|---|---|---|---|---|
48+
| 2022-08-01T11:09:48+00:00 | mysql-slow-serverlogdemo-2022073111.log | myresourcegroup | 10947 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022073111.log?` |
49+
| 2022-08-02T11:10:00+00:00 | mysql-slow-serverlogdemo-2022080111.log | myresourcegroup | 10927 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080111.log?` |
50+
| 2022-08-03T11:10:12+00:00 | mysql-slow-serverlogdemo-2022080211.log | myresourcegroup | 10936 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080211.log?` |
51+
| 2022-08-03T11:12:00+00:00 | mysql-slow-serverlogdemo-2022080311.log | myresourcegroup | 8920 | slowlog | `https://00000000000.file.core.windows.net/0000000serverlog/slowlogs/mysql-slow-serverlogdemo-2022080311.log?` |
5352

5453
Above list shows LastModifiedTime, Name, ResourceGroup, SizeInKb and Download Url of the Server Logs available.
5554
Default LastModifiedTime is set to 72 hours, for listing files older than 72 hours, use flag `--file-last-written <Time:HH>`

articles/service-bus-messaging/monitor-service-bus-reference.md

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Operational log entries include elements listed in the following table:
117117
| `Status` | Operation status | Yes | Yes|
118118
| `Caller` | Caller of operation (the Azure portal or management client) | Yes | Yes|
119119
| `Provider`|Name of Service emitting the logs e.g., ServiceBus | No | Yes|
120-
| `Type `| Type of logs emitted | No | Yes|
120+
| `Type`| Type of logs emitted | No | Yes|
121121
| `Category`| Log Category | Yes | No|
122122

123123
Here's an example of an operational log JSON string:
@@ -183,20 +183,20 @@ The following management operations are captured in operational logs:
183183
### Virtual network and IP filtering logs
184184
Service Bus virtual network (VNet) connection event JSON includes elements listed in the following table:
185185

186-
| Name | Description | Supported in Azure Diagnostics | Supported in AZMSVnetConnectionEvents (Resource specific table)
187-
| --- | ----------- |---| ---|
188-
| `SubscriptionId` | Azure subscription ID | Yes | Yes
189-
| `NamespaceName` | Namespace name | Yes | Yes
190-
| `IPAddress` | IP address of a client connecting to the Service Bus service | Yes | Yes
191-
| `AddressIP` | IP address of client connecting to service bus | Yes | Yes
192-
| `TimeGenerated [UTC]`|Time of executed operation (in UTC) | Yes | Yes
193-
| `Action` | Action done by the Service Bus service when evaluating connection requests. Supported actions are **Accept Connection** and **Deny Connection**. | Yes | Yes
194-
| `Reason` | Provides a reason why the action was done | Yes | Yes
195-
| `Count` | Number of occurrences for the given action | Yes | Yes
196-
| `ResourceId` | Azure Resource Manager resource ID. | Yes | Yes
197-
| `Category` | Log Category | Yes | No
198-
| `Provider`|Name of Service emitting the logs e.g., ServiceBus | No | Yes
199-
| `Type` | Type of Logs Emitted | No | Yes
186+
| Name | Description | Supported in Azure Diagnostics | Supported in AZMSVnetConnectionEvents (Resource specific table) |
187+
| --- | ----------- |---| ---|
188+
| `SubscriptionId` | Azure subscription ID | Yes | Yes |
189+
| `NamespaceName` | Namespace name | Yes | Yes |
190+
| `IPAddress` | IP address of a client connecting to the Service Bus service | Yes | Yes |
191+
| `AddressIP` | IP address of client connecting to service bus | Yes | Yes |
192+
| `TimeGenerated [UTC]`|Time of executed operation (in UTC) | Yes | Yes |
193+
| `Action` | Action done by the Service Bus service when evaluating connection requests. Supported actions are **Accept Connection** and **Deny Connection**. | Yes | Yes |
194+
| `Reason` | Provides a reason why the action was done | Yes | Yes |
195+
| `Count` | Number of occurrences for the given action | Yes | Yes |
196+
| `ResourceId` | Azure Resource Manager resource ID. | Yes | Yes |
197+
| `Category` | Log Category | Yes | No |
198+
| `Provider`|Name of Service emitting the logs e.g., ServiceBus | No | Yes |
199+
| `Type` | Type of Logs Emitted | No | Yes |
200200

201201
> [!NOTE]
202202
> Virtual network logs are generated only if the namespace allows access from selected networks or from specific IP addresses (IP filter rules).
@@ -239,24 +239,24 @@ Runtime audit logs capture aggregated diagnostic information for various data pl
239239
240240
Runtime audit logs include the elements listed in the following table:
241241

242-
Name | Description | Supported in Azure Diagnostics | Supported in AZMSRuntimeAuditLogs (Resource specific table)
243-
------- | -------| ---|---|
244-
`ActivityId` | A randomly generated UUID that ensures uniqueness for the audit activity. | Yes | Yes
245-
`ActivityName` | Runtime operation name. | Yes | Yes
246-
`ResourceId` | Resource associated with the activity. | Yes | Yes
247-
`Timestamp` | Aggregation time. | Yes | No
248-
`time Generated (UTC)` | Aggregated time | No | Yes
249-
`Status` | Status of the activity (success or failure).| Yes | Yes
250-
`Protocol` | Type of the protocol associated with the operation. | Yes | Yes
251-
`AuthType` | Type of authentication (Microsoft Entra ID or SAS Policy). | Yes | Yes
252-
`AuthKey` | Microsoft Entra application ID or SAS policy name that's used to authenticate to a resource. | Yes | Yes
253-
`NetworkType` | Type of the network access: `Public` or`Private`. | yes | Yes
254-
`ClientIP` | IP address of the client application. | Yes | Yes
255-
`Count` | Total number of operations performed during the aggregated period of 1 minute. | Yes | Yes
256-
`Properties` | Metadata that is specific to the data plane operation. | yes | Yes
257-
`Category` | Log category | Yes | No
258-
`Provider`|Name of Service emitting the logs e.g., ServiceBus | No | Yes
259-
`Type` | Type of Logs emitted | No | Yes
242+
| Name | Description | Supported in Azure Diagnostics | Supported in AZMSRuntimeAuditLogs (Resource specific table)|
243+
| ------- | -------| ---|---|
244+
| `ActivityId` | A randomly generated UUID that ensures uniqueness for the audit activity. | Yes | Yes|
245+
| `ActivityName` | Runtime operation name. | Yes | Yes|
246+
| `ResourceId` | Resource associated with the activity. | Yes | Yes|
247+
| `Timestamp` | Aggregation time. | Yes | No|
248+
| `time Generated (UTC)` | Aggregated time | No | Yes|
249+
| `Status` | Status of the activity (success or failure).| Yes | Yes|
250+
| `Protocol` | Type of the protocol associated with the operation. | Yes | Yes|
251+
| `AuthType` | Type of authentication (Microsoft Entra ID or SAS Policy). | Yes | Yes|
252+
| `AuthKey` | Microsoft Entra application ID or SAS policy name that's used to authenticate to a resource. | Yes | Yes|
253+
| `NetworkType` | Type of the network access: `Public` or`Private`. | yes | Yes|
254+
| `ClientIP` | IP address of the client application. | Yes | Yes|
255+
| `Count` | Total number of operations performed during the aggregated period of 1 minute. | Yes | Yes|
256+
| `Properties` | Metadata that is specific to the data plane operation. | yes | Yes|
257+
| `Category` | Log category | Yes | No|
258+
| `Provider` |Name of Service emitting the logs e.g., ServiceBus | No | Yes |
259+
| `Type` | Type of Logs emitted | No | Yes|
260260

261261
Here's an example of a runtime audit log entry:
262262

@@ -303,21 +303,21 @@ Diagnostic error logs capture error messages for any client side, throttling and
303303

304304
Diagnostic Error Logs include elements listed in below table:
305305

306-
Name | Description | Supported in Azure Diagnostics | Supported in AZMSDiagnosticErrorLogs (Resource specific table)
307-
---|---|---|---|
308-
`ActivityId` | A randomly generated UUID that ensures uniqueness for the audit activity. | Yes | Yes
309-
`ActivityName` | Operation name | Yes | Yes
310-
`NamespaceName` | Name of Namespace | Yes | yes
311-
`EntityType` | Type of Entity | Yes | Yes
312-
`EntityName` | Name of Entity | Yes | Yes
313-
`OperationResult` | Type of error in Operation (Clienterror or Serverbusy or quotaexceeded) | Yes | Yes
314-
`ErrorCount` | Count of identical errors during the aggregation period of 1 minute. | Yes | Yes
315-
`ErrorMessage` | Detailed Error Message | Yes | Yes
316-
`Provider` | Name of Service emitting the logs. Possible values: eventhub, relay, and servicebus | Yes | Yes
317-
`Time Generated (UTC)` | Operation time | No | Yes
318-
`EventTimestamp` | Operation Time | Yes | No
319-
`Category` | Log category | Yes | No
320-
`Type` | Type of Logs emitted | No | Yes
306+
| Name | Description | Supported in Azure Diagnostics | Supported in AZMSDiagnosticErrorLogs (Resource specific table) |
307+
| ---|---|---|---|
308+
| `ActivityId` | A randomly generated UUID that ensures uniqueness for the audit activity. | Yes | Yes |
309+
| `ActivityName` | Operation name | Yes | Yes |
310+
| `NamespaceName` | Name of Namespace | Yes | yes |
311+
| `EntityType` | Type of Entity | Yes | Yes |
312+
| `EntityName` | Name of Entity | Yes | Yes |
313+
| `OperationResult` | Type of error in Operation (Clienterror or Serverbusy or quotaexceeded) | Yes | Yes |
314+
| `ErrorCount` | Count of identical errors during the aggregation period of 1 minute. | Yes | Yes |
315+
| `ErrorMessage` | Detailed Error Message | Yes | Yes |
316+
| `Provider` | Name of Service emitting the logs. Possible values: eventhub, relay, and servicebus | Yes | Yes |
317+
| `Time Generated (UTC)` | Operation time | No | Yes |
318+
| `EventTimestamp` | Operation Time | Yes | No |
319+
| `Category` | Log category | Yes | No |
320+
| `Type` | Type of Logs emitted | No | Yes |
321321

322322
Here's an example of Diagnostic error log entry:
323323

articles/site-recovery/hyper-v-deployment-planner-overview.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ The tool provides the following details:
6767
6868
## Support matrix
6969

70-
|**Categories** | **VMware to Azure** |**Hyper-V to Azure**|**Azure to Azure**|**Hyper-V to secondary site**|**VMware to secondary site**
71-
--|--|--|--|--|--
72-
Supported scenarios |Yes|Yes|No|Yes*|No
73-
Supported Version | vCenter 6.7, 6.5, 6.0 or 5.5| Windows Server 2016, Windows Server 2012 R2 | NA |Windows Server 2016, Windows Server 2012 R2|NA
74-
Supported configuration|vCenter, ESXi| Hyper-V cluster, Hyper-V host|NA|Hyper-V cluster, Hyper-V host|NA|
75-
Number of servers that can be profiled per running instance of the Azure Site Recovery Deployment Planner |Single (VMs belonging to one vCenter Server or one ESXi server can be profiled at a time)|Multiple (VMs across multiple hosts or host clusters can be profile at a time)| NA |Multiple (VMs across multiple hosts or host clusters can be profile at a time)| NA
70+
|**Categories** | **VMware to Azure** |**Hyper-V to Azure**|**Azure to Azure**|**Hyper-V to secondary site**|**VMware to secondary site**|
71+
| --|--|--|--|--|--|
72+
| Supported scenarios |Yes|Yes|No|Yes*|No|
73+
| Supported Version | vCenter 6.7, 6.5, 6.0 or 5.5| Windows Server 2016, Windows Server 2012 R2 | NA |Windows Server 2016, Windows Server 2012 R2|NA|
74+
| Supported configuration|vCenter, ESXi| Hyper-V cluster, Hyper-V host|NA|Hyper-V cluster, Hyper-V host|NA|
75+
| Number of servers that can be profiled per running instance of the Azure Site Recovery Deployment Planner |Single (VMs belonging to one vCenter Server or one ESXi server can be profiled at a time)|Multiple (VMs across multiple hosts or host clusters can be profile at a time)| NA |Multiple (VMs across multiple hosts or host clusters can be profile at a time)| NA|
7676

7777
*The tool is primarily for the Hyper-V to Azure disaster recovery scenario. For Hyper-V to secondary site disaster recovery, it can be used only to understand source side recommendations like required network bandwidth, required free storage space on each of the source Hyper-V servers, and initial replication batching numbers and batch definitions. Ignore the Azure recommendations and costs from the report. Also, the Get Throughput operation is not applicable for the Hyper-V to secondary site disaster recovery scenario.
7878

@@ -81,10 +81,9 @@ The tool has three main phases for Hyper-V: get VM list, profiling, and report g
8181

8282
| Server requirement | Description |
8383
|---|---|
84-
|Get VM list, profiling, and throughput measurement |<ul><li>Operating system: Microsoft Windows Server 2016 or Microsoft Windows Server 2012 R2 </li><li>Machine configuration: 8 vCPUs, 16 GB RAM, 300 GB HDD</li><li>[Microsoft .NET Framework 4.5](https://aka.ms/dotnet-framework-45)</li><li>[Microsoft Visual C++ Redistributable for Visual Studio 2012](https://aka.ms/vcplusplus-redistributable)</li><li>Internet access to Azure (*.blob.core.windows.net) from this server, port 443<br>[This is optional. You can choose to provide the available bandwidth during Report Generation manually.]</li><li>Azure storage account</li><li>Administrator access on the server</li><li>Minimum 100 GB of free disk space (assuming 1000 VMs with an average of three disks each, profiled for 30 days)</li><li>The VM from where you are running the Azure Site Recovery deployment planner tool must be added to TrustedHosts list of all the Hyper-V servers.</li><li>All Hyper-V servers to be profiled must be added to TrustedHosts list of the client VM from where the tool is being run. [Learn more to add servers into TrustedHosts list](#steps-to-add-servers-into-trustedhosts-list). </li><li> The tool should be run from Administrative privileges from PowerShell or command-line console on the client</ul></ul>|
84+
|Get VM list, profiling, and throughput measurement |<ul><li>Operating system: Microsoft Windows Server 2016 or Microsoft Windows Server 2012 R2 </li><li>Machine configuration: 8 vCPUs, 16 GB RAM, 300 GB HDD</li><li>[Microsoft .NET Framework 4.5](https://aka.ms/dotnet-framework-45)</li><li>[Microsoft Visual C++ Redistributable for Visual Studio 2012](https://aka.ms/vcplusplus-redistributable)</li><li>Internet access to Azure (`*.blob.core.windows.net`) from this server, port 443<br>[This is optional. You can choose to provide the available bandwidth during Report Generation manually.]</li><li>Azure storage account</li><li>Administrator access on the server</li><li>Minimum 100 GB of free disk space (assuming 1000 VMs with an average of three disks each, profiled for 30 days)</li><li>The VM from where you are running the Azure Site Recovery deployment planner tool must be added to TrustedHosts list of all the Hyper-V servers.</li><li>All Hyper-V servers to be profiled must be added to TrustedHosts list of the client VM from where the tool is being run. [Learn more to add servers into TrustedHosts list](#steps-to-add-servers-into-trustedhosts-list). </li><li> The tool should be run from Administrative privileges from PowerShell or command-line console on the client</ul></ul>|
8585
| Report generation | A Windows PC or Windows Server with Microsoft Excel 2013 or later |
86-
| User permissions | Administrator account to access Hyper-V cluster/Hyper-V host during get VM list and profiling operations.<br>All the hosts that need to be profiled should have a domain administrator account with the same credentials i.e. user name and password
87-
|
86+
| User permissions | Administrator account to access Hyper-V cluster/Hyper-V host during get VM list and profiling operations.<br>All the hosts that need to be profiled should have a domain administrator account with the same credentials, that is, user name and password |
8887

8988
## Steps to add servers into TrustedHosts List
9089
1. The VM from where the tool is to be deployed should have all the hosts to be profiled in its TrustedHosts list. To add the client into Trustedhosts list run the following command from an elevated PowerShell on the VM. The VM can be a Windows Server 2012 R2 or Windows Server 2016.

0 commit comments

Comments
 (0)