Merge pull request #106 from Azure-Samples/algattik/iot-telemetry-sim…

…ulator Use Iot-Telemetry-Simulator
Azure-Samples · Jan 5, 2021 · a8b0d6d · a8b0d6d
2 parents 7e7de93 + fba6b47
commit a8b0d6d
Show file tree

Hide file tree

Showing 50 changed files with 123 additions and 352 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/_bootstrap/README.md b/_bootstrap/README.md
@@ -101,7 +101,7 @@ Each client generates up to 2000 msgs/sec. Each generated message is close to 1K
         "moreData22": 12.12345678901234
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-1554",
+    "deviceId": "contoso-device-id-000554",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/akskafka-databricks-cosmosdb/README.md b/akskafka-databricks-cosmosdb/README.md
@@ -105,7 +105,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/...onsumer/src/test/java/com/microsoft/samples/flink/ComplexEventJobProcessingLogicTest.java b/...onsumer/src/test/java/com/microsoft/samples/flink/ComplexEventJobProcessingLogicTest.java
@@ -84,7 +84,7 @@ public void testProcessingLogicState() throws Exception {
         sampleRecord1.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord1.value = 80.80967678165356d;
         sampleRecord1.type = "CO2";
-        sampleRecord1.deviceId = "contoso://device-id-428";
+        sampleRecord1.deviceId = "contoso-device-id-428";
         sampleRecord1.deviceSequenceNumber = 3L;
         sampleRecord1.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord1.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");
@@ -97,7 +97,7 @@ public void testProcessingLogicState() throws Exception {
         sampleRecord2.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord2.value = 70.80967678165356d;
         sampleRecord2.type = "TEMP";
-        sampleRecord2.deviceId = "contoso://device-id-428";
+        sampleRecord2.deviceId = "contoso-device-id-428";
         sampleRecord2.deviceSequenceNumber = 3L;
         sampleRecord2.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord2.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");

diff --git a/...flink/flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleData.java b/...flink/flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleData.java
@@ -10,7 +10,7 @@ public static SampleRecord record() {
         sampleRecord.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord.value = 45.80967678165356d;
         sampleRecord.type = "CO2";
-        sampleRecord.deviceId = "contoso://device-id-428";
+        sampleRecord.deviceId = "contoso-device-id-428";
         sampleRecord.deviceSequenceNumber = 3L;
         sampleRecord.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");

diff --git a/...flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleRecordTest.java b/...flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleRecordTest.java
@@ -18,7 +18,7 @@ public class SampleRecordTest {
 
     private SampleRecord sampleRecord;
 
-    private String serialized = "{\"eventId\":\"4fa25e6c-50d3-4189-9613-d486b71412df\",\"complexData\":null,\"value\":45.80967678165356,\"type\":\"CO2\",\"deviceId\":\"contoso://device-id-428\",\"deviceSequenceNumber\":3,\"createdAt\":\"2019-10-15T12:43:27.748Z\",\"enqueuedAt\":\"2019-10-16T12:43:27.748Z\",\"processedAt\":\"2019-10-17T12:43:27.748Z\"}";
+    private String serialized = "{\"eventId\":\"4fa25e6c-50d3-4189-9613-d486b71412df\",\"complexData\":null,\"value\":45.80967678165356,\"type\":\"CO2\",\"deviceId\":\"contoso-device-id-428\",\"deviceSequenceNumber\":3,\"createdAt\":\"2019-10-15T12:43:27.748Z\",\"enqueuedAt\":\"2019-10-16T12:43:27.748Z\",\"processedAt\":\"2019-10-17T12:43:27.748Z\"}";
 
     private JsonMapperSchema<SampleRecord> mapper = new JsonMapperSchema<>(SampleRecord.class);
 
@@ -32,7 +32,7 @@ public void setUp() {
         sampleRecord.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord.value = 45.80967678165356d;
         sampleRecord.type = "CO2";
-        sampleRecord.deviceId = "contoso://device-id-428";
+        sampleRecord.deviceId = "contoso-device-id-428";
         sampleRecord.deviceSequenceNumber = 3L;
         sampleRecord.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");

diff --git a/.../flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleStateTest.java b/.../flink-kafka-consumer/src/test/java/com/microsoft/samples/flink/data/SampleStateTest.java
@@ -71,7 +71,7 @@ public void getLastRecord01() {
         sampleRecord1.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord1.value = 45.80967678165356d;
         sampleRecord1.type = "CO2";
-        sampleRecord1.deviceId = "contoso://device-id-428";
+        sampleRecord1.deviceId = "contoso-device-id-428";
         sampleRecord1.deviceSequenceNumber = 3L;
         sampleRecord1.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord1.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");
@@ -81,7 +81,7 @@ public void getLastRecord01() {
         sampleRecord2.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord2.value = 45.80967678165356d;
         sampleRecord2.type = "CO2";
-        sampleRecord2.deviceId = "contoso://device-id-428";
+        sampleRecord2.deviceId = "contoso-device-id-428";
         sampleRecord2.deviceSequenceNumber = 3L;
         sampleRecord2.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord2.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");
@@ -100,7 +100,7 @@ public void recordsSize01() {
         sampleRecord1.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord1.value = 45.80967678165356d;
         sampleRecord1.type = "CO2";
-        sampleRecord1.deviceId = "contoso://device-id-428";
+        sampleRecord1.deviceId = "contoso-device-id-428";
         sampleRecord1.deviceSequenceNumber = 3L;
         sampleRecord1.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord1.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");
@@ -110,7 +110,7 @@ public void recordsSize01() {
         sampleRecord2.eventId = "4fa25e6c-50d3-4189-9613-d486b71412df";
         sampleRecord2.value = 45.80967678165356d;
         sampleRecord2.type = "CO2";
-        sampleRecord2.deviceId = "contoso://device-id-428";
+        sampleRecord2.deviceId = "contoso-device-id-428";
         sampleRecord2.deviceSequenceNumber = 3L;
         sampleRecord2.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
         sampleRecord2.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");
@@ -133,7 +133,7 @@ public void addRecord01() {
             sampleRecord.eventId = Integer.toString(i);
             sampleRecord.value = 45.80967678165356d;
             sampleRecord.type = "CO2";
-            sampleRecord.deviceId = "contoso://device-id-428";
+            sampleRecord.deviceId = "contoso-device-id-428";
             sampleRecord.deviceSequenceNumber = 3L;
             sampleRecord.createdAt = Instant.parse("2019-10-15T12:43:27.748Z");
             sampleRecord.enqueuedAt = Instant.parse("2019-10-16T12:43:27.748Z");

diff --git a/components/azure-cosmosdb/create-cosmosdb.sh b/components/azure-cosmosdb/create-cosmosdb.sh
@@ -9,7 +9,7 @@ echo ". account name: $COSMOSDB_SERVER_NAME"
 echo ". database name: $COSMOSDB_DATABASE_NAME"
 echo ". collection name: $COSMOSDB_COLLECTION_NAME"
 
-az group deployment create \
+az deployment group create \
   --resource-group $RESOURCE_GROUP \
   --template-file ../components/azure-cosmosdb/cosmosdb-arm-template.json \
   --parameters \

diff --git a/components/azure-databricks/create-databricks.sh b/components/azure-databricks/create-databricks.sh
@@ -16,7 +16,7 @@ else
 if ! az resource show -g $RESOURCE_GROUP --resource-type Microsoft.Databricks/workspaces -n $ADB_WORKSPACE -o none 2>/dev/null; then
 echo 'creating databricks workspace'
 echo ". name: $ADB_WORKSPACE"
-az group deployment create \
+az deployment group create \
   --name $ADB_WORKSPACE \
   --resource-group $RESOURCE_GROUP \
   --template-file ../components/azure-databricks/databricks-arm-template.json \

diff --git a/components/azure-dataexplorer/create-dataexplorer.sh b/components/azure-dataexplorer/create-dataexplorer.sh
@@ -61,7 +61,7 @@ done
 DATAEXPLORER_CONNECTION="eventhub"
 echo 'creating Data Explorer Event Hub connection'
 echo ". name: $DATAEXPLORER_CONNECTION"
-az group deployment create \
+az deployment group create \
   --resource-group $RESOURCE_GROUP \
   --template-file ../components/azure-dataexplorer/eventhub-connection-arm-template.json \
   --parameters \

diff --git a/components/azure-event-hubs/get-eventhubs-kafka-brokers.sh b/components/azure-event-hubs/get-eventhubs-kafka-brokers.sh
@@ -12,10 +12,12 @@ eh_resource=$(az resource show -g $RESOURCE_GROUP --resource-type Microsoft.Even
 export KAFKA_BROKERS="$namespace.servicebus.windows.net:9093"
 export KAFKA_SECURITY_PROTOCOL=SASL_SSL
 export KAFKA_SASL_MECHANISM=PLAIN
+export KAFKA_SASL_USERNAME='$ConnectionString'
+export KAFKA_SASL_PASSWORD="$EVENTHUB_CS"
 
 # For running outside of Databricks: org.apache.kafka.common.security.plain.PlainLoginModule
 # For running within Databricks: kafkashaded.org.apache.kafka.common.security.plain.PlainLoginModule
 loginModule="org.apache.kafka.common.security.plain.PlainLoginModule"
 loginModuleDatabricks="kafkashaded.$loginModule"
-export KAFKA_SASL_JAAS_CONFIG="$loginModule required username=\"\$ConnectionString\" password=\"$EVENTHUB_CS\";"
-export KAFKA_SASL_JAAS_CONFIG_DATABRICKS="$loginModuleDatabricks required username=\"\$ConnectionString\" password=\"$EVENTHUB_CS\";"
+export KAFKA_SASL_JAAS_CONFIG="$loginModule required username=\"$KAFKA_SASL_USERNAME\" password=\"$KAFKA_SASL_PASSWORD\";"
+export KAFKA_SASL_JAAS_CONFIG_DATABRICKS="$loginModuleDatabricks required username=\"$KAFKA_SASL_USERNAME\" password=\"$KAFKA_SASL_PASSWORD\";"
diff --git a/components/azure-hdinsight/get-hdinsight-kafka-brokers.sh b/components/azure-hdinsight/get-hdinsight-kafka-brokers.sh
@@ -25,5 +25,7 @@ fi
 export KAFKA_BROKERS=${kafka_brokers:1}
 export KAFKA_SECURITY_PROTOCOL=PLAINTEXT
 export KAFKA_SASL_MECHANISM=
+export KAFKA_SASL_USERNAME=
+export KAFKA_SASL_PASSWORD=
 export KAFKA_SASL_JAAS_CONFIG=
 export KAFKA_SASL_JAAS_CONFIG_DATABRICKS=
diff --git a/components/azure-kubernetes-service/get-aks-kafka-brokers.sh b/components/azure-kubernetes-service/get-aks-kafka-brokers.sh
@@ -26,6 +26,8 @@ fi
 export KAFKA_BROKERS="$kafka_ip:9094"
 export KAFKA_SECURITY_PROTOCOL=PLAINTEXT
 export KAFKA_SASL_MECHANISM=
+export KAFKA_SASL_USERNAME=
+export KAFKA_SASL_PASSWORD=
 export KAFKA_SASL_JAAS_CONFIG=
 export KAFKA_SASL_JAAS_CONFIG_DATABRICKS=
 

diff --git a/components/azure-monitor/create-log-analytics.sh b/components/azure-monitor/create-log-analytics.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 if ! az resource show -g $RESOURCE_GROUP -n $LOG_ANALYTICS_WORKSPACE --resource-type Microsoft.OperationalInsights/workspaces -o none 2>/dev/null; then
   echo 'creating Log Analytics workspace'
   echo ". name: $LOG_ANALYTICS_WORKSPACE"
-  az group deployment create \
+  az deployment group create \
     --resource-group $RESOURCE_GROUP \
     --template-file "../components/azure-monitor/template.json" \
     --parameters \

diff --git a/components/azure-sql/provision/provision.sh b/components/azure-sql/provision/provision.sh
@@ -6,7 +6,7 @@ function run_sqlcmd {
   /opt/mssql-tools/bin/sqlcmd -b -h-1 -I -S "$SQL_SERVER_NAME.database.windows.net" -d "$SQL_DATABASE_NAME" -U serveradmin -P "$SQL_ADMIN_PASS" "$@"
 }
 
-run_sqlcmd -e -Q "SET NOCOUNT ON; IF OBJECT_ID(N'sqlprovision', N'U') IS NULL CREATE TABLE sqlprovision(script nvarchar(max))"
+run_sqlcmd -e -Q "SET NOCOUNT ON; IF OBJECT_ID(N'sqlprovision', N'U') IS NULL CREATE TABLE sqlprovision(script nvarchar(4000))"
 for provisioning_script in /sqlprovision/*.sql; do
   echo -n "[$provisioning_script] "
   script_name=$(basename $provisioning_script)

diff --git a/components/azure-storage/create-storage-hfs.sh b/components/azure-storage/create-storage-hfs.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 
 echo 'creating ADLS Gen2 storage account'
 echo ". name: $AZURE_STORAGE_ACCOUNT_GEN2"
-az group deployment create \
+az deployment group create \
   --resource-group $RESOURCE_GROUP \
   --template-file ../components/azure-storage/storage-hfs-arm-template.json \
   --parameters \

diff --git a/eventhubs-databricks-azuresql/README.md b/eventhubs-databricks-azuresql/README.md
@@ -101,7 +101,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-databricks-cosmosdb/README.md b/eventhubs-databricks-cosmosdb/README.md
@@ -101,7 +101,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-databricks-delta/README.md b/eventhubs-databricks-delta/README.md
@@ -100,7 +100,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-dataexplorer/README.md b/eventhubs-dataexplorer/README.md
@@ -95,7 +95,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-functions-azuresql/README.md b/eventhubs-functions-azuresql/README.md
@@ -106,7 +106,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-functions-azuresql/create-solution.sh b/eventhubs-functions-azuresql/create-solution.sh
@@ -235,7 +235,7 @@ echo
 
 echo "***** [T] Starting up TEST clients"
 
-    export SIMULATOR_DUPLICATE_EVERY_N_EVENTS=-1
+    export SIMULATOR_DUPLICATE_EVERY_N_EVENTS=0
 
     RUN=`echo $STEPS | grep T -o || true`
     if [ ! -z "$RUN" ]; then

diff --git a/eventhubs-functions-cosmosdb/README.md b/eventhubs-functions-cosmosdb/README.md
@@ -108,7 +108,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-streamanalytics-azuresql/README.md b/eventhubs-streamanalytics-azuresql/README.md
@@ -114,7 +114,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-streamanalytics-azuresql/create-solution.sh b/eventhubs-streamanalytics-azuresql/create-solution.sh
@@ -204,7 +204,7 @@ echo
 
 echo "***** [T] Starting up TEST clients"
 
-    export SIMULATOR_DUPLICATE_EVERY_N_EVENTS=-1
+    export SIMULATOR_DUPLICATE_EVERY_N_EVENTS=0
 
     RUN=`echo $STEPS | grep T -o || true`
     if [ ! -z "$RUN" ]; then

diff --git a/eventhubs-streamanalytics-azuresql/create-stream-analytics.sh b/eventhubs-streamanalytics-azuresql/create-stream-analytics.sh
@@ -7,7 +7,7 @@ EVENTHUB_KEY=`az eventhubs namespace authorization-rule keys list -g $RESOURCE_G
 
 echo 'creating stream analytics job'
 echo ". name: $PROC_JOB_NAME"
-az group deployment create \
+az deployment group create \
     --name $PROC_JOB_NAME \
     --resource-group $RESOURCE_GROUP \
     --template-file "stream-analytics-job-arm-template.json" \

diff --git a/eventhubs-streamanalytics-azuresql/time-series-query-sample.sql b/eventhubs-streamanalytics-azuresql/time-series-query-sample.sql
@@ -28,7 +28,7 @@ select top (100)
 from
 	dbo.[rawdata2] r
 where
-	[r].[DeviceId] = 'contoso://device-id-154'
+	[r].[DeviceId] = 'contoso-device-id-000154'
 and
 	r.[PartitionId] = 5
 order by

diff --git a/eventhubs-streamanalytics-cosmosdb/README.md b/eventhubs-streamanalytics-cosmosdb/README.md
@@ -96,7 +96,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-streamanalytics-cosmosdb/create-stream-analytics.sh b/eventhubs-streamanalytics-cosmosdb/create-stream-analytics.sh
@@ -10,7 +10,7 @@ COSMOSDB_MASTER_KEY=`az cosmosdb keys list -g $RESOURCE_GROUP -n $COSMOSDB_SERVE
 
 echo 'creating stream analytics job'
 echo ". name: $PROC_JOB_NAME"
-az group deployment create \
+az deployment group create \
   --name $PROC_JOB_NAME \
   --resource-group $RESOURCE_GROUP \
   --template-file "stream-analytics-job-arm-template.json" \

diff --git a/eventhubs-streamanalytics-eventhubs/README.md b/eventhubs-streamanalytics-eventhubs/README.md
@@ -96,7 +96,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubs-streamanalytics-eventhubs/create-stream-analytics.sh b/eventhubs-streamanalytics-eventhubs/create-stream-analytics.sh
@@ -8,7 +8,7 @@ EVENTHUB_KEY_OUT=`az eventhubs namespace authorization-rule keys list -g $RESOUR
 
 echo 'creating stream analytics job'
 echo ". name: $PROC_JOB_NAME"
-az group deployment create \
+az deployment group create \
   --name $PROC_JOB_NAME \
   --resource-group $RESOURCE_GROUP \
   --template-file stream-analytics-job-$STREAM_ANALYTICS_JOBTYPE-arm-template.json \

diff --git a/eventhubs-timeseriesinsights/README.md b/eventhubs-timeseriesinsights/README.md
@@ -98,7 +98,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubskafka-databricks-cosmosdb/README.md b/eventhubskafka-databricks-cosmosdb/README.md
@@ -101,7 +101,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubskafka-flink-eventhubskafka/README.md b/eventhubskafka-flink-eventhubskafka/README.md
@@ -104,7 +104,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/eventhubskafka-functions-cosmosdb/README.md b/eventhubskafka-functions-cosmosdb/README.md
@@ -108,7 +108,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/hdinsightkafka-databricks-sqldw/README.md b/hdinsightkafka-databricks-sqldw/README.md
@@ -102,7 +102,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"

diff --git a/hdinsightkafka-flink-hdinsightkafka/README.md b/hdinsightkafka-flink-hdinsightkafka/README.md
@@ -101,7 +101,7 @@ Streamed data simulates an IoT device sending the following JSON data:
         [...]
     },
     "value": 49.02278128887753,
-    "deviceId": "contoso://device-id-154",
+    "deviceId": "contoso-device-id-000154",
     "deviceSequenceNumber": 0,
     "type": "CO2",
     "createdAt": "2019-05-16T17:16:40.000003Z"