Skip to content

Commit c5132fa

Browse files
committed
2 parents 662404d + b95eb31 commit c5132fa

24 files changed

+838
-190
lines changed

articles/active-directory/governance/entitlement-management-access-package-first.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ In this tutorial, you learn how to:
4242
> * Demonstrate how an internal user can request the access package
4343
> * Approve the access request
4444
45-
If you don't have an Azure AD Premium P2 or Enterprise Mobility + Security E5 license, create a free [Enterprise Mobility + Security E5 trial](https://signup.microsoft.com/Signup?OfferId=87dd2714-d452-48a0-a809-d2f58c4f68b7&ali=1).
45+
For a step-by-step demonstration of the process of deploying Azure Active Directory entitlement management, including creating your first access package, view the following video:
46+
47+
>[!VIDEO https://www.youtube.com/embed/zaaKvaaYwI4]
4648
4749
## Prerequisites
4850

@@ -51,6 +53,8 @@ To use Azure AD entitlement management (Preview), you must have one of the follo
5153
- Azure AD Premium P2
5254
- Enterprise Mobility + Security (EMS) E5 license
5355

56+
If you don't have an Azure AD Premium P2 or Enterprise Mobility + Security E5 license, create a free [Enterprise Mobility + Security E5 trial](https://signup.microsoft.com/Signup?OfferId=87dd2714-d452-48a0-a809-d2f58c4f68b7&ali=1).
57+
5458
## Step 1: Set up users and group
5559

5660
A resource directory has one or more resources to share. In this step, you create a group named **Engineering Group** in the Woodgrove Bank directory that is the target resource for entitlement management. You also set up an internal requestor.

articles/active-directory/governance/entitlement-management-overview.md

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Employees in organizations need access to various groups, applications, and site
3232

3333
Azure Active Directory (Azure AD) entitlement management can help you manage access to groups, applications, and SharePoint Online sites for internal users and also users outside your organization.
3434

35+
This video provides an overview of entitlement management and its business value:
36+
37+
>[!VIDEO https://www.youtube.com/embed/_Lss6bFrnQ8]
38+
3539
## Why use entitlement management?
3640

3741
Enterprise organizations often face challenges when managing access to resources such as:

articles/active-directory/governance/entitlement-management-reports.md

+7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,20 @@ ms.collection: M365-identity-device-management
2121
#Customer intent: As an administrator, I want view resources a user has access to and view request logs for auditing purposes.
2222

2323
---
24+
2425
# View reports and logs in Azure AD entitlement management (Preview)
2526

2627
> [!IMPORTANT]
2728
> Azure Active Directory (Azure AD) entitlement management is currently in public preview.
2829
> This preview version is provided without a service level agreement, and it's not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
2930
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
3031
32+
The user assignments report and Azure Active Directory audit log provide additional details about the users in your directory. As an administrator, you can view resources a user has access to and view request logs for auditing purposes or to determine the status of a user’s request. This article describes how to use the user assignments report and Azure AD audit logs.
33+
34+
Watch the following video to learn how to use entitlement management to manage access for users in Azure Active Directory:
35+
36+
>[!VIDEO https://www.youtube.com/embed/omtNJ7ySjS0]
37+
3138
## View resources a user has access to
3239

3340
1. Click **Azure Active Directory** and then click **Identity Governance**.

articles/aks/availability-zones.md

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ az group create --name myResourceGroup --location eastus2
120120
az aks create \
121121
--resource-group myResourceGroup \
122122
--name myAKSCluster \
123-
--kubernetes-version 1.13.5 \
124123
--generate-ssh-keys \
125124
--enable-vmss \
126125
--load-balancer-sku standard \

articles/aks/load-balancer-standard.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ az aks create \
134134
--name myAKSCluster \
135135
--enable-vmss \
136136
--node-count 1 \
137-
--kubernetes-version 1.14.0 \
138137
--load-balancer-sku standard \
139138
--generate-ssh-keys
140139
```
@@ -165,7 +164,7 @@ The following example output shows the single node created in the previous steps
165164

166165
```
167166
NAME STATUS ROLES AGE VERSION
168-
aks-nodepool1-31718369-0 Ready agent 6m44s v1.14.0
167+
aks-nodepool1-31718369-0 Ready agent 6m44s v1.13.9
169168
```
170169

171170
## Verify your cluster uses the *Standard* SKU

articles/aks/operator-best-practices-cluster-security.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ az aks get-upgrades --resource-group myResourceGroup --name myAKSCluster
184184
You can then upgrade your AKS cluster using the [az aks upgrade][az-aks-upgrade] command. The upgrade process safely cordons and drains one node at a time, schedules pods on remaining nodes, and then deploys a new node running the latest OS and Kubernetes versions.
185185

186186
```azurecli-interactive
187-
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.11.8
187+
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version KUBERNETES_VERSION
188188
```
189189

190190
For more information about upgrades in AKS, see [Supported Kubernetes versions in AKS][aks-supported-versions] and [Upgrade an AKS cluster][aks-upgrade].

articles/aks/tutorial-kubernetes-deploy-application.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ kubectl get service azure-vote-front --watch
100100
Initially the *EXTERNAL-IP* for the *azure-vote-front* service is shown as *pending*:
101101

102102
```
103-
azure-vote-front 10.0.34.242 <pending> 80:30676/TCP 7s
103+
azure-vote-front LoadBalancer 10.0.34.242 <pending> 80:30676/TCP 5s
104104
```
105105

106106
When the *EXTERNAL-IP* address changes from *pending* to an actual public IP address, use `CTRL-C` to stop the `kubectl` watch process. The following example output shows a valid public IP address assigned to the service:
107107

108108
```
109-
azure-vote-front 10.0.34.242 52.179.23.131 80:30676/TCP 2m
109+
azure-vote-front LoadBalancer 10.0.34.242 52.179.23.131 80:30676/TCP 67s
110110
```
111111

112112
To see the application in action, open a web browser to the external IP address of your service:

articles/aks/tutorial-kubernetes-deploy-cluster.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ To verify the connection to your cluster, run the [kubectl get nodes][kubectl-ge
112112
```
113113
$ kubectl get nodes
114114
115-
NAME STATUS ROLES AGE VERSION
116-
aks-nodepool1-28993262-0 Ready agent 3m18s v1.9.11
115+
NAME STATUS ROLES AGE VERSION
116+
aks-nodepool1-12345678-0 Ready agent 32m v1.13.9
117117
```
118118

119119
## Next steps

articles/aks/tutorial-kubernetes-scale.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,13 @@ Kubernetes supports [horizontal pod autoscaling][kubernetes-hpa] to adjust the n
7474
az aks show --resource-group myResourceGroup --name myAKSCluster --query kubernetesVersion
7575
```
7676

77-
If your AKS cluster is less than *1.10*, install the Metrics Server, otherwise skip this step. To install, clone the `metrics-server` GitHub repo and install the example resource definitions. To view the contents of these YAML definitions, see [Metrics Server for Kuberenetes 1.8+][metrics-server-github].
78-
79-
```console
80-
git clone https://github.com/kubernetes-incubator/metrics-server.git
81-
kubectl create -f metrics-server/deploy/1.8+/
82-
```
77+
> [!NOTE]
78+
> If your AKS cluster is less than *1.10*, the Metrics Server is not automatically installed. To install, clone the `metrics-server` GitHub repo and install the example resource definitions. To view the contents of these YAML definitions, see [Metrics Server for Kuberenetes 1.8+][metrics-server-github].
79+
>
80+
> ```console
81+
> git clone https://github.com/kubernetes-incubator/metrics-server.git
82+
> kubectl create -f metrics-server/deploy/1.8+/
83+
> ```
8384
8485
To use the autoscaler, all containers in your pods and your pods must have CPU requests and limits defined. In the `azure-vote-front` deployment, the front-end container already requests 0.25 CPU, with a limit of 0.5 CPU. These resource requests and limits are defined as shown in the following example snippet:
8586

articles/aks/tutorial-kubernetes-upgrade-cluster.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ Before you upgrade a cluster, use the [az aks get-upgrades][] command to check w
3838
az aks get-upgrades --resource-group myResourceGroup --name myAKSCluster --output table
3939
```
4040

41-
In the following example, the current version is *1.9.11*, and the available versions are shown under the *Upgrades* column.
41+
In the following example, the current version is *1.13.9*, and the available versions are shown under the *Upgrades* column.
4242

4343
```
4444
Name ResourceGroup MasterVersion NodePoolVersion Upgrades
4545
------- --------------- --------------- ----------------- --------------
46-
default myResourceGroup 1.9.11 1.9.11 1.10.8, 1.10.9
46+
default myResourceGroup 1.13.9 1.13.9 1.14.5
4747
```
4848

4949
## Upgrade a cluster
@@ -56,16 +56,16 @@ To minimize disruption to running applications, AKS nodes are carefully cordoned
5656
1. When the new node is ready and joined to the cluster, the Kubernetes scheduler begins to run pods on it.
5757
1. The old node is deleted, and the next node in the cluster begins the cordon and drain process.
5858

59-
Use the [az aks upgrade][] command to upgrade the AKS cluster. The following example upgrades the cluster to Kubernetes version *1.10.9*.
59+
Use the [az aks upgrade][] command to upgrade the AKS cluster. The following example upgrades the cluster to Kubernetes version *1.14.5*.
6060

6161
> [!NOTE]
62-
> You can only upgrade one minor version at a time. For example, you can upgrade from *1.9.11* to *1.10.9*, but cannot upgrade from *1.9.6* to *1.11.x* directly. To upgrade from *1.9.11* to *1.11.x*, first upgrade from *1.9.11* to *1.10.x*, then perform another upgrade from *1.10.x* to *1.11.x*.
62+
> You can only upgrade one minor version at a time. For example, you can upgrade from *1.12.x* to *1.13.x*, but cannot upgrade from *1.12.8* to *1.14.x* directly. To upgrade from *1.12.x* to *1.14.x*, first upgrade from *1.12.x* to *1.13.x*, then perform another upgrade from *1.13.x* to *1.14.x*.
6363
6464
```azurecli
65-
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.10.9
65+
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.14.5
6666
```
6767

68-
The following condensed example output shows the *kubernetesVersion* now reports *1.10.9*:
68+
The following condensed example output shows the *kubernetesVersion* now reports *1.14.5*:
6969

7070
```json
7171
{
@@ -83,7 +83,7 @@ The following condensed example output shows the *kubernetesVersion* now reports
8383
"enableRbac": false,
8484
"fqdn": "myaksclust-myresourcegroup-19da35-bd54a4be.hcp.eastus.azmk8s.io",
8585
"id": "/subscriptions/<Subscription ID>/resourcegroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myAKSCluster",
86-
"kubernetesVersion": "1.10.9",
86+
"kubernetesVersion": "1.14.5",
8787
"location": "eastus",
8888
"name": "myAKSCluster",
8989
"type": "Microsoft.ContainerService/ManagedClusters"
@@ -98,12 +98,12 @@ Confirm that the upgrade was successful using the [az aks show][] command as fol
9898
az aks show --resource-group myResourceGroup --name myAKSCluster --output table
9999
```
100100

101-
The following example output shows the AKS cluster runs *KubernetesVersion 1.10.9*:
101+
The following example output shows the AKS cluster runs *KubernetesVersion 1.14.5*:
102102

103103
```
104104
Name Location ResourceGroup KubernetesVersion ProvisioningState Fqdn
105105
------------ ---------- --------------- ------------------- ------------------- ----------------------------------------------------------------
106-
myAKSCluster eastus myResourceGroup 1.10.9 Succeeded myaksclust-myresourcegroup-19da35-bd54a4be.hcp.eastus.azmk8s.io
106+
myAKSCluster eastus myResourceGroup 1.14.5 Succeeded myaksclust-myresourcegroup-19da35-bd54a4be.hcp.eastus.azmk8s.io
107107
```
108108

109109
## Delete the cluster

articles/aks/upgrade-cluster.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ az aks get-upgrades --resource-group myResourceGroup --name myAKSCluster --outpu
3232
```
3333

3434
> [!NOTE]
35-
> When you upgrade an AKS cluster, Kubernetes minor versions cannot be skipped. For example, upgrades between *1.11.x* -> *1.12.x* or *1.12.x* -> *1.13.x* are allowed, however *1.11.x* -> *1.13.x* is not.
35+
> When you upgrade an AKS cluster, Kubernetes minor versions cannot be skipped. For example, upgrades between *1.12.x* -> *1.13.x* or *1.13.x* -> *1.14.x* are allowed, however *1.12.x* -> *1.14.x* is not.
3636
>
37-
> To upgrade, from *1.11.x* -> *1.13.x*, first upgrade from *1.11.x* -> *1.12.x*, then upgrade from *1.12.x* -> *1.13.x*.
37+
> To upgrade, from *1.12.x* -> *1.14.x*, first upgrade from *1.12.x* -> *1.13.x*, then upgrade from *1.13.x* -> *1.14.x*.
3838
39-
The following example output shows that the cluster can be upgraded to version *1.12.7* or *1.12.8*:
39+
The following example output shows that the cluster can be upgraded to version *1.13.9*:
4040

4141
```console
42-
Name ResourceGroup MasterVersion NodePoolVersion Upgrades
43-
------- --------------- ------------- --------------- --------------
44-
default myResourceGroup 1.11.9 1.11.9 1.12.7, 1.12.8
42+
Name ResourceGroup MasterVersion NodePoolVersion Upgrades
43+
------- --------------- --------------- ----------------- --------------
44+
default myResourceGroup 1.12.8 1.12.8 1.13.9
4545
```
4646

4747
## Upgrade an AKS cluster
4848

4949
With a list of available versions for your AKS cluster, use the [az aks upgrade][az-aks-upgrade] command to upgrade. During the upgrade process, AKS adds a new node to the cluster that runs the specified Kubernetes version, then carefully [cordon and drains][kubernetes-drain] one of the old nodes to minimize disruption to running applications. When the new node is confirmed as running application pods, the old node is deleted. This process repeats until all nodes in the cluster have been upgraded.
5050

51-
The following example upgrades a cluster to version *1.12.8*:
51+
The following example upgrades a cluster to version *1.13.9*:
5252

5353
```azurecli-interactive
54-
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.12.8
54+
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.13.9
5555
```
5656

5757
It takes a few minutes to upgrade the cluster, depending on how many nodes you have.
@@ -62,12 +62,12 @@ To confirm that the upgrade was successful, use the [az aks show][az-aks-show] c
6262
az aks show --resource-group myResourceGroup --name myAKSCluster --output table
6363
```
6464

65-
The following example output shows that the cluster now runs *1.12.8*:
65+
The following example output shows that the cluster now runs *1.13.9*:
6666

6767
```json
6868
Name Location ResourceGroup KubernetesVersion ProvisioningState Fqdn
6969
------------ ---------- --------------- ------------------- ------------------- ---------------------------------------------------------------
70-
myAKSCluster eastus myResourceGroup 1.12.8 Succeeded myaksclust-myresourcegroup-19da35-90efab95.hcp.eastus.azmk8s.io
70+
myAKSCluster eastus myResourceGroup 1.13.9 Succeeded myaksclust-myresourcegroup-19da35-90efab95.hcp.eastus.azmk8s.io
7171
```
7272

7373
## Next steps

0 commit comments

Comments
 (0)