Skip to content

Commit 73a6133

Browse files
authored
Merge pull request #106497 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d154e3b + 7352c5b commit 73a6133

File tree

4 files changed

+60
-28
lines changed

4 files changed

+60
-28
lines changed

articles/azure-cache-for-redis/cache-nodejs-get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,15 @@ Don't create a new connections for each operation in your code. Instead, reuse c
5151

5252
## Create a new Node.js app
5353

54-
Create a new script file named *redistest.js*.
54+
Create a new script file named *redistest.js*. Use the command `npm install redis bluebird` to install required packages.
5555

5656
Add the following example JavaScript to the file. This code shows you how to connect to an Azure Cache for Redis instance using the cache host name and key environment variables. The code also stores and retrieves a string value in the cache. The `PING` and `CLIENT LIST` commands are also executed. For more examples of using Redis with the [node_redis](https://github.com/mranney/node_redis) client, see [https://redis.js.org/](https://redis.js.org/).
5757

5858
```js
5959
var redis = require("redis");
6060
var bluebird = require("bluebird");
6161

62+
// Convert Redis client API to use promises, to make it usable with async/await syntax
6263
bluebird.promisifyAll(redis.RedisClient.prototype);
6364
bluebird.promisifyAll(redis.Multi.prototype);
6465

articles/event-grid/event-schema.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ For example, the schema published for an Azure Blob storage event is:
7979

8080
All events have the same following top-level data:
8181

82-
| Property | Type | Description |
83-
| -------- | ---- | ----------- |
84-
| topic | string | Full resource path to the event source. This field isn't writeable. Event Grid provides this value. |
85-
| subject | string | Publisher-defined path to the event subject. |
86-
| eventType | string | One of the registered event types for this event source. |
87-
| eventTime | string | The time the event is generated based on the provider's UTC time. |
88-
| id | string | Unique identifier for the event. |
89-
| data | object | Event data specific to the resource provider. |
90-
| dataVersion | string | The schema version of the data object. The publisher defines the schema version. |
91-
| metadataVersion | string | The schema version of the event metadata. Event Grid defines the schema of the top-level properties. Event Grid provides this value. |
82+
| Property | Type | Required | Description |
83+
| -------- | ---- | -------- | ----------- |
84+
| topic | string | No, but if included, must match the Event Grid topic Azure Resource Manager ID exactly. If not included, Event Grid will stamp onto the event. | Full resource path to the event source. This field isn't writeable. Event Grid provides this value. |
85+
| subject | string | Yes | Publisher-defined path to the event subject. |
86+
| eventType | string | Yes | One of the registered event types for this event source. |
87+
| eventTime | string | Yes | The time the event is generated based on the provider's UTC time. |
88+
| id | string | Yes | Unique identifier for the event. |
89+
| data | object | No | Event data specific to the resource provider. |
90+
| dataVersion | string | No, but will be stamped with an empty value. | The schema version of the data object. The publisher defines the schema version. |
91+
| metadataVersion | string | Not required, but if included, must match the Event Grid Schema `metadataVersion` exactly (currently, only `1`). If not included, Event Grid will stamp onto the event. | The schema version of the event metadata. Event Grid defines the schema of the top-level properties. Event Grid provides this value. |
9292

9393
To learn about the properties in the data object, see the event source:
9494

0 commit comments

Comments
 (0)