Skip to content

Commit d6d5ed0

Browse files
author
Sakthi Vetrivel
committed
merging commits
2 parents 6480db4 + 0a9e2cd commit d6d5ed0

File tree

2 files changed

+95
-50
lines changed

2 files changed

+95
-50
lines changed

articles/openshift/howto-azure-monitor-v4.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,39 @@ For Example:
5454

5555
## Configure agent data collection
5656

57-
By default, Monitoring Agent collects the {stdout; stderr} container logs of all the containers running in all the namespaces except kube-system. If you want to configure the container log collection specific to particular namespace(s), you can refer to https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-agent-config. Here, you can configure Monitoring agent with desired data collection settings using config map.
57+
By default, Monitoring Agent collects the {stdout; stderr} container logs of all the containers running in all the namespaces except kube-system. If you want to configure the container log collection specific to particular namespace or namespaces, you can refer to [Container Insights agent configuration](../azure-monitor/insights/container-insights-agent-config). Here, you can configure Monitoring agent with desired data collection settings using config map.
5858

5959
## Configure scraping of Prometheus metrics
6060

61-
Azure Monitor for containers scrapes the Prometheus metrics and ingest to the Azure Monitor backend. Refer to https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-prometheus-integration for the instructions how to configure Prometheus scraping.
61+
Azure Monitor for containers scrapes the Prometheus metrics and ingest to the Azure Monitor backend. Refer to [Container Insights Prometheus configuration](../azure-monitor/insights/container-insights-prometheus-integration) for the instructions how to configure Prometheus scraping.
6262

6363
After successful onboarding, navigate to https://aka.ms/azmon-containers-hybrid and select Environment as **"All"** to view your newly onboarded OpenShift v4 cluster.
6464

6565
## Disable monitoring
6666

67-
If you would like to disable monitoring, you can delete the Azure Monitor for Containers Helm chart using the below command to stop collecting and ingesting monitoring data to Azure Monitor for containers backend.
67+
If you would like to disable monitoring, you can delete the Azure Monitor for Containers Helm chart using the following command to stop collecting and ingesting monitoring data to Azure Monitor for containers backend.
6868

6969
``` bash
7070
helm del azmon-containers-release-1
7171
```
7272

7373
## Update monitoring
7474

75-
Rerun the onboarding script as in Onboarding section with the same parameter to get updated to latest Helm chart.
75+
Rerun the onboarding script as described in the [Onboarding](#onboarding) section with the same parameter to get updated to latest Helm chart.
7676

7777
## After successful onboarding
7878

79-
Navigate to https://aka.ms/azmon-containers-hybrid and you should be able to see your newly enabled OpenShift/ARO v4 cluster with Health status in the Monitored Clusters Tab and you can get into deeper insights such as metrics, inventory, and logs etc. by clicking the Cluster column.
79+
Navigate to [Hybrid Monitoring](https://aka.ms/azmon-containers-hybrid) and you should be able to see your newly enabled OpenShift/ARO v4 cluster with health status in the **Monitored Clusters** tab and you can get into deeper insights such as metrics, inventory, and logs and more by clicking the **Cluster** column.
8080

8181
## Supported features
8282

83-
For more information, see https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview for more details on the supported features and functionality.
83+
For more information, see [Container Insights overview](../azure-monitor/insights/container-insights-overview) for more details on the supported features and functionality.
8484

8585
Contact us via [email protected] the feedback and questions.
8686

87-
## References
87+
## Next steps
8888

89-
https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview
89+
To learn more about monitoring, see:
90+
../azure/azure-monitor/insights/container-insights-overview
9091

91-
https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview
92+
../azure/azure-monitor/log-query/log-query-overview

articles/openshift/howto-using-aro.md renamed to articles/openshift/howto-using-azure-redhat-openshift.md

Lines changed: 85 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ keywords: aro, openshift, az aro, red hat, cli
1010
#Customer intent: As a customer, I want to create an ARO custer using the command line.
1111
---
1212

13-
# Create an Azure Red Hat OpenShift 4.3 Cluster
13+
# Create, access, and manage an Azure Red Hat OpenShift 4.3 Cluster
1414

1515
> [!IMPORTANT]
1616
> Azure Red Hat OpenShift (ARO) 4.3 is offered in preview. Preview features are self-service and are provided as is and as available and are excluded from the service-level agreement (SLA) and limited warranty. Therefore, the features aren't meant for production use.
@@ -29,57 +29,101 @@ You'll need the following to create an Azure Red Hat OpenShift 4.3 cluster:
2929

3030
- The RP service principal and cluster service principal must each have the Contributor role on the cluster virtual network. If you have the "User Access Administrator" role on the virtual network, `az aro create` will set up the role assignments for you automatically.
3131

32-
## Installing the 'az aro' extension
33-
The `az aro` extension allows you to create, access, and delete Azure Red Hat OpenShift (ARO) clusters directly from the command line using the Azure CLI. The `az aro` extension can be used with a subscription registered with the preview Azure Red Hat OpenShift 4.3 service.
32+
### Install the 'az aro' extension
33+
The `az aro` extension allows you to create, access, and delete Azure Red Hat OpenShift clusters directly from the command line using the Azure CLI.
3434

35-
1. Log in to Azure.
36-
37-
```bash
38-
az login
39-
```
40-
41-
2. Run the following command to install the `az aro` extension.
35+
> [!Note]
36+
> The `az aro` extension is currenty in preview. It may be changed or removed in a future release.
37+
> To opt-in for the `az aro` extension preview you need to register the `Microsoft.RedHatOpenShift` resource provider.
38+
>
39+
> ```
40+
> az provider register -n Microsoft.RedHatOpenShift --wait
41+
> ```
4242
43-
```bash
44-
az extension add --source https://arosvc.blob.core.windows.net/az-preview/aro-0.1.0-py2.py3-none-any.whl
45-
```
46-
47-
3. Add the ARO extension path to your `az` configuration.
43+
1. Log in to Azure.
4844
49-
```bash
50-
cat >>~/.azure/config <<EOF
51-
[extension]
52-
dev_sources = $PWD/python
53-
EOF
54-
```
45+
```
46+
az login
47+
```
5548
56-
4. Verify the ARO extension is registered.
49+
2. Run the following command to install the `az aro` extension:
5750
58-
```console
59-
az -v
51+
```
52+
az extension add --source https://arosvc.blob.core.windows.net/az-preview/aro-0.1.0-py2.py3-none-any.whl
53+
```
6054
61-
Extensions:
62-
aro 0.1.0 (dev) /path/to/rp/python/az/aro
63-
Development extension sources:
64-
/path/to/rp/python
65-
```
55+
3. Verify the ARO extension is registered.
6656
67-
5. To opt into the preview of Azure Red Hat OpenShift v4, register the
68-
`Microsoft.RedHatOpenShift` resource provider.
57+
```
58+
az -v
59+
...
60+
Extensions:
61+
aro 0.1.0
62+
...
63+
```
64+
65+
### Create a virtual network containing two empty subnets
66+
67+
Follow these steps to create a virtual network containing two empty subnets.
68+
69+
1. Set the following variables.
70+
71+
```
72+
LOCATION=eastus #the location of your cluster
73+
RESOURCEGROUP="v4-$LOCATION" #the name of the resource group where you want to create your cluster
74+
CLUSTER=cluster #the name of your cluster
75+
```
76+
77+
2. Create a resource group for your cluster.
78+
79+
```
80+
az group create -g "$RESOURCEGROUP" -l $LOCATION
81+
```
82+
83+
3. Create the virtual network.
84+
85+
```
86+
az network vnet create \
87+
-g "$RESOURCEGROUP" \
88+
-n vnet \
89+
--address-prefixes 10.0.0.0/9 \
90+
>/dev/null
91+
```
92+
93+
4. Add two empty subnets to your virtual network.
94+
95+
```
96+
for subnet in "$CLUSTER-master" "$CLUSTER-worker"; do
97+
az network vnet subnet create \
98+
-g "$RESOURCEGROUP" \
99+
--vnet-name vnet \
100+
-n "$subnet" \
101+
--address-prefixes 10.$((RANDOM & 127)).$((RANDOM & 255)).0/24 \
102+
--service-endpoints Microsoft.ContainerRegistry \
103+
>/dev/null
104+
done
105+
```
106+
107+
5. Disable network policies for Private Link Service on your virtual network and subnets. This is a requirement for the ARO service to access and manage the cluster.
108+
109+
```
110+
az network vnet subnet update \
111+
-g "$RESOURCEGROUP" \
112+
--vnet-name vnet \
113+
-n "$CLUSTER-master" \
114+
--disable-private-link-service-network-policies true \
115+
>/dev/null
116+
```
69117
70-
```console
71-
az provider register -n Microsoft.RedHatOpenShift --wait
72-
```
73-
74118
## Create a cluster
75119
76-
With your extension installed, run the following command to create a cluster.
120+
Run the following command to create a cluster.
77121
78-
```console
122+
```
79123
az aro create \
80124
-g "$RESOURCEGROUP" \
81125
-n "$CLUSTER" \
82-
--vnet dev-vnet \
126+
--vnet vnet \
83127
--master-subnet "$CLUSTER-master" \
84128
--worker-subnet "$CLUSTER-worker"
85129
```
@@ -97,7 +141,7 @@ az aro list -o table
97141

98142
You can log into the cluster using the `kubeadmin` user. Run the following command to find the password for the `kubeadmin` user:
99143

100-
``` console
144+
```dotnetcli
101145
az aro list-credentials -g "$RESOURCEGROUP" -n "$CLUSTER"
102146
```
103147

@@ -110,6 +154,6 @@ az aro delete -g "$RESOURCEGROUP" -n "$CLUSTER"
110154

111155
# (optional)
112156
for subnet in "$CLUSTER-master" "$CLUSTER-worker"; do
113-
az network vnet subnet delete -g "$RESOURCEGROUP" --vnet-name dev-vnet -n "$subnet"
157+
az network vnet subnet delete -g "$RESOURCEGROUP" --vnet-name vnet -n "$subnet"
114158
done
115-
```
159+
```

0 commit comments

Comments
 (0)