Skip to content

Commit 80e7698

Browse files
authored
Merge pull request #200558 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 4909a1c + 8d86326 commit 80e7698

File tree

209 files changed

+1725
-1038
lines changed

Some content is hidden

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

209 files changed

+1725
-1038
lines changed

articles/active-directory/saas-apps/blinq-provisioning-tutorial.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ The scenario outlined in this tutorial assumes that you already have the followi
4242

4343
1. Navigate to [Blinq Admin Console](https://dash.blinq.me) in a separate browser tab.
4444
1. If you aren't logged in to Blinq you will need to do so.
45-
1. Click on your workspace in the top left corner of the screen.
46-
1. In the dropdown click **Settings**.
45+
1. Click on your workspace in the top left hand corner of the screen and select **Settings** in the dropdown menu.
46+
47+
[![Screenshot of the Blinq settings option.](media/blinq-provisioning-tutorial/blinq-settings.png)](media/blinq-provisioning-tutorial/blinq-settings.png#lightbox)
48+
4749
1. Under the **Integrations** page you should see **Team Card Provisioning** which contains a URL and Token. You will need to generate the token by clicking **Generate**.
4850
Copy the **URL** and **Token**. The URL and the Token are to be inserted into the **Tenant URL*** and **Secret Token** field in the Azure portal respectively.
4951

52+
[![Screenshot of the Blinq integration page.](media/blinq-provisioning-tutorial/blinq-integrations-page.png)](media/blinq-provisioning-tutorial/blinq-integrations-page.png#lightbox)
53+
5054
## Step 3. Add Blinq from the Azure AD application gallery
5155

5256
Add Blinq from the Azure AD application gallery to start managing provisioning to Blinq. If you have previously setup Blinq for SSO, you can use the same application. However it's recommended you create a separate app when testing out the integration initially. Learn more about adding an application from the gallery [here](../manage-apps/add-application-portal.md).
129 KB
Loading
81.7 KB
Loading

articles/aks/custom-certificate-authority.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ You must ensure that:
103103
* The secret is created in the `kube-system` namespace.
104104

105105
```yaml
106-
apiVerison: v1
106+
apiVersion: v1
107107
kind: Secret
108108
metadata:
109109
name: custom-ca-trust-secret
@@ -136,4 +136,4 @@ For more information on AKS security best practices, see [Best practices for clu
136136
[az-extension-update]: /cli/azure/extension#az-extension-update
137137
[az-feature-list]: /cli/azure/feature#az-feature-list
138138
[az-feature-register]: /cli/azure/feature#az-feature-register
139-
[az-provider-register]: /cli/azure/provider#az-provider-register
139+
[az-provider-register]: /cli/azure/provider#az-provider-register

articles/automation/automation-hrw-run-runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Follow the next steps to use a managed identity for Azure resources on a Hybrid
104104
Get-AzVM -DefaultProfile $AzureContext | Select Name
105105
```
106106
107-
If you want the runbook to execute with the system-assigned managed identity, leave the code as-is. If you prefer to use a user-assigned managed identity, then:
107+
If you want the runbook to execute with the system-assigned managed identity, leave the code as-is. If you run the runbook in an Azure sandbox instead of Hybrid Runbook Worker and you want to use a user-assigned managed identity, then:
108108
1. From line 5, remove `$AzureContext = (Connect-AzAccount -Identity).context`,
109109
1. Replace it with `$AzureContext = (Connect-AzAccount -Identity -AccountId <ClientId>).context`, and
110110
1. Enter the Client ID.

articles/automation/automation-managing-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,6 @@ The Automation geo-replication service isn't accessible directly to external cus
9797

9898
## Next steps
9999

100+
* To learn about security guidelines, see [Security best practices in Azure Automation](automation-security-guidelines.md).
100101
* To learn more about secure assets in Azure Automation, see [Encryption of secure assets in Azure Automation](automation-secure-asset-encryption.md).
101-
102102
* To find out more about geo-replication, see [Creating and using active geo-replication](/azure/azure-sql/database/active-geo-replication-overview).

articles/automation/automation-role-based-access-control.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Manage role permissions and security in Azure Automation
3-
description: This article describes how to use Azure role-based access control (Azure RBAC), which enables access management for Azure resources.
3+
description: This article describes how to use Azure role-based access control (Azure RBAC), which enables access management and role permissions for Azure resources.
44
services: automation
55
ms.subservice: shared-capabilities
66
ms.date: 09/10/2021
@@ -9,7 +9,7 @@ ms.custom: devx-track-azurepowershell, subject-rbac-steps
99
#Customer intent: As an administrator, I want to understand permissions so that I use the least necessary set of permissions.
1010
---
1111

12-
# Manage role permissions and security in Automation
12+
# Manage role permissions and security in Azure Automation
1313

1414
Azure role-based access control (Azure RBAC) enables access management for Azure resources. Using [Azure RBAC](../role-based-access-control/overview.md), you can segregate duties within your team and grant only the amount of access to users, groups, and applications that they need to perform their jobs. You can grant role-based access to users using the Azure portal, Azure Command-Line tools, or Azure Management APIs.
1515

@@ -469,6 +469,7 @@ When a user assigned to the Automation Operator role on the Runbook scope views
469469

470470
## Next steps
471471

472+
* To learn about security guidelines, see [Security best practices in Azure Automation](automation-security-guidelines.md).
472473
* To find out more about Azure RBAC using PowerShell, see [Add or remove Azure role assignments using Azure PowerShell](../role-based-access-control/role-assignments-powershell.md).
473474
* For details of the types of runbooks, see [Azure Automation runbook types](automation-runbook-types.md).
474475
* To start a runbook, see [Start a runbook in Azure Automation](start-runbooks.md).

articles/automation/automation-secure-asset-encryption.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ To revoke access to customer-managed keys, use PowerShell or the Azure CLI. For
281281

282282
## Next steps
283283

284+
- To learn about security guidelines, see [Security best practices in Azure Automation](automation-security-guidelines.md).
284285
- To understand Azure Key Vault, see [What is Azure Key Vault?](../key-vault/general/overview.md).
285286
- To work with certificates, see [Manage certificates in Azure Automation](shared-resources/certificates.md).
286287
- To handle credentials, see [Manage credentials in Azure Automation](shared-resources/credentials.md).

articles/automation/automation-security-guidelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Azure Automation security guidelines, security best practices Automation.
2+
title: Azure Automation security guidelines, security best practices Automation jobs.
33
description: This article helps you with the guidelines that Azure Automation offers to ensure a secured configuration of Automation account, Hybrid Runbook worker role, authentication certificate and identities, network isolation and policies.
44
services: automation
55
ms.subservice: shared-capabilities
66
ms.date: 02/16/2022
77
ms.topic: conceptual
88
---
99

10-
# Best practices for security in Azure Automation
10+
# Security best practices in Azure Automation
1111

1212
This article details the best practices to securely execute the automation jobs.
1313
[Azure Automation](./overview.md) provides you the platform to orchestrate frequent, time consuming, error-prone infrastructure management and operational tasks, as well as mission-critical operations. This service allows you to execute scripts, known as automation runbooks seamlessly across cloud and hybrid environments.

articles/automation/automation-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Automation services in Azure - overview
3-
description: This article tells what are the Automation services in Azure and how to use it to automate the lifecycle of infrastructure and applications.
3+
description: This article tells what are the Automation services in Azure and how to compare and use it to automate the lifecycle of infrastructure and applications.
44
services: automation
55
keywords: azure automation services, automanage, Bicep, Blueprints, Guest Config, Policy, Functions
66
ms.date: 03/04/2022

0 commit comments

Comments
 (0)