Skip to content

Commit fbae1a8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-security-operator-identity-protection
2 parents 858d56d + 2cc3442 commit fbae1a8

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

articles/container-apps/quotas.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: craigshoemaker
66
ms.service: container-apps
77
ms.custom: event-tier1-build-2022
88
ms.topic: conceptual
9-
ms.date: 11/21/2022
9+
ms.date: 02/17/2023
1010
ms.author: cshoe
1111
---
1212

@@ -18,8 +18,8 @@ To request an increase in quota amounts for your container app, learn [how to re
1818

1919
| Feature | Scope | Default | Is Configurable<sup>1</sup> | Remarks |
2020
|--|--|--|--|--|
21-
| Environments | Region | Up to 5 | Yes | Limit up to five environments per subscription, per region.<br><br>For example, if you deploy to three regions you can get up to 15 environments for a single subscription. |
22-
| Container Apps | Environment | 20 | Yes | |
21+
| Environments | Region | Up to 15 | Yes | Limit up to 15 environments per subscription, per region.<br><br>For example, if you deploy to three regions you can get up to 45 environments for a single subscription. |
22+
| Container Apps | Environment | Unlimited | Yes | |
2323
| Revisions | Container app | 100 | No | |
2424
| Replicas | Revision | 30 | Yes | |
2525
| Cores | Replica | 2 | No | Maximum number of cores that can be requested by a revision replica. |

articles/machine-learning/how-to-deploy-mlflow-models-online-endpoints.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ ms.custom: deploy, mlflow, devplatv2, no-code-deployment, devx-track-azurecli, c
2121
> * [v1](./v1/how-to-deploy-mlflow-models.md)
2222
> * [v2 (current version)](how-to-deploy-mlflow-models-online-endpoints.md)
2323
24-
In this article, learn how to deploy your [MLflow](https://www.mlflow.org) model to an [online endpoint](concept-endpoints.md) for real-time inference. When you deploy your MLflow model to an online endpoint, you don't need to indicate a scoring script or an environment. This characteristic is usually referred as __no-code deployment__.
24+
In this article, learn how to deploy your [MLflow](https://www.mlflow.org) model to an [online endpoint](concept-endpoints.md) for real-time inference. When you deploy your MLflow model to an online endpoint, you don't need to indicate a scoring script or an environment. This characteristic is referred as __no-code deployment__.
2525

2626
For no-code-deployment, Azure Machine Learning
2727

28-
* Dynamically installs Python packages provided in the `conda.yaml` file, this means the dependencies are installed during container runtime.
28+
* Dynamically installs Python packages provided in the `conda.yaml` file. Hence, dependencies are installed during container runtime.
2929
* Provides a MLflow base image/curated environment that contains the following items:
3030
* [`azureml-inference-server-http`](how-to-inference-server-http.md)
3131
* [`mlflow-skinny`](https://github.com/mlflow/mlflow/blob/master/README_SKINNY.rst)
@@ -37,11 +37,11 @@ For no-code-deployment, Azure Machine Learning
3737

3838
## About this example
3939

40-
This example shows how you can deploy an MLflow model to an online endpoint to perform predictions. This example uses an MLflow model based on the [Diabetes dataset](https://www4.stat.ncsu.edu/~boos/var.select/diabetes.html). This dataset contains ten baseline variables, age, sex, body mass index, average blood pressure, and six blood serum measurements obtained from n = 442 diabetes patients, as well as the response of interest, a quantitative measure of disease progression one year after baseline (regression).
40+
This example shows how you can deploy an MLflow model to an online endpoint to perform predictions. This example uses an MLflow model based on the [Diabetes dataset](https://www4.stat.ncsu.edu/~boos/var.select/diabetes.html). This dataset contains ten baseline variables, age, sex, body mass index, average blood pressure, and six blood serum measurements obtained from n = 442 diabetes patients. It also contains the response of interest, a quantitative measure of disease progression one year after baseline (regression).
4141

42-
The model has been trained using an `scikit-learn` regressor and all the required preprocessing has been packaged as a pipeline, making this model an end-to-end pipeline that goes from raw data to predictions.
42+
The model was trained using an `scikit-learn` regressor and all the required preprocessing has been packaged as a pipeline, making this model an end-to-end pipeline that goes from raw data to predictions.
4343

44-
The information in this article is based on code samples contained in the [azureml-examples](https://github.com/azure/azureml-examples) repository. To run the commands locally without having to copy/paste YAML and other files, clone the repo and then change directories to the `cli/endpoints/online` if you are using the Azure CLI or `sdk/endpoints/online` if you are using our SDK for Python.
44+
The information in this article is based on code samples contained in the [azureml-examples](https://github.com/azure/azureml-examples) repository. To run the commands locally without having to copy/paste YAML and other files, clone the repo, and then change directories to the `cli/endpoints/online` if you are using the Azure CLI or `sdk/endpoints/online` if you are using our SDK for Python.
4545

4646
```azurecli
4747
git clone https://github.com/Azure/azureml-examples --depth 1
@@ -58,9 +58,9 @@ Before following the steps in this article, make sure you have the following pre
5858

5959
- An Azure subscription. If you don't have an Azure subscription, create a free account before you begin. Try the [free or paid version of Azure Machine Learning](https://azure.microsoft.com/free/).
6060
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure Machine Learning. To perform the steps in this article, your user account must be assigned the owner or contributor role for the Azure Machine Learning workspace, or a custom role allowing Microsoft.MachineLearningServices/workspaces/onlineEndpoints/*. For more information, see [Manage access to an Azure Machine Learning workspace](how-to-assign-roles.md).
61-
- You must have a MLflow model registered in your workspace. Particularly, this example will register a model trained for the [Diabetes dataset](https://www4.stat.ncsu.edu/~boos/var.select/diabetes.html).
61+
- You must have a MLflow model registered in your workspace. Particularly, this example registers a model trained for the [Diabetes dataset](https://www4.stat.ncsu.edu/~boos/var.select/diabetes.html).
6262

63-
Additionally, you will need to:
63+
Additionally, you need to:
6464

6565
# [Azure CLI](#tab/cli)
6666

@@ -86,7 +86,7 @@ Additionally, you will need to:
8686
8787
# [Studio](#tab/studio)
8888
89-
There are no additional prerequisites when working in Azure Machine Learning studio.
89+
There are no more prerequisites when working in Azure Machine Learning studio.
9090
9191
---
9292
@@ -104,7 +104,7 @@ az configure --defaults workspace=<workspace> group=<resource-group> location=<l
104104

105105
# [Python (Azure ML SDK)](#tab/sdk)
106106

107-
The workspace is the top-level resource for Azure Machine Learning, providing a centralized place to work with all the artifacts you create when you use Azure Machine Learning. In this section, we'll connect to the workspace in which you'll perform deployment tasks.
107+
The workspace is the top-level resource for Azure Machine Learning, providing a centralized place to work with all the artifacts you create when you use Azure Machine Learning. In this section, we connect to the workspace in which you perform deployment tasks.
108108

109109
1. Import the required libraries:
110110

@@ -587,7 +587,7 @@ Use the following steps to deploy an MLflow model with a custom scoring script.
587587
raise Exception("Request must contain a top level key named 'input_data'")
588588
589589
serving_input = json.dumps(json_data["input_data"])
590-
data = infer_and_parse_json_input(raw_data, input_schema)
590+
data = infer_and_parse_json_input(serving_input, input_schema)
591591
result = model.predict(data)
592592
593593
result = StringIO()

articles/service-bus-messaging/service-bus-authentication-and-authorization.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
title: Azure Service Bus authentication and authorization | Microsoft Docs
33
description: Authenticate apps to Service Bus with Shared Access Signature (SAS) authentication.
44
ms.topic: article
5-
ms.date: 02/01/2022
5+
ms.date: 02/17/2023
66
---
77

88
# Service Bus authentication and authorization
9-
There are two ways to authenticate and authorize access to Azure Service Bus resources: Azure Active Directory (Azure AD) and Shared Access Signatures (SAS). This article gives you details on using these two types of security mechanisms.
9+
There are two ways to authenticate and authorize access to Azure Service Bus resources:
10+
11+
- Azure Active Directory (Azure AD)
12+
- Shared Access Signatures (SAS).
13+
14+
This article gives you details on using these two types of security mechanisms.
1015

1116
## Azure Active Directory
12-
Azure AD integration for Service Bus resources provides Azure role-based access control (RBAC) for fine-grained control over a client’s access to resources. You can use Azure RBAC to grant permissions to a security principal, which may be a user, a group, or an application service principal. The security principal is authenticated by Azure AD to return an OAuth 2.0 token. The token can be used to authorize a request to access a Service Bus resource (queue, topic, and so on).
17+
Azure AD integration with Service Bus provides role-based access control (RBAC) to Service Bus resources. You can use Azure RBAC to grant permissions to a security principal, which may be a user, a group, or an application service principal. Azure AD authenticates the security principal and returns an OAuth 2.0 token. This token can be used to authorize a request to access a Service Bus resource (queue, topic, and so on).
1318

1419
For more information about authenticating with Azure AD, see the following articles:
1520

@@ -20,23 +25,21 @@ For more information about authenticating with Azure AD, see the following artic
2025
> [Service Bus REST API](/rest/api/servicebus/) supports OAuth authentication with Azure AD.
2126
2227
> [!IMPORTANT]
23-
> Authorizing users or applications using OAuth 2.0 token returned by Azure AD provides superior security and ease of use over shared access signatures (SAS). With Azure AD, there is no need to store the tokens in your code and risk potential security vulnerabilities. We recommend that you use Azure AD with your Azure Service Bus applications when possible.
28+
> Authorizing users or applications using OAuth 2.0 token returned by Azure AD provides superior security and ease of use over shared access signatures (SAS). With Azure AD, there is no need to store tokens in your code and risk potential security vulnerabilities. We recommend that you use Azure AD with your Azure Service Bus applications when possible.
2429
>
2530
> You can disable local or SAS key authentication for a Service Bus namespace and allow only Azure AD authentication. For step-by-step instructions, see [Disable local authentication](disable-local-authentication.md).
2631
2732
## Shared access signature
2833
[SAS authentication](service-bus-sas.md) enables you to grant a user access to Service Bus resources, with specific rights. SAS authentication in Service Bus involves the configuration of a cryptographic key with associated rights on a Service Bus resource. Clients can then gain access to that resource by presenting a SAS token, which consists of the resource URI being accessed and an expiry signed with the configured key.
2934

30-
You can configure keys for SAS on a Service Bus namespace. The key applies to all messaging entities within that namespace. You can also configure keys on Service Bus queues and topics. SAS is also supported on [Azure Relay](../azure-relay/relay-authentication-and-authorization.md).
31-
32-
To use SAS, you can configure a shared access authorization rule on a namespace, queue, or topic. This rule consists of the following elements:
35+
You can configure keys for SAS on a Service Bus namespace. The key applies to all messaging entities within that namespace. You can also configure keys on Service Bus queues and topics. To use SAS, you can configure a shared access authorization rule on a namespace, queue, or topic. This rule consists of the following elements:
3336

34-
* *KeyName*: identifies the rule.
35-
* *PrimaryKey*: a cryptographic key used to sign/validate SAS tokens.
36-
* *SecondaryKey*: a cryptographic key used to sign/validate SAS tokens.
37-
* *Rights*: represents the collection of **Listen**, **Send**, or **Manage** rights granted.
37+
* **KeyName**: identifies the rule.
38+
* **PrimaryKey**: a cryptographic key used to sign/validate SAS tokens.
39+
* **SecondaryKey**: a cryptographic key used to sign/validate SAS tokens.
40+
* **Rights**: represents the collection of **Listen**, **Send**, or **Manage** rights granted.
3841

39-
Authorization rules configured at the namespace level can grant access to all entities in a namespace for clients with tokens signed using the corresponding key. You can configure up to 12 such authorization rules on a Service Bus namespace, queue, or topic. By default, a shared access authorization rule with all rights is configured for every namespace when it's first provisioned.
42+
Authorization rules configured at the namespace level can grant access to all entities in a namespace for clients with tokens signed using the corresponding key. You can configure up to 12 such authorization rules on a Service Bus namespace, queue, or topic. By default, a shared access authorization rule with all rights is configured for every namespace when it's first provisioned.
4043

4144
To access an entity, the client requires a SAS token generated using a specific shared access authorization rule. The SAS token is generated using the HMAC-SHA256 of a resource string that consists of the resource URI to which access is claimed, and an expiry with a cryptographic key associated with the authorization rule.
4245

0 commit comments

Comments
 (0)