Skip to content

Commit 581054d

Browse files
committed
Changed from AzFunc Subscriber to Custom Subscriber
1 parent 6e738f5 commit 581054d

File tree

4 files changed

+52
-94
lines changed

4 files changed

+52
-94
lines changed

articles/event-grid/edge/monitor-topics-subscriptions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ Both topics and event subscriptions emit metrics to give you insights into event
5757

5858
| Metric | Description |
5959
| ------ | ----------- |
60-
| deliverySuccessCounts | Number of events successfully delivered to the configured endpoint
61-
| deliveryFailureCounts | Number of event delivery attempts failed to the configured endpoint
62-
| deliverySuccessLatencyMs | Latency of events successfully delivered in milliseconds
63-
| deliveryFailureLatencyMs | Latency of events delivery failures in milliseconds
64-
| systemDelayForFirstAttemptMs | System delay of events before first delivery attempt in milliseconds
65-
| deliveryAttemptsCount | Number of event delivery attempts - success and failure
66-
| expiredCounts | Number of events unable to be delivered
60+
| DeliverySuccessCounts | Number of events successfully delivered to the configured endpoint
61+
| DeliveryFailureCounts | Number of events that failed to be delivered to the configured endpoint
62+
| DeliverySuccessLatencyMs | Latency of events successfully delivered in milliseconds
63+
| DeliveryFailureLatencyMs | Latency of events delivery failures in milliseconds
64+
| SystemDelayForFirstAttemptMs | System delay of events before first delivery attempt in milliseconds
65+
| DeliveryAttemptsCount | Number of event delivery attempts - success and failure
66+
| ExpiredCounts | Number of events that expired and were not delivered to the configured endpoint

articles/event-grid/edge/persist-state-linux.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ For example, the following configuration will result in the creation of the volu
4444
```json
4545
{
4646
"Env": [
47-
"inbound:serverAuth:tlsPolicy=strict",
48-
"inbound:serverAuth:serverCert:source=IoTEdge",
49-
"inbound:clientAuth:sasKeys:enabled=false",
50-
"inbound:clientAuth:clientCert:enabled=true",
51-
"inbound:clientAuth:clientCert:source=IoTEdge",
52-
"inbound:clientAuth:clientCert:allowUnknownCA=true",
53-
"outbound:clientAuth:clientCert:enabled=true",
54-
"outbound:clientAuth:clientCert:source=IoTEdge",
55-
"outbound:webhook:httpsOnly=true",
56-
"outbound:webhook:skipServerCertValidation=false",
57-
"outbound:webhook:allowUnknownCA=true"
47+
"inbound__serverAuth__tlsPolicy=strict",
48+
"inbound__serverAuth__serverCert__source=IoTEdge",
49+
"inbound__clientAuth__sasKeys__enabled=false",
50+
"inbound__clientAuth__clientCert__enabled=true",
51+
"inbound__clientAuth__clientCert__source=IoTEdge",
52+
"inbound__clientAuth__clientCert__allowUnknownCA=true",
53+
"outbound__clientAuth__clientCert__enabled=true",
54+
"outbound__clientAuth__clientCert__source=IoTEdge",
55+
"outbound__webhook__httpsOnly=true",
56+
"outbound__webhook__skipServerCertValidation=false",
57+
"outbound__webhook__allowUnknownCA=true"
5858
],
5959
"HostConfig": {
6060
"Binds": [
@@ -122,17 +122,17 @@ Instead of a docker volume, you also have the option to mount a host folder.
122122
```json
123123
{
124124
"Env": [
125-
"inbound:serverAuth:tlsPolicy=strict",
126-
"inbound:serverAuth:serverCert:source=IoTEdge",
127-
"inbound:clientAuth:sasKeys:enabled=false",
128-
"inbound:clientAuth:clientCert:enabled=true",
129-
"inbound:clientAuth:clientCert:source=IoTEdge",
130-
"inbound:clientAuth:clientCert:allowUnknownCA=true",
131-
"outbound:clientAuth:clientCert:enabled=true",
132-
"outbound:clientAuth:clientCert:source=IoTEdge",
133-
"outbound:webhook:httpsOnly=true",
134-
"outbound:webhook:skipServerCertValidation=false",
135-
"outbound:webhook:allowUnknownCA=true"
125+
"inbound__serverAuth__tlsPolicy=strict",
126+
"inbound__serverAuth__serverCert__source=IoTEdge",
127+
"inbound__clientAuth__sasKeys__enabled=false",
128+
"inbound__clientAuth__clientCert__enabled=true",
129+
"inbound__clientAuth__clientCert__source=IoTEdge",
130+
"inbound__clientAuth__clientCert__allowUnknownCA=true",
131+
"outbound__clientAuth__clientCert__enabled=true",
132+
"outbound__clientAuth__clientCert__source=IoTEdge",
133+
"outbound__webhook__httpsOnly=true",
134+
"outbound__webhook__skipServerCertValidation=false",
135+
"outbound__webhook__allowUnknownCA=true"
136136
],
137137
"HostConfig": {
138138
"Binds": [

articles/event-grid/edge/pub-sub-events-webhook-local.md

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ A deployment manifest is a JSON document that describes which modules to deploy,
5959
```json
6060
{
6161
"Env": [
62-
"inbound__clientAuth__clientCert__enabled=false",
63-
"outbound__webhook__httpsOnly=false"
62+
"inbound__clientAuth__clientCert__enabled=false"
6463
],
6564
"HostConfig": {
6665
"PortBindings": {
@@ -74,21 +73,17 @@ A deployment manifest is a JSON document that describes which modules to deploy,
7473
}
7574
```
7675
1. Click **Save**
77-
1. Continue to the next section to add the Azure Functions module before deploying them together.
76+
1. Continue to the next section to add the Azure Event Grid Subscriber module before deploying them together.
7877

7978
>[!IMPORTANT]
80-
> In this tutorial, you will deploy the Event Grid module with client authentication disabled and allow HTTP subscribers. For production workloads, we recommend that you enable the client authentication and allow only HTTPs subscribers. For more information on how to configure Event Grid module securely, see [Security and authentication](security-authentication.md).
79+
> In this tutorial, you will deploy the Event Grid module with client authentication disabled. For production workloads, we recommend that you enable the client authentication. For more information on how to configure Event Grid module securely, see [Security and authentication](security-authentication.md).
8180
>
8281
> If you are using an Azure VM as an edge device, add an inbound port rule to allow inbound traffic on the port 4438. For instructions on adding the rule, see [How to open ports to a VM](../../virtual-machines/windows/nsg-quickstart-portal.md).
8382

8483

85-
## Deploy Azure Function IoT Edge module
86-
87-
This section shows you how to deploy the Azure Functions IoT module, which would act as an Event Grid subscriber to which events can be delivered.
88-
89-
>[!IMPORTANT]
90-
>In this section, you will deploy a sample Azure Function-based subscribing module. It can of course be any custom IoT Module that can listen for HTTP POST requests.
84+
## Deploy Event Grid Subscriber IoT Edge module
9185

86+
This section shows you how to deploy another IoT module which would act as an event handler to which events can be delivered.
9287

9388
### Add modules
9489

@@ -97,23 +92,8 @@ This section shows you how to deploy the Azure Functions IoT module, which would
9792
1. Provide the name, image, and container create options of the container:
9893

9994
* **Name**: subscriber
100-
* **Image URI**: `mcr.microsoft.com/azure-event-grid/iotedge-samplesubscriber-azfunc:latest`
101-
* **Container Create Options**:
102-
103-
```json
104-
{
105-
"HostConfig": {
106-
"PortBindings": {
107-
"80/tcp": [
108-
{
109-
"HostPort": "8080"
110-
}
111-
]
112-
}
113-
}
114-
}
115-
```
116-
95+
* **Image URI**: `mcr.microsoft.com/azure-event-grid/iotedge-samplesubscriber:latest`
96+
* **Container Create Options**: None
11797
1. Click **Save**
11898
1. Click **Next** to continue to the routes section
11999

@@ -186,15 +166,15 @@ Subscribers can register for events published to a topic. To receive any event,
186166
"destination": {
187167
"endpointType": "WebHook",
188168
"properties": {
189-
"endpointUrl": "http://subscriber:80/api/subscriber"
169+
"endpointUrl": "https://subscriber:4430"
190170
}
191171
}
192172
}
193173
}
194174
```
195175

196176
>[!NOTE]
197-
> The **endpointType** property specifies that the subscriber is a **Webhook**. The **endpointUrl** specifies the URL at which the subscriber is listening for events. This URL corresponds to the Azure Function sample you deployed earlier.
177+
> The **endpointType** property specifies that the subscriber is a **Webhook**. The **endpointUrl** specifies the URL at which the subscriber is listening for events. This URL corresponds to the Azure Subscriber sample you deployed earlier.
198178
2. Run the following command to create a subscription for the topic. Confirm that you see the HTTP status code is `200 OK`.
199179

200180
```sh
@@ -218,7 +198,7 @@ Subscribers can register for events published to a topic. To receive any event,
218198
"destination": {
219199
"endpointType": "WebHook",
220200
"properties": {
221-
"endpointUrl": "http://subscriber:80/api/subscriber"
201+
"endpointUrl": "https://subscriber:4430"
222202
}
223203
}
224204
}
@@ -270,7 +250,7 @@ Subscribers can register for events published to a topic. To receive any event,
270250
Sample output:
271251

272252
```sh
273-
Received event data [
253+
Received Event:
274254
{
275255
"id": "eventId-func-0",
276256
"topic": "sampleTopic1",
@@ -284,7 +264,6 @@ Subscribers can register for events published to a topic. To receive any event,
284264
"model": "Monster"
285265
}
286266
}
287-
]
288267
```
289268

290269
## Cleanup resources

articles/event-grid/edge/react-blob-storage-events-locally.md

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ A deployment manifest is a JSON document that describes which modules to deploy,
5757
```json
5858
{
5959
"Env": [
60-
"inbound:serverAuth:tlsPolicy=enabled",
61-
"inbound:clientAuth:clientCert:enabled=false",
62-
"outbound:webhook:httpsOnly=false"
60+
"inbound__serverAuth__tlsPolicy=enabled",
61+
"inbound__clientAuth__clientCert__enabled=false"
6362
],
6463
"HostConfig": {
6564
"PortBindings": {
@@ -74,18 +73,15 @@ A deployment manifest is a JSON document that describes which modules to deploy,
7473
```
7574

7675
1. Click **Save**
77-
1. Continue to the next section to add the Azure Functions module
76+
1. Continue to the next section to add the Azure Event Grid Subscriber module before deploying them together.
7877

7978
>[!IMPORTANT]
80-
> In this tutorial, you will learn to deploy the Event Grid module to allow both HTTP/HTTPs requests, client authentication disabled and allow HTTP subscribers. For production workloads, we recommend that you enable only HTTPs requests and subscribers with client authentication enabled. For more information on how to configure Event Grid module securely, see [Security and authentication](security-authentication.md).
79+
> In this tutorial, you will learn to deploy the Event Grid module to allow both HTTP/HTTPs requests, client authentication disabled. For production workloads, we recommend that you enable only HTTPs requests and subscribers with client authentication enabled. For more information on how to configure Event Grid module securely, see [Security and authentication](security-authentication.md).
8180

8281

83-
## Deploy Azure Function IoT Edge module
82+
## Deploy Event Grid Subscriber IoT Edge module
8483

85-
This section shows you how to deploy the Azure Functions IoT module, which would act as an Event Grid subscriber to which events can be delivered.
86-
87-
>[!IMPORTANT]
88-
>In this section, you will deploy a sample Azure Function-based subscribing module. It can of course be any custom IoT Module that can listen for HTTP POST requests.
84+
This section shows you how to deploy another IoT module which would act as an event handler to which events can be delivered.
8985

9086
### Add modules
9187

@@ -94,23 +90,8 @@ This section shows you how to deploy the Azure Functions IoT module, which would
9490
1. Provide the name, image, and container create options of the container:
9591

9692
* **Name**: subscriber
97-
* **Image URI**: `mcr.microsoft.com/azure-event-grid/iotedge-samplesubscriber-azfunc:latest`
98-
* **Container Create Options**:
99-
100-
```json
101-
{
102-
"HostConfig": {
103-
"PortBindings": {
104-
"80/tcp": [
105-
{
106-
"HostPort": "8080"
107-
}
108-
]
109-
}
110-
}
111-
}
112-
```
113-
93+
* **Image URI**: `mcr.microsoft.com/azure-event-grid/iotedge-samplesubscriber:latest`
94+
* **Container Create Options**: None
11495
1. Click **Save**
11596
1. Continue to the next section to add the Azure Blob Storage module
11697

@@ -222,7 +203,7 @@ Keep the default routes, and select **Next** to continue to the review section
222203
"destination": {
223204
"endpointType": "WebHook",
224205
"properties": {
225-
"endpointUrl": "http://subscriber:80/api/subscriber"
206+
"endpointUrl": "https://subscriber:4430"
226207
}
227208
}
228209
}
@@ -261,7 +242,7 @@ Keep the default routes, and select **Next** to continue to the review section
261242
"destination": {
262243
"endpointType": "WebHook",
263244
"properties": {
264-
"endpointUrl": "http://subscriber:80/api/subscriber"
245+
"endpointUrl": "https://subscriber:4430"
265246
}
266247
}
267248
}
@@ -284,7 +265,7 @@ Keep the default routes, and select **Next** to continue to the review section
284265
Sample Output:
285266
286267
```json
287-
Received event data [
268+
Received Event:
288269
{
289270
"id": "d278f2aa-2558-41aa-816b-e6d8cc8fa140",
290271
"topic": "MicrosoftStorage",
@@ -304,7 +285,6 @@ Keep the default routes, and select **Next** to continue to the review section
304285
"blobType": "BlockBlob"
305286
}
306287
}
307-
]
308288
```
309289
310290
### Verify BlobDeleted event delivery
@@ -315,7 +295,7 @@ Keep the default routes, and select **Next** to continue to the review section
315295
Sample Output:
316296
317297
```json
318-
Received event data [
298+
Received Event:
319299
{
320300
"id": "ac669b6f-8b0a-41f3-a6be-812a3ce6ac6d",
321301
"topic": "MicrosoftStorage",
@@ -335,7 +315,6 @@ Keep the default routes, and select **Next** to continue to the review section
335315
"blobType": "BlockBlob"
336316
}
337317
}
338-
]
339318
```
340319
341320
Congratulations! You have completed the tutorial. The following sections provide details on the event properties.

0 commit comments

Comments
 (0)