Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added properties for Message Enrichments to Iot Hub Routing Propertie… #1

Merged
merged 2 commits into from
Apr 8, 2019
Merged

Added properties for Message Enrichments to Iot Hub Routing Propertie… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
548044f
Added properties for Message Enrichments to Iot Hub Routing Propertie…
kapil-ms Apr 8, 2019
0ca5f68
Feedback
kapil-ms Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 88 additions & 90 deletions ...crosoft.Devices/preview/2019-03-22-preview/examples/IotHub_CustomerInitiatedFailover.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,90 @@
{
"parameters": {
"iotHubName": "testHub",
"resourceGroupName": "myResourceGroup",
"api-version": "2019-03-22-preview",
"subscriptionId": "91d12660-3dec-467a-be2a-213b5544ddc0",
"failoverInput": {
"failoverRegion": "EASTUS2EUAP"
"parameters": {
"iotHubName": "testHub",
"resourceGroupName": "myResourceGroup",
"api-version": "2019-03-22-preview",
"subscriptionId": "91d12660-3dec-467a-be2a-213b5544ddc0",
"failoverInput": {
"failoverRegion": "EASTUS2EUAP"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/ae24ff83-d2ca-4fc8-9717-05dae4bba489/resourceGroups/myResourceGroup/providers/Microsoft.Devices/IotHubs/testHub",
"name": "testHub",
"type": "Microsoft.Devices/IotHubs",
"location": "centraluseuap",
"tags": {},
"etag": "AAAAAAFD6M4=",
"properties": {
"state": "Active",
"provisioningState": "Succeeded",
"ipFilterRules": [],
"hostName": "iot-dps-cit-hub-1.azure-devices.net",
"eventHubEndpoints": {
"events": {
"retentionTimeInDays": 1,
"partitionCount": 2,
"partitionIds": [
"0",
"1"
],
"path": "iot-dps-cit-hub-1",
"endpoint": "sb://iothub-ns-iot-dps-ci-245306-76aca8e13b.servicebus.windows.net/"
}
},
"routing": {
"endpoints": {
"serviceBusQueues": [],
"serviceBusTopics": [],
"eventHubs": [],
"storageContainers": []
},
"routes": [],
"fallbackRoute": {
"name": "$fallback",
"source": "DeviceMessages",
"condition": "true",
"endpointNames": [
"events"
],
"isEnabled": true
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
"sasTtlAsIso8601": "PT1H",
"connectionString": "",
"containerName": ""
}
},
"messagingEndpoints": {
"fileNotifications": {
"lockDurationAsIso8601": "PT1M",
"ttlAsIso8601": "PT1H",
"maxDeliveryCount": 10
}
},
"enableFileUploadNotifications": false,
"cloudToDevice": {
"maxDeliveryCount": 10,
"defaultTtlAsIso8601": "PT1H",
"feedback": {
"lockDurationAsIso8601": "PT1M",
"ttlAsIso8601": "PT1H",
"maxDeliveryCount": 10
}
},
"features": "None"
},
"sku": {
"name": "S1",
"tier": "Standard",
"capacity": 1
}
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/ae24ff83-d2ca-4fc8-9717-05dae4bba489/resourceGroups/myResourceGroup/providers/Microsoft.Devices/IotHubs/testHub",
"name": "testHub",
"type": "Microsoft.Devices/IotHubs",
"location": "centraluseuap",
"tags": {},
"etag": "AAAAAAFD6M4=",
"properties": {
"state": "Active",
"provisioningState": "Succeeded",
"ipFilterRules": [],
"hostName": "iot-dps-cit-hub-1.azure-devices.net",
"eventHubEndpoints": {
"events": {
"retentionTimeInDays": 1,
"partitionCount": 2,
"partitionIds": [
"0",
"1"
],
"path": "iot-dps-cit-hub-1",
"endpoint": "sb://iothub-ns-iot-dps-ci-245306-76aca8e13b.servicebus.windows.net/"
}
},
"routing": {
"endpoints": {
"serviceBusQueues": [],
"serviceBusTopics": [],
"eventHubs": [],
"storageContainers": []
},
"routes": [],
"fallbackRoute": {
"name": "$fallback",
"source": "DeviceMessages",
"condition": "true",
"endpointNames": [
"events"
],
"isEnabled": true
}
},
"storageEndpoints": {
"$default": {
"sasTtlAsIso8601": "PT1H",
"connectionString": "",
"containerName": ""
}
},
"messagingEndpoints": {
"fileNotifications": {
"lockDurationAsIso8601": "PT1M",
"ttlAsIso8601": "PT1H",
"maxDeliveryCount": 10
}
},
"enableFileUploadNotifications": false,
"cloudToDevice": {
"maxDeliveryCount": 10,
"defaultTtlAsIso8601": "PT1H",
"feedback": {
"lockDurationAsIso8601": "PT1M",
"ttlAsIso8601": "PT1H",
"maxDeliveryCount": 10
}
},
"features": "None"
},
"sku": {
"name": "S1",
"tier": "Standard",
"capacity": 1
}
}
}
}
}



}
14 changes: 7 additions & 7 deletions ...-manager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_createOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down Expand Up @@ -120,7 +121,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down Expand Up @@ -196,7 +198,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down Expand Up @@ -232,7 +235,4 @@
}
}
}
}



}
6 changes: 4 additions & 2 deletions ...resource-manager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down Expand Up @@ -122,7 +123,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down
7 changes: 5 additions & 2 deletions ...ub/resource-manager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down Expand Up @@ -74,7 +75,9 @@
},
"features": "None",
"deviceStreams": {
"streamingEndpoints": ["https://streams.azure-devices-int.net:9443"]
"streamingEndpoints": [
"https://streams.azure-devices-int.net:9443"
]
}
},
"sku": {
Expand Down
3 changes: 2 additions & 1 deletion ...source-manager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_listbyrg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down
3 changes: 2 additions & 1 deletion ...ager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_listbysubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down
5 changes: 3 additions & 2 deletions .../resource-manager/Microsoft.Devices/preview/2019-03-22-preview/examples/iothub_patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "Microsoft.Devices/IotHubs",
"location": "centraluseuap",
"tags": {
"foo" : "bar"
"foo": "bar"
},
"etag": "AAAAAAFD6M4=",
"properties": {
Expand Down Expand Up @@ -56,7 +56,8 @@
"events"
],
"isEnabled": true
}
},
"enrichments": []
},
"storageEndpoints": {
"$default": {
Expand Down
56 changes: 45 additions & 11 deletions ...fication/iothub/resource-manager/Microsoft.Devices/preview/2019-03-22-preview/iothub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,15 +1745,15 @@
}
},
"CertificateBodyDescription": {
"description": "The JSON-serialized X509 Certificate.",
"type": "object",
"properties": {
"certificate": {
"description": "base-64 representation of the X509 leaf certificate .cer file or just .pem file content.",
"type": "string"
}
}
},
"description": "The JSON-serialized X509 Certificate.",
"type": "object",
"properties": {
"certificate": {
"description": "base-64 representation of the X509 leaf certificate .cer file or just .pem file content.",
"type": "string"
}
}
},
"CertificateDescription": {
"description": "The X509 Certificate.",
"type": "object",
Expand Down Expand Up @@ -2265,6 +2265,13 @@
"fallbackRoute": {
"description": "The properties of the route that is used as a fall-back route when none of the conditions specified in the 'routes' section are met. This is an optional parameter. When this property is not set, the messages which do not meet any of the conditions specified in the 'routes' section get routed to the built-in eventhub endpoint.",
"$ref": "#/definitions/FallbackRouteProperties"
},
"enrichments": {
"description": "The list of user-provided enrichments that the IoT hub applies to messages to be delivered to built-in and custom endpoints. See: https://aka.ms/telemetryoneventgrid",
"type": "array",
"items": {
"$ref": "#/definitions/EnrichmentProperties"
}
}
}
},
Expand Down Expand Up @@ -2534,6 +2541,33 @@
"isEnabled"
]
},
"EnrichmentProperties": {
"description": "The properties of an enrichment that your IoT hub applies to messages delivered to endpoints.",
"type": "object",
"properties": {
"key": {
"description": "The key or name for the enrichment property.",
"type": "string"
},
"value": {
"description": "The value for the enrichment property.",
kapil-ms marked this conversation as resolved.
Show resolved Hide resolved
"type": "string"
},
"endpointNames": {
"description": "The list of endpoints for which the enrichment is applied to the message.",
"minItems": 1,
"type": "array",
"items": {
"type": "string"
}
}
},
"required": [
"key",
"value",
"endpointNames"
]
},
"IotHubDescription": {
"description": "The description of the IoT hub.",
"type": "object",
Expand Down Expand Up @@ -3199,11 +3233,11 @@
},
"properties": {
"properties": {
"desired" : {
"desired": {
"description": "Twin desired properties",
"type": "object"
},
"reported" : {
"reported": {
"description": "Twin desired properties",
"type": "object"
}
Expand Down