Skip to content

Commit a81b813

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into diskPoolsDeco
2 parents 7ff9970 + 3af1d41 commit a81b813

File tree

19 files changed

+583
-244
lines changed

19 files changed

+583
-244
lines changed

articles/active-directory/conditional-access/location-condition.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Conditional Access policies are at their most basic an if-then statement combini
2121

2222
![Conceptual Conditional signal plus decision to get enforcement](./media/location-condition/conditional-access-signal-decision-enforcement.png)
2323

24+
> [!IMPORTANT]
25+
> [IPv6 is coming to Azure Active Directory (Azure AD)](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/ipv6-coming-to-azure-ad/ba-p/2967451). We will begin introducing IPv6 support into Azure AD services in a phased approach, starting April 3, 2023. Organizations that use named locations in Conditional Access or Identity Protection must [take action to avoid possible service impact](/troubleshoot/azure/active-directory/azure-ad-ipv6-support#what-does-my-organization-have-to-do).
26+
2427
Organizations can use this location for common tasks like:
2528

2629
- Requiring multifactor authentication for users accessing a service when they're off the corporate network.
@@ -75,7 +78,7 @@ To define a named location by country, you need to provide:
7578

7679
![Country as a location in the Azure portal](./media/location-condition/new-named-location-country-region.png)
7780

78-
If you select **Determine location by IP address**, the system collects the IP address of the device the user is signing into. When a user signs in, Azure AD resolves the user's IPv4 or [IPv6](/troubleshoot/azure/active-directory/azure-ad-ipv6-support) address to a country or region, and the mapping updates periodically. Organizations can use named locations defined by countries to block traffic from countries where they don't do business.
81+
If you select **Determine location by IP address**, the system collects the IP address of the device the user is signing into. When a user signs in, Azure AD resolves the user's IPv4 or [IPv6](/troubleshoot/azure/active-directory/azure-ad-ipv6-support) address (starting April 3, 2023) to a country or region, and the mapping updates periodically. Organizations can use named locations defined by countries to block traffic from countries where they don't do business.
7982

8083
If you select **Determine location by GPS coordinates**, the user needs to have the Microsoft Authenticator app installed on their mobile device. Every hour, the system contacts the user’s Microsoft Authenticator app to collect the GPS location of the user’s mobile device.
8184

@@ -130,7 +133,7 @@ With this option, you can select one or more named locations. For a policy with
130133

131134
## IPv6 traffic
132135

133-
Conditional Access policies apply to all IPv4 **and** IPv6 traffic.
136+
Conditional Access policies apply to all IPv4 **and** [IPv6](/troubleshoot/azure/active-directory/azure-ad-ipv6-support) traffic (starting April 3, 2023).
134137

135138
### Identifying IPv6 traffic with Azure AD Sign-in activity reports
136139

articles/communication-services/concepts/numbers/sub-eligibility-number-capability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Additional details on eligible subscription types are as follows:
2828
| Toll-Free and Local (Geographic) | Modern Customer Agreement (Field and Customer Led), Modern Partner Agreement (CSP), Enterprise Agreement*, Pay-As-You-Go |
2929
| Short-Codes | Modern Customer Agreement (Field Led), Enterprise Agreement**, Pay-As-You-Go |
3030

31-
\* In some countries, number purchases are only allowed for own use. Re-selling or sub-allcoating to another parties is not allowed.
31+
\* In some countries, number purchases are only allowed for own use. Reselling or suballcoating to another parties is not allowed. Due to this purchases for CSP and LSP customers is not allowed.
3232

3333
\** Applications from all other subscription types will be reviewed and approved on a case-by-case basis. Please reach out to [email protected] for assistance with your application.
3434

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,89 @@
11
### YamlMime:Landing
22

33
title: Azure Cosmos DB for Apache Cassandra documentation
4-
summary: Azure Cosmos DB for Apache Cassandra accounts provide support for storing data for apps written for Apache Cassandra.
4+
summary: Azure Cosmos DB for Apache Cassandra accounts provides support for storing data for apps written for Apache Cassandra.
55

66
metadata:
7-
title: Azure Cosmos DB for Apache Cassandra documentation
8-
description: Azure Cosmos DB for Apache Cassandra accounts provide support for storing data for apps written for Apache Cassandra.
9-
services: service
7+
title: Azure Cosmos DB for Apache Cassandra documentation
8+
description: Azure Cosmos DB for Apache Cassandra accounts provides support for storing data for apps written for Apache Cassandra.
9+
services: cosmos-db
10+
author: seesharprun
11+
ms.author: sidandrews
12+
ms.reviewer: markjbrown
1013
ms.service: cosmos-db
1114
ms.subservice: apache-cassandra
12-
ms.custom: ignite-2022
1315
ms.topic: landing-page
1416
ms.collection: collection
15-
author: seesharprun
16-
ms.author: sidandrews
17-
ms.reviewer: markjbrown
18-
ms.date: 05/24/2022
17+
ms.date: 02/28/2023
18+
ms.custom: ignite-2022
1919
landingContent:
20-
- title: Use Azure Cosmos DB for Apache Cassandra
20+
- title: About API for Cassandra
2121
linkLists:
2222
- linkListType: overview
2323
links:
2424
- text: What is Azure Cosmos DB for Apache Cassandra?
2525
url: introduction.md
26-
- linkListType: quickstart
27-
links:
28-
- text: Manage your data using a .NET Core app
29-
url: manage-data-dotnet-core.md
30-
- text: Manage your data using a Java app
31-
url: manage-data-java-v4-sdk.md
3226
- linkListType: concept
33-
links:
27+
links:
3428
- text: Wire protocol compatibility with Apache Cassandra
35-
url: support.md
29+
url: support.md
3630
- text: Elastic scaling
37-
url: scale-account-throughput.md
31+
url: scale-account-throughput.md
3832
- text: Secondary indexes
39-
url: secondary-indexing.md
40-
- text: Partitioning
41-
url: partitioning.md
33+
url: secondary-indexing.md
34+
- text: Partitioning
35+
url: partitioning.md
36+
- title: Get started
37+
linkLists:
38+
- linkListType: quickstart
39+
links:
40+
- text: Manage your data using a .NET Core app
41+
url: manage-data-dotnet-core.md
42+
- text: Manage your data using a Java app
43+
url: manage-data-java-v4-sdk.md
44+
- linkListType: tutorial
45+
links:
46+
- text: Create account and resources
47+
url: create-account-java.md
48+
- text: Load sample data
49+
url: load-data-table.md
50+
- text: Query data
51+
url: query-data.md
52+
- text: text
53+
url: migrate-data.md
4254
- linkListType: how-to-guide
4355
links:
4456
- text: From Apache Cassandra to API for Cassandra
45-
url: adoption.md
57+
url: adoption.md
4658
- text: Connect to API for Cassandra from Spark
47-
url: connect-spark-configuration.md
59+
url: connect-spark-configuration.md
4860
- text: Change feed support with query predicates
4961
url: change-feed.md
62+
- title: Integrate with Apache Spark
63+
linkLists:
64+
- linkListType: how-to-guide
65+
links:
66+
- text: Connect to Spark
67+
url: connect-spark-configuration.md
68+
- text: Access from Azure Databricks
69+
url: spark-databricks.md
70+
- text: Access from HDInsight
71+
url: spark-hdinsight.md
72+
- title: Migrate existing Apache Cassandra data
73+
linkLists:
74+
- linkListType: architecture
75+
links:
76+
- text: Differences between platforms
77+
url: adoption.md
78+
- linkListType: how-to-guide
79+
links:
80+
- text: Migrate using Kafka Connect
81+
url: kafka-connect.md
82+
- text: Migrate using Azure Databricks
83+
url: migrate-data-databricks.md
84+
- linkListType: how-to-guide
85+
links:
86+
- text: Migrate from PostgreSQL using Apache Kafka
87+
url: postgres-migrate-cosmos-db-kafka.md
88+
- text: Migrate from Oracle DB to API for Striim
89+
url: migrate-data-striim.md

articles/cosmos-db/gremlin/index.yml

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,71 @@ summary: Azure Cosmos DB for Gremlin provides a graph database service via the A
55

66
metadata:
77
title: Azure Cosmos DB for Gremlin documentation
8-
description: Azure Cosmos DB for Gremlin provides a graph database service via the API for Gremlin on a fully managed database service designed for any scale.
9-
services: service
8+
description: Azure Cosmos DB for Gremlin provides a graph database service via the API for Gremlin on a fully managed database service designed for any scale.
9+
services: cosmos-db
10+
author: seesharprun
11+
ms.author: sidandrews
12+
ms.reviewer: markjbrown
1013
ms.service: cosmos-db
1114
ms.subservice: apache-gremlin
12-
ms.custom: ignite-2022
1315
ms.topic: landing-page
1416
ms.collection: collection
15-
author: seesharprun
16-
ms.author: sidandrews
17-
ms.reviewer: markjbrown
18-
ms.date: 05/24/2022
17+
ms.date: 02/28/2023
18+
ms.custom: ignite-2022
1919
landingContent:
20-
- title: Use Azure Cosmos DB for Gremlin
20+
- title: About API for Gremlin
2121
linkLists:
2222
- linkListType: overview
2323
links:
2424
- text: What is Azure Cosmos DB for Gremlin?
2525
url: introduction.md
26+
- text: Wire protocol compatibility with Tinkerpop
27+
url: support.md
28+
- text: FAQ
29+
url: gremlin-api-faq.yml
30+
- linkListType: concept
31+
links:
32+
- text: Wire protocol compatibility
33+
url: support.md
34+
- text: API for Gremlin service limits
35+
url: limits.md
36+
- title: Get started
37+
linkLists:
2638
- linkListType: quickstart
2739
links:
2840
- text: Manage your data using using Gremlin Console
2941
url: quickstart-console.md
3042
- text: Manage your data using a .NET app
31-
url: quickstart-dotnet.md
32-
- linkListType: concept
33-
links:
34-
- text: Wire protocol compatibility with Tinkerpop’s Gremlin
35-
url: support.md
36-
- text: API for Gremlin service limits
37-
url: limits.md
43+
url: quickstart-dotnet.md
44+
- text: Manage your data using a Python app
45+
url: quickstart-python.md
46+
- linkListType: tutorial
47+
links:
48+
- text: Query using Gremlin
49+
url: tutorial-query.md
3850
- linkListType: how-to-guide
3951
links:
4052
- text: Graph data modeling
4153
url: modeling.md
42-
- text: Graph data partitioning best practices
54+
- text: Graph data partitioning best practices
4355
url: partitioning.md
4456
- text: Optimize Gremlin queries
4557
url: execution-profile.md
58+
- title: Migrate data
59+
linkLists:
60+
- linkListType: how-to-guide
61+
links:
62+
- text: Import data using a bulk executor library
63+
url: bulk-executor-dotnet.md
64+
- title: Integrate with other solutions
65+
linkLists:
66+
- linkListType: how-to-guide
67+
links:
68+
- text: Third-party data visualization tools
69+
url: visualization-partners.md
70+
- text: Third-party data modeling tools
71+
url: modeling-tools.md
72+
- linkListType: sample
73+
links:
74+
- text: Solution for supply chain traceability
75+
url: supply-chain-traceability-solution.md

articles/cosmos-db/how-to-setup-rbac.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,13 @@ This table lists all the actions exposed by the permission model.
7171
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/upsert` | "Upsert" an item. This operation creates an item if it doesn't already exist, or to replace the item if it does exist. |
7272
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/items/delete` | Delete an item. |
7373
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/executeQuery` | Execute a [SQL query](nosql/query/getting-started.md). |
74-
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readChangeFeed` | Read from the container's [change feed](read-change-feed.md). |
74+
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readChangeFeed` | Read from the container's [change feed](read-change-feed.md). Execute [SQL queries](nosql/query/getting-started.md) using the SDKs. |
7575
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/executeStoredProcedure` | Execute a [stored procedure](stored-procedures-triggers-udfs.md). |
7676
| `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/manageConflicts` | Manage [conflicts](conflict-resolution-policies.md) for multi-write region accounts (that is, list and delete items from the conflict feed). |
7777

78+
> [!NOTE]
79+
> When executing queries through the SDKs, both `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/executeQuery` and `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readChangeFeed` permissions are required.
80+
7881
Wildcards are supported at both *containers* and *items* levels:
7982

8083
- `Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/*`

0 commit comments

Comments
 (0)