Fix data type for TSI v2 (Azure-Samples#100)

Also removed warnings/spurious output from Databricks & TSI deployment scripts
norelina · Dec 23, 2020 · 81edc72 · 81edc72
1 parent f1cd925
commit 81edc72
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/components/azure-databricks/create-databricks.sh b/components/azure-databricks/create-databricks.sh
@@ -57,7 +57,7 @@ if [[ -z "$pat_token_secret" ]]; then
     -d '{ "lifetime_seconds": 864000, "comment": "streaming-at-scale generated token" }')
   pat_token=$(jq .token_value -r <<< "$api_response")
 
-  az keyvault secret set --vault-name "$ADB_TOKEN_KEYVAULT" --name "$databricks_token_secret_name" --value "$pat_token"
+  az keyvault secret set --vault-name "$ADB_TOKEN_KEYVAULT" --name "$databricks_token_secret_name" --value "$pat_token" -o tsv >>log.txt
 fi
 
 echo 'getting PAT token from Key Vault'
@@ -73,4 +73,3 @@ fi
 
 echo 'importing Databricks notebooks'
 databricks workspace import_dir ../streaming/databricks/notebooks /Shared/streaming-at-scale --overwrite
-
diff --git a/components/azure-timeseriesinsights/create-timeseriesinsights.sh b/components/azure-timeseriesinsights/create-timeseriesinsights.sh
@@ -15,7 +15,7 @@ if [ "$userType" == "user" ]; then
 fi
 
 echo 'creating TSI'
-az group deployment create \
+az deployment group create \
   --resource-group $RESOURCE_GROUP \
   --template-file ../components/azure-timeseriesinsights/tsi-eventhubs-arm-template.json \
   --parameters \

diff --git a/streaming/databricks/notebooks/verify-timeseriesinsights-parquet.scala b/streaming/databricks/notebooks/verify-timeseriesinsights-parquet.scala
@@ -28,7 +28,7 @@ table(tempTable)
   .withColumnRenamed("timestamp", "enqueuedAt")
   .withColumnRenamed("deviceId_string", "deviceId")
   .withColumnRenamed("eventId_string", "eventId")
-  .withColumnRenamed("deviceSequenceNumber_double", "deviceSequenceNumber")
+  .withColumnRenamed("deviceSequenceNumber_long", "deviceSequenceNumber")
   .createOrReplaceGlobalTempView(tempView)
 
 // COMMAND ----------