Skip to content

Commit d87e747

Browse files
authored
Merge pull request #220293 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2ddc66d + e8ef664 commit d87e747

File tree

11 files changed

+18
-18
lines changed

11 files changed

+18
-18
lines changed

articles/active-directory/standards/memo-22-09-multi-factor-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Adoption of MFA is critical for preventing unauthorized access to accounts and d
2525

2626
## Phishing-resistant methods
2727

28-
U.S. Federal agencies will be approaching this guidance from different starting points. Some agencies will have already deployed modern credentials such as [FIDO2 security keys](../authentication/concept-authentication-passwordless.md#fido2-security-keys) or [Windows Hello for Business](/windows/security/identity-protection/hello-for-business/hello-overview), many are evaluating [Azure AD certificate-based authentication](../authentication/concept-certificate-based-authentication.md) (currently in Public Preview), some are just starting to modernize their authentication credentials. This guidance is meant to inform agencies on the multiple options available to meet phishing-resistant MFA requirements with Azure AD. The reality is that phishing-resistant MFA is needed sooner then later. Microsoft recommends adopting phishing-resistant MFA method as soon as possible by whichever method below best matches the agency's current capability. Agencies should approach the phishing-resistant MFA requirement of the memorandum from the mindset of what can I do **now** to gain phishing-resistance for my accounts. Implementing phishing-resistant MFA will provide a significant positive impact on improving the agency's overall cybersecurity posture. The end goal here is to fully implement one or more of the modern credentials. However, if the quickest path to phishing-resistance is not a modern approach below, agencies should take that step as a starting point on their journey towards the more modern approaches.
28+
U.S. Federal agencies will be approaching this guidance from different starting points. Some agencies will have already deployed modern credentials such as [FIDO2 security keys](../authentication/concept-authentication-passwordless.md#fido2-security-keys) or [Windows Hello for Business](/windows/security/identity-protection/hello-for-business/hello-overview), many are evaluating [Azure AD certificate-based authentication](../authentication/concept-certificate-based-authentication.md) (currently in Public Preview), some are just starting to modernize their authentication credentials. This guidance is meant to inform agencies on the multiple options available to meet phishing-resistant MFA requirements with Azure AD. The reality is that phishing-resistant MFA is needed sooner than later. Microsoft recommends adopting phishing-resistant MFA method as soon as possible by whichever method below best matches the agency's current capability. Agencies should approach the phishing-resistant MFA requirement of the memorandum from the mindset of what can I do **now** to gain phishing-resistance for my accounts. Implementing phishing-resistant MFA will provide a significant positive impact on improving the agency's overall cybersecurity posture. The end goal here is to fully implement one or more of the modern credentials. However, if the quickest path to phishing-resistance is not a modern approach below, agencies should take that step as a starting point on their journey towards the more modern approaches.
2929

3030
![Table of Azure AD phishing-resistant methods.](media/memo-22-09/azure-active-directory-pr-methods.png)
3131

articles/azure-arc/kubernetes/overview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ description: "This article provides an overview of Azure Arc-enabled Kubernetes.
88

99
# What is Azure Arc-enabled Kubernetes?
1010

11-
Azure Arc-enabled Kubernetes allows you to attach and configure Kubernetes clusters running anywhere. You can connect your clusters running on other public cloud providers (such as GCP or AWS) or clusters running on your on-premises data center (such as VMware vSphere or Azure Stack HCI) to Azure Arc.
11+
Azure Arc-enabled Kubernetes allows you to attach and configure Kubernetes clusters running anywhere. You can connect your clusters running on other public cloud providers (such as GCP or AWS) or clusters running on your on-premises data center (such as VMware vSphere or Azure Stack HCI) to Azure through the Arc platform.
1212

13-
When you connect a Kubernetes cluster to Azure Arc, it will:
13+
When you connect a Kubernetes cluster to Azure, it will:
1414

1515
* Be represented in Azure Resource Manager by a unique ID
1616
* Be placed in an Azure subscription and resource group
@@ -20,17 +20,17 @@ Azure Arc-enabled Kubernetes supports industry-standard SSL to secure data in tr
2020

2121
Azure Arc-enabled Kubernetes supports the following scenarios for connected clusters:
2222

23-
* [Connect Kubernetes](quickstart-connect-cluster.md) running outside of Azure for inventory, grouping, and tagging.
23+
* Single pane of glass to view all [connected Kubernetes clusters](quickstart-connect-cluster.md) running outside of Azure for inventory, grouping, and tagging, along with Azure Kubernetes Service (AKS) clusters.
2424

2525
* Deploy applications and apply configuration using [GitOps-based configuration management](tutorial-use-gitops-connected-cluster.md).
2626

2727
* View and monitor your clusters using [Azure Monitor for containers](../../azure-monitor/containers/container-insights-enable-arc-enabled-clusters.md?toc=/azure/azure-arc/kubernetes/toc.json).
2828

2929
* Enforce threat protection using [Microsoft Defender for Kubernetes](../../defender-for-cloud/defender-for-kubernetes-azure-arc.md?toc=/azure/azure-arc/kubernetes/toc.json).
3030

31-
* Apply policy definitions using [Azure Policy for Kubernetes](../../governance/policy/concepts/policy-for-kubernetes.md?toc=/azure/azure-arc/kubernetes/toc.json).
31+
* Ensure governance through applying policies with [Azure Policy for Kubernetes](../../governance/policy/concepts/policy-for-kubernetes.md?toc=/azure/azure-arc/kubernetes/toc.json).
3232

33-
* Use [Azure Active Directory for authentication and authorization checks](azure-rbac.md) on your cluster.
33+
* Manage access by using [Azure Active Directory for authentication and authorization checks](azure-rbac.md) on your cluster.
3434

3535
* Securely access your Kubernetes cluster from anywhere without opening inbound port on firewall using [Cluster Connect](cluster-connect.md).
3636

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Azure Monitor Agent provides the following benefits over legacy agents:
2323

2424
- **Security and performance**
2525
- Enhanced security through Managed Identity and Azure Active Directory (Azure AD) tokens (for clients).
26-
- Same events-per-second (EPS) upload rate with less resouce utilization.
26+
- Same events-per-second (EPS) upload rate with less resource utilization.
2727
- **Cost savings** by [using data collection rules](data-collection-rule-azure-monitor-agent.md). Using DCRs is one of the most useful advantages of using Azure Monitor Agent:
2828
- DCRs let you configure data collection for specific machines connected to a workspace as compared to the "all or nothing" approach of legacy agents.
2929
- With DCRs, you can define which data to ingest and which data to filter out to reduce workspace clutter and save on costs.

articles/azure-monitor/app/opentelemetry-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ A direct exporter sends telemetry in-process (from the application's code) direc
5959

6060
*All currently supported OpenTelemetry-based offerings in Azure Monitor use a direct exporter*.
6161

62-
Alternatively, sending telemetry via an agent will provide a path for any OpenTelemetry-supported language to send to Azure Monitor via [online transactional processing (OTLP)](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/README.md). Receiving OTLP will enable customers to observe applications written in languages beyond our [supported languages](platforms.md).
62+
Alternatively, sending telemetry via an agent will provide a path for any OpenTelemetry-supported language to send to Azure Monitor via [Open Telemetry Protocol (OTLP)](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/README.md). Receiving OTLP will enable customers to observe applications written in languages beyond our [supported languages](platforms.md).
6363

6464
> [!NOTE]
6565
> Some customers have begun to use the [OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/design.md) as an agent alternative even though Microsoft doesn't officially support the "via an agent" approach for application monitoring yet. In the meantime, the open-source community has contributed an OpenTelemetry-Collector Azure Monitor exporter that some customers are using to send data to Azure Monitor Application Insights.

articles/backup/guidance-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ With soft-delete, if a user deletes the backup (of a VM, SQL Server database, Az
239239

240240
Any administrator that has the privileged access to your backup data has the potential to cause irreparable damage to the system. A rogue admin can delete all your business-critical data or even turn off all the security measures that may leave your system vulnerable to cyber-attacks.
241241

242-
Azure Backup provides you with the [Multi-User Authorization (MUA)](./multi-user-authorization.md) feature to protect you from such rouge administrator attacks. Multi-user authorization helps protect against a rogue administrator performing destructive operations (that is, disabling soft-delete), by ensuring that every privileged/destructive operation is done only after getting approval from a security administrator.
242+
Azure Backup provides you with the [Multi-User Authorization (MUA)](./multi-user-authorization.md) feature to protect you from such rogue administrator attacks. Multi-user authorization helps protect against a rogue administrator performing destructive operations (that is, disabling soft-delete), by ensuring that every privileged/destructive operation is done only after getting approval from a security administrator.
243243

244244
### Ransomware Protection
245245

articles/governance/resource-graph/how-to/get-resource-changes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@ resourcechanges  
301301
```kusto
302302
resourcechanges 
303303
|extend targetResourceId = tostring(properties.targetResourceId), changeType = tostring(properties.changeType), createTime = todatetime(properties.changeAttributes.timestamp) 
304-
| where createTime > ago(7d) and changeType == "Create"
304+
| where createTime > ago(7d) and changeType == "Create" or changeType == "Update" or changeType == "Delete"
305305
| project  targetResourceId, changeType, createTime 
306-
| join ( resources | extendtargetResourceId=id) ontargetResourceId
307-
| where tags[“Environment] =~ prod
306+
| join ( resources | extend targetResourceId=id) on targetResourceId
307+
| where tags ['Environment'] =~ 'prod'
308308
| order by createTime desc 
309309
| project createTime, id, resourceGroup, type
310310
```

articles/iot-edge/how-to-install-iot-edge-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ IoT Edge can be installed on Kubernetes by using [KubeVirt](https://www.cncf.io/
2222
| Note | Description |
2323
|-|-|
2424
| 1 | Install KubeVirt Custom Resource Definitions (CRDs) into the Kubernetes cluster. Like the Kubernetes cluster, management and updates to KubeVirt components are outside the purview of IoT Edge. |
25-
| 2️ | A KubeVirt `VirtualMachine` custom resource is used to define a Virtual Machine with required resources and base operating system. A running *instance* of this resouce is created in a Kubernetes Pod using [KVM](https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine) and [QEMU](https://wiki.qemu.org/Main_Page) technologies. If your Kubernetes node itself is a Virtual Machine, you'll need to enable Nested Virtualization to use KubeVirt.|
25+
| 2️ | A KubeVirt `VirtualMachine` custom resource is used to define a Virtual Machine with required resources and base operating system. A running *instance* of this resource is created in a Kubernetes Pod using [KVM](https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine) and [QEMU](https://wiki.qemu.org/Main_Page) technologies. If your Kubernetes node itself is a Virtual Machine, you'll need to enable Nested Virtualization to use KubeVirt.|
2626
| 3️ | The environment inside the QEMU container is just like an OS environment. IoT Edge and its dependencies (like the Docker container engine) can be setup using standard installation instructions or a [cloud-init](https://github.com/Azure-Samples/IoT-Edge-K8s-KubeVirt-Deployment/blob/12e3192b66aa9b49157c8ee9f6b832b322659f2f/deployment/helm/templates/_helper.tpl#L31) script. |
2727

2828
## Sample

articles/machine-learning/how-to-use-parallel-job-in-pipeline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Sample code to set two attributes:
113113
114114
### Implement predefined functions in entry script
115115

116-
Entry script is a single python file where user needs to implement three predefined functions with custom code. Azure ML parallel job follows the diagram below to execute them in each processor.
116+
Entry script is a single Python file where user needs to implement three predefined functions with custom code. Azure ML parallel job follows the diagram below to execute them in each processor.
117117

118118
:::image type="content" source="./media/how-to-use-parallel-job-in-pipeline/how-entry-script-works-in-parallel-job.png" alt-text="Diagram showing how entry script works in parallel job." lightbox ="./media/how-to-use-parallel-job-in-pipeline/how-entry-script-works-in-parallel-job.png":::
119119

@@ -133,7 +133,7 @@ Once you have entry script ready, you can set following two attributes to use it
133133
| Attribute name | Type | Description | Default value |
134134
|: ------------- | ---- |: ---------- | ------------- |
135135
| `code` | string | Local path to the source code directory to be uploaded and used for the job. | |
136-
| `entry_script` | string | The python file that contains the implementation of pre-defined parallel functions. | |
136+
| `entry_script` | string | The Python file that contains the implementation of pre-defined parallel functions. | |
137137

138138
Sample code to set two attributes:
139139

articles/machine-learning/how-to-use-sweep-in-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Below code snippet is the source code of trial component.
5454

5555
### Python SDK
5656

57-
The python SDK example can be found in [azureml-example repo](https://github.com/Azure/azureml-examples). Navigate to *azureml-examples/sdk/jobs/pipelines/1c_pipeline_with_hyperparameter_sweep* to check the example.
57+
The Python SDK example can be found in [azureml-example repo](https://github.com/Azure/azureml-examples). Navigate to *azureml-examples/sdk/jobs/pipelines/1c_pipeline_with_hyperparameter_sweep* to check the example.
5858

5959
In Azure Machine Learning Python SDK v2, you can enable hyperparameter tuning for any command component by calling `.sweep()` method.
6060

articles/machine-learning/migrate-to-v2-execution-parallel-run-step.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This article gives a comparison of scenario(s) in SDK v1 and SDK v2. In the foll
3333
## Prerequisites
3434

3535
- Prepare your SDK v2 environment: [Install the Azure ML SDK v2 for Python](/python/api/overview/azure/ml/installv2)
36-
- Understand the basis of SDK v2 pipeline: [How to create Azure ML pipeline with python SDK v2](how-to-create-component-pipeline-python.md)
36+
- Understand the basis of SDK v2 pipeline: [How to create Azure ML pipeline with Python SDK v2](how-to-create-component-pipeline-python.md)
3737

3838

3939
## Create parallel step

0 commit comments

Comments
 (0)