Skip to content

Commit 1c92db7

Browse files
authored
Merge pull request #190207 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 8df6cd7 + 4d95d45 commit 1c92db7

File tree

8 files changed

+33
-18
lines changed

8 files changed

+33
-18
lines changed

articles/active-directory-b2c/multi-factor-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ In Azure AD B2C, you can delete a user's TOTP authenticator app enrollment. Then
122122
1. In the left menu, select **Users**.
123123
1. Search for and select the user for which you want to delete TOTP authenticator app enrollment.
124124
1. In the left menu, select **Authentication methods**.
125-
1. Under **Usable authentication methods**, find **Software OATH token (Preview)**, and then select the 3-dot menu next to it. If you don't see this interface, select **Switch to the new user authentication methods experience! Click here to use it now** to switch to the new authentication methods experience.
125+
1. Under **Usable authentication methods**, find **Software OATH token (Preview)**, and then select the ellipsis menu next to it. If you don't see this interface, select the option to **"Switch to the new user authentication methods experience! Click here to use it now"** to switch to the new authentication methods experience.
126126
1. Select **Delete**, and then select **Yes** to confirm.
127127

128128
:::image type="content" source="media/multi-factor-authentication/authentication-methods.png" alt-text="User authentication methods":::
@@ -137,4 +137,4 @@ Learn how to [delete a user's Software OATH token authentication method](/graph/
137137

138138
- Learn about the [TOTP display control](display-control-time-based-one-time-password.md) and [Azure AD MFA technical profile](multi-factor-auth-technical-profile.md)
139139

140-
::: zone-end
140+
::: zone-end

articles/aks/open-service-mesh-azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ osm metrics enable --namespace bookwarehouse
4545

4646
## Apply ConfigMap
4747

48-
Create the following ConfigMap in `kube-system`, which will tell AzMon what namespaces should be monitored. For instance, for the bookbuyer / bookstore demo, the ConfigMap would look as follows:
48+
Create the following ConfigMap in `kube-system`, which will tell Azure Monitor what namespaces should be monitored. For instance, for the bookbuyer / bookstore demo, the ConfigMap would look as follows:
4949

5050
```yaml
5151
kind: ConfigMap

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1010
---
1111

1212
# Manage the Azure Monitor agent
13-
This article provides the different options currently available to install, uninstall and update the [Azure Monitor agent](azure-monitor-agent-overview.md). This agent extension can be installed on Azure virtual machines, scale sets and Azure Arc-enabled servers. It also lists the options to create [associations with data collection rules](data-collection-rule-azure-monitor-agent.md) that define which data the agent should collect.
13+
This article provides the different options currently available to install, uninstall and update the [Azure Monitor agent](azure-monitor-agent-overview.md). This agent extension can be installed on Azure virtual machines, scale sets and Azure Arc-enabled servers. It also lists the options to create [associations with data collection rules](data-collection-rule-azure-monitor-agent.md) that define which data the agent should collect. Installing, upgrading, or uninstalling the Azure Monitor Agent will not require you to restart your server.
1414

1515
## Virtual machine extension details
1616
The Azure Monitor agent is implemented as an [Azure VM extension](../../virtual-machines/extensions/overview.md) with the details in the following table. It can be installed using any of the methods to install virtual machine extensions including those described in this article.

articles/cosmos-db/graph/create-graph-python.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ In this quickstart, you create and manage an Azure Cosmos DB Gremlin (graph) API
3232
You can also install the Python driver for Gremlin by using the `pip` command line:
3333

3434
```bash
35-
pip install gremlinpython
35+
pip install gremlinpython==3.4.13
3636
```
3737

3838
- [Git](https://git-scm.com/downloads).
3939

4040
> [!NOTE]
4141
> This quickstart requires a graph database account created after December 20, 2017. Existing accounts will support Python once they’re migrated to general availability.
4242
43+
> [!NOTE]
44+
> We currently recommend using gremlinpython==3.4.13 with Gremlin (Graph) API as we haven't fully tested all language-specific libraries of version 3.5.* for use with the service.
45+
4346
## Create a database account
4447

4548
Before you can create a graph database, you need to create a Gremlin (Graph) database account with Azure Cosmos DB.

articles/purview/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Azure Purview automates data discovery by providing data scanning and classifica
1919
|App |Description |
2020
|----------|-----------|
2121
|[Data Map](#data-map) | Makes your data meaningful by graphing your data assets, and their relationships, across your data estate. The data map used to discover data and manage access to that data. |
22-
|[Data Catalog](#data-catalog) | Find trusted data sources by browsing and searching your data assets. The data catalog aligns your assets with friendly business terms and data classification to identify data sources. |
22+
|[Data Catalog](#data-catalog) | Finds trusted data sources by browsing and searching your data assets. The data catalog aligns your assets with friendly business terms and data classification to identify data sources. |
2323
|[Data Insights](#data-insights) | Gives you an overview of your data estate to help you discover what kinds of data you have and where. |
2424

2525
## Data Map

articles/sentinel/hunting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ For more information, see [Use bookmarks in hunting](bookmarks.md).
151151

152152
When your hunting and investigations become more complex, use Microsoft Sentinel notebooks to enhance your activity with machine learning, visualizations, and data analysis.
153153

154-
Notebooks provide a kind of virtual sandbox, complete with it own kernel, where you can carry out a complete investigation. Your notebook can include the raw data, the code you run on that data, the results, and their visualizations. Save your notebooks so that you can share it with others to reuse in your organization.
154+
Notebooks provide a kind of virtual sandbox, complete with its own kernel, where you can carry out a complete investigation. Your notebook can include the raw data, the code you run on that data, the results, and their visualizations. Save your notebooks so that you can share it with others to reuse in your organization.
155155

156156
Notebooks may be helpful when your hunting or investigation becomes too large to remember easily, view details, or when you need to save queries and results. To help you create and share notebooks, Microsoft Sentinel provides [Jupyter Notebooks](https://jupyter.org), an open-source, interactive development and data manipulation environment, integrated directly in the Microsoft Sentinel **Notebooks** page.
157157

articles/storage/blobs/network-file-system-protocol-support-how-to.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,43 @@ Create a directory on your Linux system, and then mount the container in the sto
7575
1. On your Linux system, create a directory:
7676

7777
```
78-
mkdir -p /mnt/test
78+
mkdir -p /nfsdata
7979
```
8080

81-
2. Mount the container by using the following command:
81+
2. Mount the container by using one of the following methods. In both methods, replace the `<storage-account-name>` placeholder with the name of your storage account, and replace `<container-name>` with the name of your container.
8282

83-
```
84-
mount -o sec=sys,vers=3,nolock,proto=tcp <storage-account-name>.blob.core.windows.net:/<storage-account-name>/<container-name> /mnt/test
85-
```
83+
- To have the share mounted automatically on reboot:
8684

87-
- Replace the `<storage-account-name>` placeholder that appears in this command with the name of your storage account.
85+
1. Create an entry in the /etc/fstab file by adding the following line:
86+
87+
```
88+
<storage-account-name>.blob.core.windows.net:/<storage-account-name>/<container-name> /nfsdata nfs defaults,sec=sys,vers=3,nolock,proto=tcp,nofail 0 0
89+
```
8890
89-
- Replace the `<container-name>` placeholder with the name of your container.
91+
1. Run the following command to immediately process the /etc/fstab entries and attempt to mount the preceding path:
92+
93+
```
94+
mount /nfsdata
95+
```
96+
97+
- For a temporary mount that doesn't persist across reboots, run the following command:
98+
99+
```
100+
mount -o sec=sys,vers=3,nolock,proto=tcp <storage-account-name>.blob.core.windows.net:/<storage-account-name>/<container-name> /nfsdata
101+
```
90102
91103
## Resolve common errors
92104
93105
|Error | Cause/resolution|
94106
|---|---|
95107
|`Access denied by server while mounting`|Ensure that your client is running within a supported subnet. See [Supported network locations](network-file-system-protocol-support.md#supported-network-connections).|
96108
|`No such file or directory`| Make sure to type, rather than copy and paste, the mount command and its parameters directly into the terminal. If you copy and paste any part of this command into the terminal from another application, hidden characters in the pasted information might cause this error to appear. This error also might appear if the account isn't enabled for NFS 3.0.|
97-
|`Permission denied`| The default mode of a newly created NFS 3.0 container is 0750. Non-root users don't have access to the volume. If access from non-root users is required, root users must change the mode to 0755. Sample command: `sudo chmod 0755 /mnt/<newcontainer>`|
109+
|`Permission denied`| The default mode of a newly created NFS 3.0 container is 0750. Non-root users don't have access to the volume. If access from non-root users is required, root users must change the mode to 0755. Sample command: `sudo chmod 0755 /nfsdata`|
98110
|`EINVAL ("Invalid argument"`) |This error can appear when a client attempts to:<li>Write to a blob that was created from a blob endpoint.<li>Delete a blob that has a snapshot or is in a container that has an active WORM (write once, read many) policy.|
99111
|`EROFS ("Read-only file system"`) |This error can appear when a client attempts to:<li>Write to a blob or delete a blob that has an active lease.<li>Write to a blob or delete a blob in a container that has an active WORM policy. |
100112
|`NFS3ERR_IO/EIO ("Input/output error"`) |This error can appear when a client attempts to read, write, or set attributes on blobs that are stored in the archive access tier. |
101113
|`OperationNotSupportedOnSymLink` error| This error can be returned during a write operation via a Blob Storage or Azure Data Lake Storage Gen2 API. Using these APIs to write or delete symbolic links that are created by using NFS 3.0 is not allowed. Make sure to use the NFS 3.0 endpoint to work with symbolic links. |
102-
|`mount: /mnt/test: bad option;`| Install the NFS helper program by using `sudo apt install nfs-common`.|
114+
|`mount: /nfsdata: bad option;`| Install the NFS helper program by using `sudo apt install nfs-common`.|
103115
104116
## See also
105117

includes/iot-central-connection-configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
When you run the sample device application later in this tutorial, you need the following configuration values:
1414

15-
* ID scope: In your IoT Central application, navigate to **Administration > Device Connection**. Make a note of the **ID scope** value.
16-
* Group primary key: In your IoT Central application, navigate to **Administration > Device Connection > SAS-IoT-Devices**. Make a note of the shared access signature **Primary key** value.
15+
* ID scope: In your IoT Central application, navigate to **Permissions > Device connection groups**. Make a note of the **ID scope** value.
16+
* Group primary key: In your IoT Central application, navigate to **Permissions > Device connection groups > SAS-IoT-Devices**. Make a note of the shared access signature **Primary key** value.
1717

1818
Use the Cloud Shell to generate a device key from the group primary key you retrieved:
1919

0 commit comments

Comments
 (0)