Skip to content

Commit a9f6746

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-user-access-admin-description
2 parents ce65a28 + 48064c5 commit a9f6746

File tree

131 files changed

+2307
-2172
lines changed

Some content is hidden

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

131 files changed

+2307
-2172
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6279,6 +6279,26 @@
62796279
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-authorization-proxy.md",
62806280
"redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
62816281
"redirect_document_id": false
6282+
},
6283+
{
6284+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-hybrid-setup.md",
6285+
"redirect_url": "/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters",
6286+
"redirect_document_id": false
6287+
},
6288+
{
6289+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
6290+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6291+
"redirect_document_id": false
6292+
},
6293+
{
6294+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
6295+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6296+
"redirect_document_id": false
6297+
},
6298+
{
6299+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
6300+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6301+
"redirect_document_id": false
62826302
}
62836303
]
62846304
}

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-gcp.md

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ ms.service: active-directory
88
ms.subservice: ciem
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 06/16/2023
11+
ms.date: 08/09/2023
1212
ms.author: jfields
1313
---
1414

1515
# Onboard a Google Cloud Platform (GCP) project
1616

17-
This article describes how to onboard a Google Cloud Platform (GCP) project on Permissions Management.
17+
This article describes how to onboard a Google Cloud Platform (GCP) project in Microsoft Entra Permissions Management.
1818

1919
> [!NOTE]
2020
> A *global administrator* or *super admin* (an admin for all authorization system types) can perform the tasks in this article after the global administrator has initially completed the steps provided in [Enable Permissions Management on your Azure Active Directory tenant](onboard-enable-tenant.md).
2121
2222
## Explanation
2323

24-
For GCP, permissions management is scoped to a *GCP project*. A GCP project is a logical collection of your resources in GCP, like a subscription in Azure, albeit with further configurations you can perform such as application registrations and OIDC configurations.
24+
For GCP, Permissions Management is scoped to a *GCP project*. A GCP project is a logical collection of your resources in GCP, like a subscription in Azure, but with further configurations you can perform such as application registrations and OIDC configurations.
2525

2626
<!-- Diagram from Gargi-->
2727

28-
There are several moving parts across GCP and Azure, which are required to be configured before onboarding.
28+
There are several moving parts across GCP and Azure, which should be configured before onboarding.
2929

3030
* An Azure AD OIDC App
3131
* A Workload Identity in GCP
@@ -39,7 +39,7 @@ There are several moving parts across GCP and Azure, which are required to be co
3939

4040
- In the Permissions Management home page, select **Settings** (the gear icon), and then select the **Data Collectors** subtab.
4141

42-
1. On the **Data Collectors** tab, select **GCP**, and then select **Create Configuration**.
42+
1. On the **Data Collectors** tab, select **GCP**, then select **Create Configuration**.
4343

4444
### 1. Create an Azure AD OIDC app.
4545

@@ -50,7 +50,7 @@ There are several moving parts across GCP and Azure, which are required to be co
5050
1. To create the app registration, copy the script and run it in your command-line app.
5151

5252
> [!NOTE]
53-
> 1. To confirm that the app was created, open **App registrations** in Azure and, on the **All applications** tab, locate your app.
53+
> 1. To confirm the app was created, open **App registrations** in Azure and, on the **All applications** tab, locate your app.
5454
> 1. Select the app name to open the **Expose an API** page. The **Application ID URI** displayed in the **Overview** page is the *audience value* used while making an OIDC connection with your GCP account.
5555
> 1. Return to the Permissions Management window, and in the **Permissions Management Onboarding - Azure AD OIDC App Creation**, select **Next**.
5656
@@ -73,15 +73,15 @@ Choose from three options to manage GCP projects.
7373

7474
#### Option 1: Automatically manage
7575

76-
The automatically manage option allows projects to be automatically detected and monitored without extra configuration. Steps to detect list of projects and onboard for collection:
76+
The automatically manage option allows you to automatically detect and monitor projects without extra configuration. Steps to detect a list of projects and onboard for collection:
7777

78-
1. Firstly, grant **Viewer** and **Security Reviewer** role to service account created in previous step at organization, folder or project scope.
78+
1. Grant **Viewer** and **Security Reviewer** roles to a service account created in the previous step at a project, folder or organization level.
7979

80-
To enable controller mode 'On' for any projects, add following roles to the specific projects:
80+
To enable Controller mode **On** for any projects, add these roles to the specific projects:
8181
- Role Administrators
8282
- Security Admin
8383

84-
2. Once done, the steps are listed in the screen, which shows how to further configure in the GPC console, or programmatically with the gCloud CLI.
84+
The required commands to run in Google Cloud Shell are listed in the Manage Authorization screen for each scope of a project, folder or organization. This is also configured in the GPC console.
8585

8686
3. Select **Next**.
8787

@@ -93,34 +93,36 @@ You have the ability to specify only certain GCP member projects to manage and m
9393

9494
2. You can choose to download and run the script at this point, or you can do it via Google Cloud Shell.
9595

96-
To enable controller mode 'On' for any projects, add following roles to the specific projects:
96+
To enable controller mode 'On' for any projects, add these roles to the specific projects:
9797
- Role Administrators
9898
- Security Admin
9999

100100
3. Select **Next**.
101101

102102
#### Option 3: Select authorization systems
103103

104-
This option detects all projects that are accessible by the Cloud Infrastructure Entitlement Management application.
104+
This option detects all projects accessible by the Cloud Infrastructure Entitlement Management application.
105105

106-
1. Firstly, grant Viewer and Security Reviewer role to service account created in previous step at organization, folder or project scope
106+
1. Grant **Viewer** and **Security Reviewer** roles to a service account created in the previous step at a project, folder or organization level.
107+
108+
To enable Controller mode **On** for any projects, add these roles to the specific projects:
109+
- Role Administrators
110+
- Security Admin
111+
112+
The required commands to run in Google Cloud Shell are listed in the Manage Authorization screen for each scope of a project, folder or organization. This is also configured in the GPC console.
107113

108-
To enable controller mode 'On' for any projects, add following roles to the specific projects:
109-
- Role Administrators
110-
- Security Admin
111-
2. Once done, the steps are listed in the screen to do configure manually in the GPC console, or programmatically with the gCloud CLI
112114
3. Select **Next**.
113115

114116

115117
### 3. Review and save.
116118

117119
- In the **Permissions Management Onboarding – Summary** page, review the information you've added, and then select **Verify Now & Save**.
118120

119-
The following message appears: **Successfully Created Configuration.**
121+
The following message appears: **Successfully Created Configuration**.
120122

121123
On the **Data Collectors** tab, the **Recently Uploaded On** column displays **Collecting**. The **Recently Transformed On** column displays **Processing.**
122124

123-
You have now completed onboarding GCP, and Permissions Management has started collecting and processing your data.
125+
You've completed onboarding GCP, and Permissions Management has started collecting and processing your data.
124126

125127
### 4. View the data.
126128

articles/aks/cluster-configuration.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ A container runtime is software that executes containers and manages container i
2424

2525
With a `containerd`-based node and node pools, instead of talking to the `dockershim`, the kubelet talks directly to `containerd` using the CRI (container runtime interface) plugin, removing extra hops in the data flow when compared to the Docker CRI implementation. As such, you see better pod startup latency and less resource (CPU and memory) usage.
2626

27-
By using `containerd` for AKS nodes, pod startup latency improves and node resource consumption by the container runtime decreases. These improvements through this new architecture enable kubelet communicating directly to `containerd` through the CRI plugin. While in a Moby/docker architecture, kubelet communicates to the `dockershim` and docker engine before reaching `containerd`, therefore having extra hops in the data flow.
27+
By using `containerd` for AKS nodes, pod startup latency improves and node resource consumption by the container runtime decreases. These improvements through this new architecture enable kubelet communicating directly to `containerd` through the CRI plugin. While in a Moby/docker architecture, kubelet communicates to the `dockershim` and docker engine before reaching `containerd`, therefore having extra hops in the data flow. For more details on the origin of the `dockershim` and its deprecation, see the [Dockershim removal FAQ][kubernetes-dockershim-faq].
2828

2929
![Docker CRI 2](media/cluster-configuration/containerd-cri.png)
3030

@@ -515,6 +515,7 @@ az aks update -n aksTest -g aksTest –-nrg-lockdown-restriction-level Unrestric
515515
[azurerm-azurelinux]: https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster_node_pool#os_sku
516516
[general-usage]: https://kubernetes.io/docs/tasks/debug/debug-cluster/crictl/#general-usage
517517
[client-config-options]: https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/crictl.md#client-configuration-options
518+
[kubernetes-dockershim-faq]: https://kubernetes.io/blog/2022/02/17/dockershim-faq/#why-was-the-dockershim-removed-from-kubernetes
518519

519520
<!-- LINKS - internal -->
520521
[azure-cli-install]: /cli/azure/install-azure-cli
@@ -526,7 +527,7 @@ az aks update -n aksTest -g aksTest –-nrg-lockdown-restriction-level Unrestric
526527
[az-feature-register]: /cli/azure/feature#az_feature_register
527528
[az-feature-list]: /cli/azure/feature#az_feature_list
528529
[az-provider-register]: /cli/azure/provider#az_provider_register
529-
[aks-add-np-containerd]: /create-node-pools.md#add-a-windows-server-node-pool-with-containerd
530+
[aks-add-np-containerd]: create-node-pools.md#add-a-windows-server-node-pool-with-containerd
530531
[az-aks-create]: /cli/azure/aks#az-aks-create
531532
[az-aks-update]: /cli/azure/aks#az-aks-update
532533
[baseline-reference-architecture-aks]: /azure/architecture/reference-architectures/containers/aks/baseline-aks
-28.1 KB
Loading

articles/application-gateway/for-containers/how-to-ssl-offloading-ingress-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: greglin
77
ms.service: application-gateway
88
ms.subservice: appgw-for-containers
99
ms.topic: how-to
10-
ms.date: 07/24/2023
10+
ms.date: 08/09/2023
1111
ms.author: greglin
1212
---
1313

@@ -173,7 +173,7 @@ status:
173173
Now we're ready to send some traffic to our sample application, via the FQDN assigned to the frontend. Use the command below to get the FQDN.
174174
175175
```bash
176-
fqdn=$(kubectl get ingress ingress-01 -n test-infra -o jsonpath='{.status.loadBalancer.ingress[0].hostname}'')
176+
fqdn=$(kubectl get ingress ingress-01 -n test-infra -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
177177
```
178178

179179
Curling this FQDN should return responses from the backend as configured on the HTTPRoute.

0 commit comments

Comments
 (0)