Skip to content

Commit acd6134

Browse files
committed
Merge branch 'master' into alexbuckgit/docutune-autopr-20210806T2052571745Z
1 parent e3aa1dd commit acd6134

12 files changed

+22
-26
lines changed

articles/automanage/faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ sections:
5151
Automanage enrolls, configures, and monitors throughout the lifecycle of the VM the services listed [here](automanage-virtual-machines.md).
5252
5353
- question: |
54-
Does Azure Automanage work with Azure Arcenabled VMs?
54+
Does Azure Automanage work with Azure Arc-enabled VMs?
5555
answer: |
56-
Automanage currently does not support Arcenabled VMs.
56+
Automanage currently does not support Arc-enabled VMs.
5757
5858
- question: |
5959
Can I customize configurations on Azure Automanage?

articles/azure-arc/data/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Azure Arc-enabled data services # < 60 chars
44
summary: Run Azure data services on-premises, at the edge, and in multi-cloud environments using Kubernetes on the infrastructure of your choice. # < 160 chars
55

66
metadata:
7-
title: Azure Arcenabled data services # Required; page title displayed in search results. Include the brand. < 60 chars.
7+
title: Azure Arc-enabled data services # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: Run Azure data services on-premises, at the edge, and in multi-cloud environments using Kubernetes on the infrastructure of your choice. # Required; article description that is displayed in search results. < 160 chars.
99
ms.service: azure-arc #Required; service per approved list. service slug assigned to your service by ACOM.
1010
ms.subservice: azure-arc-data # Optional; Remove if no subservice is used.

articles/azure-arc/data/troubleshoot-postgresql-hyperscale-server-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Implement the steps described in [033-manage-Postgres-with-AzureDataStudio.md](
8181

8282
:::image type="content" source="media/postgres-hyperscale/ads-controller-postgres-troubleshooting-notebook.jpg" alt-text="Azure Data Studio - Open PostgreSQL troubleshooting Notebook":::
8383

84-
The **TSG100 - The Azure Arcenabled PostgreSQL Hyperscale troubleshooter notebook** opens up:
84+
The **TSG100 - The Azure Arc-enabled PostgreSQL Hyperscale troubleshooter notebook** opens up:
8585
:::image type="content" source="media/postgres-hyperscale/ads-controller-postgres-troubleshooting-notebook2.jpg" alt-text="Azure Data Studio - Use PostgreSQL troubleshooting notebook":::
8686

8787
#### Run the scripts

articles/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This is the hyperscale form factor of the Postgres database engine available as
4141

4242
## Azure Arc-enabled PostgreSQL Hyperscale
4343

44-
:::image type="content" source="media/postgres-hyperscale/postgresql-hyperscale-arc.png" alt-text="Azure Arcenabled PostgreSQL Hyperscale":::
44+
:::image type="content" source="media/postgres-hyperscale/postgresql-hyperscale-arc.png" alt-text="Azure Arc-enabled PostgreSQL Hyperscale":::
4545

4646
This is the hyperscale form factor of the Postgres database engine that is available with Azure Arc-enabled data services. It is also powered by the Citus extension that enables the hyperscale experience. In this form factor, our customers provide the infrastructure that hosts the systems and operate them.
4747

articles/azure-arc/kubernetes/conceptual-inner-loop-gitops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ Suppose Alice wants to update, run, and debug the application either in local or
8686
8787
## Next steps
8888

89-
Learn more about creating connections between your cluster and a Git repository as a [configuration resource with Azure Arcenabled Kubernetes](./conceptual-configurations.md)
89+
Learn more about creating connections between your cluster and a Git repository as a [configuration resource with Azure Arc-enabled Kubernetes](./conceptual-configurations.md)

articles/azure-arc/kubernetes/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Arc-enabled Kubernetes
33
summary: Learn how to manage Kubernetes clusters with Azure Arc
44

55
metadata:
6-
title: Azure Arcenabled Kubernetes
6+
title: Azure Arc-enabled Kubernetes
77
description: Learn about how to manage on-premises machines in Azure
88
author: shashankbarsin
99
ms.service: azure-arc

articles/azure-arc/servers/agent-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The Azure Arc-enabled servers Connected Machine agent enables you to manage your
1515
1616
## Agent component details
1717

18-
:::image type="content" source="media/agent-overview/connected-machine-agent.png" alt-text="Azure Arcenabled servers agent overview." border="false":::
18+
:::image type="content" source="media/agent-overview/connected-machine-agent.png" alt-text="Azure Arc-enabled servers agent overview." border="false":::
1919

2020
The Azure Connected Machine agent package contains several logical components, which are bundled together.
2121

articles/azure-arc/servers/plan-at-scale-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Phase 3 sees administrators or system engineers enable automation of manual task
8080

8181
|Task |Detail |Duration |
8282
|-----|-------|---------|
83-
|Create a Resource Health alert |If a server stops sending heartbeats to Azure for longer than 15 minutes, it can mean that it is offline, the network connection has been blocked, or the agent is not running. Develop a plan for how you’ll respond and investigate these incidents and use [Resource Health alerts](../..//service-health/resource-health-alert-monitor-guide.md) to get notified when they start.<br><br> Specify the following when configuring the alert:<br> **Resource type** = **Azure Arcenabled servers**<br> **Current resource status** = **Unavailable**<br> **Previous resource status** = **Available** | One hour |
83+
|Create a Resource Health alert |If a server stops sending heartbeats to Azure for longer than 15 minutes, it can mean that it is offline, the network connection has been blocked, or the agent is not running. Develop a plan for how you’ll respond and investigate these incidents and use [Resource Health alerts](../..//service-health/resource-health-alert-monitor-guide.md) to get notified when they start.<br><br> Specify the following when configuring the alert:<br> **Resource type** = **Azure Arc-enabled servers**<br> **Current resource status** = **Unavailable**<br> **Previous resource status** = **Available** | One hour |
8484
|Create an Azure Advisor alert | For the best experience and most recent security and bug fixes, we recommend keeping the Azure Arc-enabled servers agent up to date. Out-of-date agents will be identified with an [Azure Advisor alert](../../advisor/advisor-alerts-portal.md).<br><br> Specify the following when configuring the alert:<br> **Recommendation type** = **Upgrade to the latest version of the Azure Connected Machine Agent** | One hour |
8585
|[Assign Azure policies](../../governance/policy/assign-policy-portal.md) to your subscription or resource group scope |Assign the **Enable Azure Monitor for VMs** [policy](../../azure-monitor/vm/vminsights-enable-policy.md) (and others that meet your needs) to the subscription or resource group scope. Azure Policy allows you to assign policy definitions that install the required agents for VM insights across your environment.| Varies |
8686
|[Enable Update Management for your Azure Arc-enabled servers](../../automation/update-management/enable-from-automation-account.md) |Configure Update Management in Azure Automation to manage operating system updates for your Windows and Linux virtual machines registered with Azure Arc-enabled servers. | 15 minutes |

articles/azure-monitor/containers/container-insights-optout-hybrid.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The configuration change can take a few minutes to complete. Because Helm tracks
8585
The script *disable-monitoring.ps1* uses the interactive device login. If you prefer non-interactive login, you can use an existing service principal or create a new one that has the required permissions as described in [Prerequisites](container-insights-enable-arc-enabled-clusters.md#prerequisites). To use service principal, you will have to pass $servicePrincipalClientId, $servicePrincipalClientSecret and $tenantId parameters with values of service principal you have intended to use to enable-monitoring.ps1 script.
8686
8787
```powershell
88-
$subscriptionId = "<subscription Id of the Azure Arcconnected cluster resource>"
88+
$subscriptionId = "<subscription Id of the Azure Arc-connected cluster resource>"
8989
$servicePrincipal = New-AzADServicePrincipal -Role Contributor -Scope "/subscriptions/$subscriptionId"
9090
9191
$servicePrincipalClientId = $servicePrincipal.ApplicationId.ToString()
@@ -138,7 +138,7 @@ For example:
138138
The bash script *disable-monitoring.sh* uses the interactive device login. If you prefer non-interactive login, you can use an existing service principal or create a new one that has the required permissions as described in [Prerequisites](container-insights-enable-arc-enabled-clusters.md#prerequisites). To use service principal, you will have to pass --client-id, --client-secret and --tenant-id values of service principal you have intended to use to *enable-monitoring.sh* bash script.
139139

140140
```bash
141-
subscriptionId="<subscription Id of the Azure Arcconnected cluster resource>"
141+
subscriptionId="<subscription Id of the Azure Arc-connected cluster resource>"
142142
servicePrincipal=$(az ad sp create-for-rbac --role="Contributor" --scopes="/subscriptions/${subscriptionId}")
143143
servicePrincipalClientId=$(echo $servicePrincipal | jq -r '.appId')
144144

articles/azure-monitor/vm/monitor-virtual-machine-analyze.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ After you've enabled VM insights on your virtual machines, data will be availabl
1818
> This article includes guidance on analyzing data that's collected by Azure Monitor and VM insights. For data that you configure to monitor workloads running on virtual machines, see [Monitor workloads](monitor-virtual-machine-workloads.md).
1919
2020
## Single machine experience
21-
Access the single machine analysis experience from the **Monitoring** section of the menu in the Azure portal for each Azure virtual machine and Azure Arcenabled server. These options either limit the data that you're viewing to that machine or at least set an initial filter for it. In this way, you can focus on a particular machine, view its current performance and its trending over time, and help to identify any issues it might be experiencing.
21+
Access the single machine analysis experience from the **Monitoring** section of the menu in the Azure portal for each Azure virtual machine and Azure Arc-enabled server. These options either limit the data that you're viewing to that machine or at least set an initial filter for it. In this way, you can focus on a particular machine, view its current performance and its trending over time, and help to identify any issues it might be experiencing.
2222

2323
:::image type="content" source="media/monitor-virtual-machines/vm-menu.png" alt-text="Screenshot that shows analyzing a VM in the Azure portal." lightbox="media/monitor-virtual-machines/vm-menu.png":::
2424

@@ -37,7 +37,7 @@ Access the single machine analysis experience from the **Monitoring** section of
3737
- **Workbooks**: Open the workbook gallery with the VM insights workbooks for single machines. For a list of the VM insights workbooks designed for individual machines, see [VM insights workbooks](vminsights-workbooks.md#vm-insights-workbooks).
3838

3939
## Multiple machine experience
40-
Access the multiple machine analysis experience from the **Monitor** menu in the Azure portal for each Azure virtual machine and Azure Arcenabled server. These options provide access to all data so that you can select the virtual machines that you're interested in comparing.
40+
Access the multiple machine analysis experience from the **Monitor** menu in the Azure portal for each Azure virtual machine and Azure Arc-enabled server. These options provide access to all data so that you can select the virtual machines that you're interested in comparing.
4141

4242
:::image type="content" source="media/monitor-virtual-machines/monitor-menu.png" alt-text="Screenshot that shows analyzing multiple VMs in the Azure portal." lightbox="media/monitor-virtual-machines/monitor-menu.png":::
4343

0 commit comments

Comments
 (0)