Skip to content

Commit cf85090

Browse files
authored
Merge pull request #87196 from rimman/editsSept1
fix collection to container and refreshed dates
2 parents 646865a + 21c0a7e commit cf85090

11 files changed

+44
-43
lines changed

articles/cosmos-db/bulk-executor-dot-net.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: cosmos-db
66
ms.subservice: cosmosdb-sql
77
ms.devlang: dotnet
88
ms.topic: conceptual
9-
ms.date: 05/28/2019
9+
ms.date: 09/01/2019
1010
ms.author: ramkris
1111
ms.reviewer: sngun
1212
---
@@ -53,7 +53,7 @@ The "BulkImportSample" application generates random documents and bulk imports t
5353
private static readonly int CollectionThroughput = int.Parse(ConfigurationManager.AppSettings["CollectionThroughput"]);
5454
```
5555

56-
The bulk importer creates a new database and a collection with the database name, collection name, and throughput values specified in the App.config file.
56+
The bulk importer creates a new database and a container with the database name, container name, and throughput values specified in the App.config file.
5757

5858
3. Next the DocumentClient object is initialized with Direct TCP connection mode:
5959

articles/cosmos-db/cassandra-spark-generic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: sngun
77
ms.service: cosmos-db
88
ms.subservice: cosmosdb-cassandra
99
ms.topic: conceptual
10-
ms.date: 09/24/2018
10+
ms.date: 09/01/2019
1111

1212
---
1313

@@ -27,7 +27,7 @@ This article is one among a series of articles on Azure Cosmos DB Cassandra API
2727
* **Azure Cosmos DB helper library for Cassandra API:**
2828
In addition to the Spark connector, you need another library called [azure-cosmos-cassandra-spark-helper]( https://search.maven.org/artifact/com.microsoft.azure.cosmosdb/azure-cosmos-cassandra-spark-helper/1.0.0/jar) from Azure Cosmos DB. This library contains custom connection factory and retry policy classes.
2929

30-
The retry policy in Azure Cosmos DB is configured to handle HTTP status code 429("Request Rate Large") exceptions. The Azure Cosmos DB Cassandra API translates these exceptions into overloaded errors on the Cassandra native protocol, and you can retry with back-offs. Because Azure Cosmos DB uses provisioned throughput model, request rate limiting exceptions occur when the ingress/egress rates increase. The retry policy protects your spark jobs against data spikes that momentarily exceed the throughput allocated for your collection.
30+
The retry policy in Azure Cosmos DB is configured to handle HTTP status code 429("Request Rate Large") exceptions. The Azure Cosmos DB Cassandra API translates these exceptions into overloaded errors on the Cassandra native protocol, and you can retry with back-offs. Because Azure Cosmos DB uses provisioned throughput model, request rate limiting exceptions occur when the ingress/egress rates increase. The retry policy protects your spark jobs against data spikes that momentarily exceed the throughput allocated for your container.
3131

3232
> [!NOTE]
3333
> The retry policy can protect your spark jobs against momentary spikes only. If you have not configured enough RUs required to run your workload, then the retry policy is not applicable and the retry policy class rethrows the exception.

articles/cosmos-db/cosmos-db-azure-monitor-metrics.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: SnehaGunda
55
ms.author: sngun
66
ms.service: cosmos-db
77
ms.topic: conceptual
8-
ms.date: 06/18/2019
8+
ms.date: 09/01/2019
99
---
1010

1111
# Monitor and debug Azure Cosmos DB metrics from Azure Monitor
@@ -49,8 +49,8 @@ You can group metrics by using the **Apply splitting** option. For example, you
4949
5050
|Metric (Metric Display Name)|Unit (Aggregation Type) |Description|Dimensions| Time granularities| Legacy metric mapping | Usage |
5151
|---|---|---|---| ---| ---| ---|
52-
| TotalRequests (Total Requests) | Count (Count) | Number of requests made| DatabaseName, CollectionName, Region, StatusCode| All | TotalRequests, Http 2xx, Http 3xx, Http 400, Http 401, Internal Server error, Service Unavailable, Throttled Requests, Average Requests per Second | Used to monitor requests per status code, collection at a minute granularity. To get average requests per second, use Count aggregation at minute and divide by 60. |
53-
| MetadataRequests (Metadata Requests) |Count (Count) | Count of metadata requests. Azure Cosmos DB maintains system metadata collection for each account, that allows you to enumerate collections, databases, etc., and their configurations, free of charge. | DatabaseName, CollectionName, Region, StatusCode| All| |Used to monitor throttles due to metadata requests.|
52+
| TotalRequests (Total Requests) | Count (Count) | Number of requests made| DatabaseName, CollectionName, Region, StatusCode| All | TotalRequests, Http 2xx, Http 3xx, Http 400, Http 401, Internal Server error, Service Unavailable, Throttled Requests, Average Requests per Second | Used to monitor requests per status code, container at a minute granularity. To get average requests per second, use Count aggregation at minute and divide by 60. |
53+
| MetadataRequests (Metadata Requests) |Count (Count) | Count of metadata requests. Azure Cosmos DB maintains system metadata container for each account, that allows you to enumerate collections, databases, etc., and their configurations, free of charge. | DatabaseName, CollectionName, Region, StatusCode| All| |Used to monitor throttles due to metadata requests.|
5454
| MongoRequests (Mongo Requests) | Count (Count) | Number of Mongo Requests Made | DatabaseName, CollectionName, Region, CommandName, ErrorCode| All |Mongo Query Request Rate, Mongo Update Request Rate, Mongo Delete Request Rate, Mongo Insert Request Rate, Mongo Count Request Rate| Used to monitor Mongo request errors, usages per command type. |
5555

5656
### Request Unit metrics
@@ -59,17 +59,17 @@ You can group metrics by using the **Apply splitting** option. For example, you
5959
|---|---|---|---| ---| ---| ---|
6060
| MongoRequestCharge (Mongo Request Charge) | Count (Total) |Mongo Request Units Consumed| DatabaseName, CollectionName, Region, CommandName, ErrorCode| All |Mongo Query Request Charge, Mongo Update Request Charge, Mongo Delete Request Charge, Mongo Insert Request Charge, Mongo Count Request Charge| Used to monitor Mongo resource RUs in a minute.|
6161
| TotalRequestUnits (Total Request Units)| Count (Total) | Request Units consumed| DatabaseName, CollectionName, Region, StatusCode |All| TotalRequestUnits| Used to monitor Total RU usage at a minute granularity. To get average RU consumed per second, use Total aggregation at minute and divide by 60.|
62-
| ProvisionedThroughput (Provisioned Throughput)| Count (Maximum) |Provisioned throughput at collection granularity| DatabaseName, CollectionName| 5M| | Used to monitor provisioned throughput per collection.|
62+
| ProvisionedThroughput (Provisioned Throughput)| Count (Maximum) |Provisioned throughput at container granularity| DatabaseName, ContainerName| 5M| | Used to monitor provisioned throughput per container.|
6363

6464
### Storage metrics
6565

6666
|Metric (Metric Display Name)|Unit (Aggregation Type)|Description|Dimensions| Time granularities| Legacy metric mapping | Usage |
6767
|---|---|---|---| ---| ---| ---|
6868
| AvailableStorage (Available Storage) |Bytes (Total) | Total available storage reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M| Available Storage| Used to monitor available storage capacity (applicable only for fixed storage collections) Minimum granularity should be 5 minutes.|
69-
| DataUsage (Data Usage) |Bytes (Total) |Total data usage reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M |Data size | Used to monitor total data usage at collection and region, minimum granularity should be 5 minutes.|
70-
| IndexUsage (Index Usage) | Bytes (Total) |Total Index usage reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M| Index Size| Used to monitor total data usage at collection and region, minimum granularity should be 5 minutes. |
71-
| DocumentQuota (Document Quota) | Bytes (Total) | Total storage quota reported at 5-minutes granularity per region.| DatabaseName, CollectionName, Region| 5M |Storage Capacity| Used to monitor total quota at collection and region, minimum granularity should be 5 minutes.|
72-
| DocumentCount (Document Count) | Count (Total) |Total document count reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M |Document Count|Used to monitor document count at collection and region, minimum granularity should be 5 minutes.|
69+
| DataUsage (Data Usage) |Bytes (Total) |Total data usage reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M |Data size | Used to monitor total data usage at container and region, minimum granularity should be 5 minutes.|
70+
| IndexUsage (Index Usage) | Bytes (Total) |Total Index usage reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M| Index Size| Used to monitor total data usage at container and region, minimum granularity should be 5 minutes. |
71+
| DocumentQuota (Document Quota) | Bytes (Total) | Total storage quota reported at 5-minutes granularity per region.| DatabaseName, CollectionName, Region| 5M |Storage Capacity| Used to monitor total quota at container and region, minimum granularity should be 5 minutes.|
72+
| DocumentCount (Document Count) | Count (Total) |Total document count reported at 5-minutes granularity per region| DatabaseName, CollectionName, Region| 5M |Document Count|Used to monitor document count at container and region, minimum granularity should be 5 minutes.|
7373

7474
### Latency metrics
7575

articles/cosmos-db/create-cosmosdb-resources-portal.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: cosmos-db
77
ms.subservice: cosmosdb-sql
88
ms.devlang: dotnet
99
ms.topic: quickstart
10-
ms.date: 07/12/2019
10+
ms.date: 09/01/2019
1111
---
1212
# Quickstart: Create an Azure Cosmos account, container, and items with the Azure portal
1313

@@ -22,7 +22,7 @@ ms.date: 07/12/2019
2222
2323
Azure Cosmos DB is Microsoft’s globally distributed multi-model database service. You can use Azure Cosmos DB to quickly create and query key/value databases, document databases, and graph databases, all of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB.
2424

25-
This quickstart demonstrates how to use the Azure portal to create an Azure Cosmos DB [SQL API](sql-api-introduction.md) account, create a document database and collection, and add data to the collection.
25+
This quickstart demonstrates how to use the Azure portal to create an Azure Cosmos DB [SQL API](sql-api-introduction.md) account, create a document database and container, and add data to the container.
2626

2727
## Prerequisites
2828

@@ -36,24 +36,24 @@ An Azure subscription or free Azure Cosmos DB trial account
3636

3737
[!INCLUDE [cosmos-db-create-dbaccount](../../includes/cosmos-db-create-dbaccount.md)]
3838

39-
<a id="create-collection-database"></a>
40-
## Add a database and a collection
39+
<a id="create-container-database"></a>
40+
## Add a database and a container
4141

42-
You can use the Data Explorer in the Azure portal to create a database and collection.
42+
You can use the Data Explorer in the Azure portal to create a database and container.
4343

4444
1. Select **Data Explorer** from the left navigation on your Azure Cosmos DB account page, and then select **New Container**.
4545

4646
You may need to scroll right to see the **Add Container** window.
4747

48-
![The Azure portal Data Explorer, Add Collection pane](./media/create-sql-api-dotnet/azure-cosmosdb-data-explorer-dotnet.png)
48+
![The Azure portal Data Explorer, Add Container pane](./media/create-sql-api-dotnet/azure-cosmosdb-data-explorer-dotnet.png)
4949

50-
1. In the **Add container** pane, enter the settings for the new collection.
50+
1. In the **Add container** pane, enter the settings for the new container.
5151

5252
|Setting|Suggested value|Description
5353
|---|---|---|
5454
|**Database ID**|ToDoList|Enter *ToDoList* as the name for the new database. Database names must contain from 1 through 255 characters, and they cannot contain `/, \\, #, ?`, or a trailing space. Check the **Provision database throughput** option, it allows you to share the throughput provisioned to the database across all the containers within the database. This option also helps with cost savings. |
5555
|**Throughput**|400|Leave the throughput at 400 request units per second (RU/s). If you want to reduce latency, you can scale up the throughput later.|
56-
|**Container ID**|Items|Enter *Items* as the name for your new collection. Collection IDs have the same character requirements as database names.|
56+
|**Container ID**|Items|Enter *Items* as the name for your new container. Container IDs have the same character requirements as database names.|
5757
|**Partition key**| /category| The sample described in this article uses */category* as the partition key.|
5858

5959

articles/cosmos-db/databases-containers-items.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article describes how to create and use databases, containers,
44
author: rimman
55
ms.service: cosmos-db
66
ms.topic: conceptual
7-
ms.date: 07/26/2019
7+
ms.date: 09/01/2019
88
ms.author: rimman
99
ms.reviewer: sngun
1010

@@ -70,7 +70,7 @@ An Azure Cosmos container is specialized into API-specific entities as shown in
7070

7171
| Azure Cosmos entity | SQL API | Cassandra API | Azure Cosmos DB API for MongoDB | Gremlin API | Table API |
7272
| --- | --- | --- | --- | --- | --- |
73-
|Azure Cosmos container | Collection | Table | Collection | Graph | Table |
73+
|Azure Cosmos container | Container | Table | Collection | Graph | Table |
7474

7575
### Properties of an Azure Cosmos container
7676

0 commit comments

Comments
 (0)