Skip to content

Commit 84c957c

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents c8cbb95 + cd02672 commit 84c957c

File tree

19 files changed

+537
-350
lines changed

19 files changed

+537
-350
lines changed

articles/azure-cache-for-redis/cache-configure.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ You can view and configure the following settings using the **Resource Menu**.
3636
* [Advanced settings](#advanced-settings)
3737
* [Azure Cache for Redis Advisor](#azure-cache-for-redis-advisor)
3838
* [Scale](#scale)
39-
* [Redis cluster size](#cluster-size)
40-
* [Redis data persistence](#redis-data-persistence)
39+
* [Cluster size](#cluster-size)
40+
* [Data persistence](#redis-data-persistence)
4141
* [Schedule updates](#schedule-updates)
4242
* [Geo-replication](#geo-replication)
4343
* [Virtual Network](#virtual-network)
@@ -88,8 +88,8 @@ The **Settings** section allows you to access and configure the following settin
8888
* [Advanced settings](#advanced-settings)
8989
* [Azure Cache for Redis Advisor](#azure-cache-for-redis-advisor)
9090
* [Scale](#scale)
91-
* [Redis cluster size](#cluster-size)
92-
* [Redis data persistence](#redis-data-persistence)
91+
* [Cluster size](#cluster-size)
92+
* [Data persistence](#redis-data-persistence)
9393
* [Schedule updates](#schedule-updates)
9494
* [Geo-replication](#geo-replication)
9595
* [Virtual Network](#virtual-network)
@@ -197,14 +197,9 @@ Click **Scale** to view or change the pricing tier for your cache. For more info
197197
<a name="cluster-size"></a>
198198

199199
### Redis Cluster Size
200-
Click **(PREVIEW) Redis Cluster Size** to change the cluster size for a running premium cache with clustering enabled.
200+
Click **Cluster Size** to change the cluster size for a running premium cache with clustering enabled.
201201

202-
> [!NOTE]
203-
> Note that while the Azure Cache for Redis Premium tier has been released to General Availability, the Redis Cluster Size feature is currently in preview.
204-
>
205-
>
206-
207-
![Redis cluster size](./media/cache-configure/redis-cache-redis-cluster-size.png)
202+
![Cluster size](./media/cache-configure/redis-cache-redis-cluster-size.png)
208203

209204
To change the cluster size, use the slider or type a number between 1 and 10 in the **Shard count** text box and click **OK** to save.
210205

@@ -215,7 +210,7 @@ To change the cluster size, use the slider or type a number between 1 and 10 in
215210
216211

217212
### Redis data persistence
218-
Click **Redis data persistence** to enable, disable, or configure data persistence for your premium cache. Azure Cache for Redis offers Redis persistence using either [RDB persistence](cache-how-to-premium-persistence.md#configure-rdb-persistence) or [AOF persistence](cache-how-to-premium-persistence.md#configure-aof-persistence).
213+
Click **Data persistence** to enable, disable, or configure data persistence for your premium cache. Azure Cache for Redis offers Redis persistence using either [RDB persistence](cache-how-to-premium-persistence.md#configure-rdb-persistence) or [AOF persistence](cache-how-to-premium-persistence.md#configure-aof-persistence).
219214

220215
For more information, see [How to configure persistence for a Premium Azure Cache for Redis](cache-how-to-premium-persistence.md).
221216

articles/azure-cache-for-redis/cache-how-to-import-export-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Import/Export enables you to migrate between different Azure Cache for Redis ins
2020
This article provides a guide for importing and exporting data with Azure Cache for Redis and provides the answers to commonly asked questions.
2121

2222
> [!IMPORTANT]
23-
> Import/Export is in preview and is only available for [premium tier](cache-premium-tier-intro.md) caches.
23+
> Import/Export is only available for [premium tier](cache-premium-tier-intro.md) caches.
2424
>
2525
>
2626

articles/azure-cache-for-redis/cache-how-to-premium-clustering.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@ For sample code on working with clustering with the StackExchange.Redis client,
5252
<a name="cluster-size"></a>
5353

5454
## Change the cluster size on a running premium cache
55-
To change the cluster size on a running premium cache with clustering enabled, click **Redis Cluster Size** from the **Resource menu**.
56-
57-
> [!NOTE]
58-
> While the Azure Cache for Redis Premium tier has been released to General Availability, the Redis Cluster Size feature is currently in preview.
59-
>
60-
>
55+
To change the cluster size on a running premium cache with clustering enabled, click **Cluster Size** from the **Resource menu**.
6156

6257
![Redis cluster size][redis-cache-redis-cluster-size]
6358

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The steps in the next section describe how to configure Redis persistence on you
3838

3939
## Enable Redis persistence
4040

41-
Redis persistence is enabled on the **Redis data persistence** blade by choosing either **RDB** or **AOF** persistence. For new caches, this blade is accessed during the cache creation process, as described in the previous section. For existing caches, the **Redis data persistence** blade is accessed from the **Resource menu** for your cache.
41+
Redis persistence is enabled on the **Data persistence** blade by choosing either **RDB** or **AOF** persistence. For new caches, this blade is accessed during the cache creation process, as described in the previous section. For existing caches, the **Data persistence** blade is accessed from the **Resource menu** for your cache.
4242

4343
![Redis settings][redis-cache-settings]
4444

@@ -125,7 +125,7 @@ For both RDB and AOF persistence:
125125
* If you have scaled to a smaller size, and there isn't enough room in the smaller size to hold all of the data from the last backup, keys will be evicted during the restore process, typically using the [allkeys-lru](https://redis.io/topics/lru-cache) eviction policy.
126126

127127
### Can I change the RDB backup frequency after I create the cache?
128-
Yes, you can change the backup frequency for RDB persistence on the **Redis data persistence** blade. For instructions, see Configure Redis persistence.
128+
Yes, you can change the backup frequency for RDB persistence on the **Data persistence** blade. For instructions, see Configure Redis persistence.
129129

130130
### Why if I have an RDB backup frequency of 60 minutes there is more than 60 minutes between backups?
131131
The RDB persistence backup frequency interval does not start until the previous backup process has completed successfully. If the backup frequency is 60 minutes and it takes a backup process 15 minutes to successfully complete, the next backup won't start until 75 minutes after the start time of the previous backup.

articles/azure-monitor/app/ilogger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ApplicationInsightsLoggerProvider is enabled by default in [Microsoft.Applicatio
2525

2626
ILogger logs that ApplicationInsightsLoggerProvider captures are subject to the same configuration as any other telemetry that's collected. They have the same set of TelemetryInitializers and TelemetryProcessors, use the same TelemetryChannel, and are correlated and sampled in the same way as other telemetry. If you use version 2.7.1 or later, no action is required to capture ILogger logs.
2727

28-
Only *Warning* or higher ILogger logs (from all categories) are sent to Application Insights by default. But you can [apply filters to modify this behavior](#control-logging-level). Additional steps are required to capture ILogger logs from **Program.cs** or **Startup.cs**. (See [Capturing ILogger logs from Startup.cs and Program.cs in ASP.NET Core applications](#capture-ilogger-logs-from-startupcs-and-programcs-in-aspnet-core-apps).)
28+
Only *Warning* or higher ILogger logs (from all [categories](https://docs.microsoft.com/aspnet/core/fundamentals/logging/?view=aspnetcore-3.1#log-category)) are sent to Application Insights by default. But you can [apply filters to modify this behavior](#control-logging-level). Additional steps are required to capture ILogger logs from **Program.cs** or **Startup.cs**. (See [Capturing ILogger logs from Startup.cs and Program.cs in ASP.NET Core applications](#capture-ilogger-logs-from-startupcs-and-programcs-in-aspnet-core-apps).)
2929

3030
If you use an earlier version of Microsoft.ApplicationInsights.AspNet SDK or you want to just use ApplicationInsightsLoggerProvider without any other Application Insights monitoring, use the following procedure:
3131

articles/cognitive-services/Bing-Entities-Search/quickstarts/entity-sdk-node-quickstart.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: bing-entity-search
1111
ms.topic: quickstart
12-
ms.date: 12/11/2019
12+
ms.date: 01/22/2020
1313
ms.author: aahi
1414
---
1515

@@ -21,23 +21,23 @@ Use this quickstart to begin searching for entities with the Bing Entity Search
2121

2222
* The latest version of [Node.js](https://nodejs.org/en/download/).
2323

24-
* The [Bing Entity Search SDK for Node.js](https://www.npmjs.com/package/azure-cognitiveservices-entitysearch)
24+
* The [Bing Entity Search SDK for Node.js](https://www.npmjs.com/package/@azure/cognitiveservices-entitysearch)
2525

2626
To install the Bing Entity Search SDK:
2727

2828
1. Run `npm install ms-rest-azure` in your development environment.
29-
2. Run `npm install azure-cognitiveservices-entitysearch` in your development environment.
29+
2. Run `npm install @azure/cognitiveservices-entitysearch` in your development environment.
3030

3131
[!INCLUDE [cognitive-services-bing-news-search-signup-requirements](../../../../includes/cognitive-services-bing-entity-search-signup-requirements.md)]
3232

3333

3434
## Create and initialize the application
3535

36-
1. Create a new JavaScript file in your favorite IDE or editor, and add the following requirements.
37-
36+
1. Create a new JavaScript file in your favorite IDE or editor, and add the following requirements.
37+
3838
```javascript
3939
const CognitiveServicesCredentials = require('ms-rest-azure').CognitiveServicesCredentials;
40-
const EntitySearchAPIClient = require('azure-cognitiveservices-entitysearch');
40+
const EntitySearchAPIClient = require('@azure/cognitiveservices-entitysearch');
4141
```
4242

4343
2. Create an instance of `CognitiveServicesCredentials` using your subscription key. Then create an instance of the search client with it.
@@ -50,7 +50,7 @@ To install the Bing Entity Search SDK:
5050
## Send a request and receive a response
5151

5252
1. Send an entities search request with `entitiesOperations.search()`. After receiving a response, print out the `queryContext`, number of returned results, and the description of the first result.
53-
53+
5454
```javascript
5555
entitySearchApiClient.entitiesOperations.search('seahawks').then((result) => {
5656
console.log(result.queryContext);

articles/cognitive-services/Bing-Image-Search/image-search-sdk-node-quickstart.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: bing-image-search
1010
ms.topic: quickstart
11-
ms.date: 12/06/2019
11+
ms.date: 01/22/2020
1212
ms.author: aahi
1313
ms.custom: seodec2018
1414
---
@@ -21,8 +21,8 @@ The source code for this sample is available on [GitHub](https://github.com/Azur
2121

2222
## Prerequisites
2323

24-
* The [Cognitive Services Image Search SDK for Node.js](https://www.npmjs.com/package/azure-cognitiveservices-imagesearch)
25-
* Install using `npm install azure-cognitiveservices-imagesearch`
24+
* The [Cognitive Services Image Search SDK for Node.js](https://www.npmjs.com/package/@azure/cognitiveservices-imagesearch)
25+
* Install using `npm install @azure/cognitiveservices-imagesearch`
2626
* The [Node.js Azure Rest](https://www.npmjs.com/package/ms-rest-azure) module
2727
* Install using `npm install ms-rest-azure`
2828

@@ -34,7 +34,7 @@ The source code for this sample is available on [GitHub](https://github.com/Azur
3434

3535
```javascript
3636
'use strict';
37-
const ImageSearchAPIClient = require('azure-cognitiveservices-imagesearch');
37+
const ImageSearchAPIClient = require('@azure/cognitiveservices-imagesearch');
3838
const CognitiveServicesCredentials = require('ms-rest-azure').CognitiveServicesCredentials;
3939
```
4040

@@ -47,15 +47,15 @@ The source code for this sample is available on [GitHub](https://github.com/Azur
4747
//the search term for the request
4848
let searchTerm = "canadian rockies";
4949
50-
//instantiate the image search client
50+
//instantiate the image search client
5151
let credentials = new CognitiveServicesCredentials(serviceKey);
5252
let imageSearchApiClient = new ImageSearchAPIClient(credentials);
5353
5454
```
5555

5656
## Create an asynchronous helper function
5757

58-
1. Create a function to call the client asynchronously, and return the response from the Bing Image Search service.
58+
1. Create a function to call the client asynchronously, and return the response from the Bing Image Search service.
5959
```javascript
6060
//a helper function to perform an async call to the Bing Image Search API
6161
const sendQuery = async () => {
@@ -66,7 +66,7 @@ The source code for this sample is available on [GitHub](https://github.com/Azur
6666

6767
1. Call the helper function and handle its `promise` to parse the image results returned in the response.
6868

69-
If the response contains search results, store the first result and print out its details, such as a thumbnail URL, the original URL,along with the total number of returned images.
69+
If the response contains search results, store the first result and print out its details, such as a thumbnail URL, the original URL,along with the total number of returned images.
7070
```javascript
7171
sendQuery().then(imageResults => {
7272
if (imageResults == null) {
@@ -93,8 +93,8 @@ The source code for this sample is available on [GitHub](https://github.com/Azur
9393

9494
## See also
9595

96-
* [What is Bing Image Search?](https://docs.microsoft.com/azure/cognitive-services/bing-image-search/overview)
97-
* [Try an online interactive demo](https://azure.microsoft.com/services/cognitive-services/bing-image-search-api/)
96+
* [What is Bing Image Search?](https://docs.microsoft.com/azure/cognitive-services/bing-image-search/overview)
97+
* [Try an online interactive demo](https://azure.microsoft.com/services/cognitive-services/bing-image-search-api/)
9898
* [Get a free Cognitive Services access key](https://azure.microsoft.com/try/cognitive-services/?api=bing-image-search-api)
9999
* [Node.js samples for the Azure Cognitive Services SDK](https://github.com/Azure-Samples/cognitive-services-node-sdk-samples)
100100
* [Azure Cognitive Services Documentation](https://docs.microsoft.com/azure/cognitive-services)

articles/cognitive-services/Computer-vision/quickstarts-sdk/node-sdk.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ manager: nitinme
77
ms.service: cognitive-services
88
ms.subservice: computer-vision
99
ms.topic: quickstart
10-
ms.date: 12/05/2019
10+
ms.date: 01/22/2020
1111
ms.author: pafarley
1212
---
1313

1414
# Quickstart: Computer Vision client library for Node.js
1515

16-
Get started with the Computer Vision client library for Node.js. Follow these steps to install the package and try out the example code for basic tasks.
16+
Get started with the Computer Vision client library for Node.js. Follow these steps to install the package and try out the example code for basic tasks.
1717

1818
Use the Computer Vision client library for Node.js to:
1919

2020
* [Analyze an image](#analyze-an-image)
2121
* [Read printed and handwritten text](#read-printed-and-handwritten-text)
2222

23-
[Reference documentation](https://docs.microsoft.com/javascript/api/@azure/cognitiveservices-computervision/?view=azure-node-latest) | [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-computervision) | [Package (npm)](https://www.npmjs.com/package/azure-cognitiveservices-computervision) | [Samples](https://azure.microsoft.com/resources/samples/?service=cognitive-services&term=vision&sort=0)
23+
[Reference documentation](https://docs.microsoft.com/javascript/api/@azure/cognitiveservices-computervision/?view=azure-node-latest) | [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-computervision) | [Package (npm)](https://www.npmjs.com/package/@azure/cognitiveservices-computervision) | [Samples](https://azure.microsoft.com/resources/samples/?service=cognitive-services&term=vision&sort=0)
2424

2525
## Prerequisites
2626

@@ -33,28 +33,28 @@ Use the Computer Vision client library for Node.js to:
3333

3434
Azure Cognitive Services are represented by Azure resources that you subscribe to. Create a resource for Computer Vision using the [Azure portal](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account) or [Azure CLI](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account-cli) on your local machine. You can also:
3535

36-
* Get a [trial key](https://azure.microsoft.com/try/cognitive-services/#decision) valid for seven days for free. After you sign up, it will be available on the [Azure website](https://azure.microsoft.com/try/cognitive-services/my-apis/).
36+
* Get a [trial key](https://azure.microsoft.com/try/cognitive-services/#decision) valid for seven days for free. After you sign up, it will be available on the [Azure website](https://azure.microsoft.com/try/cognitive-services/my-apis/).
3737
* View your resource on the [Azure portal](https://portal.azure.com/).
3838

3939
After you get a key from your trial subscription or resource, [create environment variables](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account#configure-an-environment-variable-for-authentication) for the key and endpoint URL, named `COMPUTER_VISION_SUBSCRIPTION_KEY` and `COMPUTER_VISION_ENDPOINT` respectively.
40-
40+
4141
### Create a new Node.js application
4242

43-
In a console window (such as cmd, PowerShell, or Bash), create a new directory for your app, and navigate to it.
43+
In a console window (such as cmd, PowerShell, or Bash), create a new directory for your app, and navigate to it.
4444

4545
```console
4646
mkdir myapp && cd myapp
4747
```
4848

49-
Run the `npm init` command to create a node application with a `package.json` file.
49+
Run the `npm init` command to create a node application with a `package.json` file.
5050

5151
```console
5252
npm init
5353
```
5454

5555
### Install the client library
5656

57-
Install the `ms-rest-azure` and `azure-cognitiveservices-computervision` NPM packages:
57+
Install the `ms-rest-azure` and `@azure/cognitiveservices-computervision` NPM packages:
5858

5959
```console
6060
npm install @azure/cognitiveservices-computervision
@@ -172,11 +172,11 @@ The following code prints the detected presence of adult content in the image. S
172172

173173
Define the URL of the image to use:
174174

175-
[!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/ComputerVisionQuickstart.js?name=snippet_adult_image)]
175+
[!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/ComputerVisionQuickstart.js?name=snippet_adult_image)]
176176

177177
Then add the following code to detect adult content and print the results to the console.
178178

179-
[!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/ComputerVisionQuickstart.js?name=snippet_adult)]
179+
[!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/ComputerVisionQuickstart.js?name=snippet_adult)]
180180

181181
### Get image color scheme
182182

@@ -190,7 +190,7 @@ Define the helper function `printColorScheme` to print the details of the color
190190

191191
### Get domain-specific content
192192

193-
Computer Vision can use specialized model to do further analysis on images. See [Domain-specific content](../concept-detecting-domain-content.md) for more details.
193+
Computer Vision can use specialized model to do further analysis on images. See [Domain-specific content](../concept-detecting-domain-content.md) for more details.
194194

195195
First, define the URL of an image to analyze:
196196

0 commit comments

Comments
 (0)