From 3371a9119195a825c48c5805c1a32d101a1ca809 Mon Sep 17 00:00:00 2001 From: Marvin Buss <34542414+marvinbuss@users.noreply.github.com> Date: Mon, 27 May 2024 18:59:14 +0200 Subject: [PATCH 1/2] ARM template and parameters deployed on 5-27-2024 18:59:11, based on the collaboration branch's commit ID: d1a412496f78d619d097b4b10670abb5af091dc8 --- sc4-dev-df001/ARMTemplateForFactory.json | 20 ++++++++++++------- .../ARMTemplateParametersForFactory.json | 14 ++++++------- .../linkedTemplates/ArmTemplate_0.json | 16 ++++++++++----- .../linkedTemplates/ArmTemplate_1.json | 4 ++-- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/sc4-dev-df001/ARMTemplateForFactory.json b/sc4-dev-df001/ARMTemplateForFactory.json index f868257..20c5d20 100644 --- a/sc4-dev-df001/ARMTemplateForFactory.json +++ b/sc4-dev-df001/ARMTemplateForFactory.json @@ -2430,7 +2430,7 @@ }, "sourceFolderPath": { "type": "string", - "defaultValue": "iptv" + "defaultValue": "iptv/0156490b-efbe-4a27-af08-a237669f91cc" }, "sourceFileName": { "type": "string", @@ -3073,7 +3073,7 @@ }, "sourceFolderPath": { "type": "string", - "defaultValue": "ott" + "defaultValue": "ott/751cb63e-ce65-4f73-9894-6b1bdb8b7e1d" }, "sourceFileName": { "type": "string", @@ -3902,7 +3902,8 @@ " Topology4 as string,", " Topology5 as string,", " TvModel as string,", - " UserId as long", + " UserId as long,", + " EndTime as timestamp", " ),", " allowSchemaDrift: true,", " validateSchema: false,", @@ -3982,6 +3983,7 @@ "source(output(", " app_version as string,", " country as string,", + " end_time as timestamp 'yyyy-MM-dd\\'T\\'HH:mm:ss.SSS\\'Z\\'',", " happiness_score as float,", " hw_model as string,", " service as string,", @@ -4023,7 +4025,8 @@ " Topology4 = topology_4,", " Topology5 = topology_5,", " TvModel = tv_model,", - " UserId = user_id", + " UserId = user_id,", + " EndTime = end_time", " ),", " skipDuplicateMapInputs: true,", " skipDuplicateMapOutputs: true) ~> RenameColumns", @@ -4115,7 +4118,8 @@ " CommercilizationType as string,", " DeviceVendor as string,", " HappinessScore as float,", - " UserId as string", + " UserId as long,", + " EndTime as timestamp", " ),", " allowSchemaDrift: true,", " validateSchema: false,", @@ -4205,7 +4209,8 @@ " {COMMERCIALIZATION TYPE} as string,", " {Device Vendor} as string,", " {Happiness Score} as float,", - " {User ID} as string", + " {User ID} as long,", + " {End Time} as timestamp", " ),", " useSchema: false,", " allowSchemaDrift: true,", @@ -4232,7 +4237,8 @@ " CommercilizationType = {COMMERCIALIZATION TYPE},", " DeviceVendor = {Device Vendor},", " HappinessScore = {Happiness Score},", - " UserId = {User ID}", + " UserId = {User ID},", + " EndTime = {End Time}", " ),", " skipDuplicateMapInputs: true,", " skipDuplicateMapOutputs: true) ~> RenameColumns", diff --git a/sc4-dev-df001/ARMTemplateParametersForFactory.json b/sc4-dev-df001/ARMTemplateParametersForFactory.json index a6d774a..8a2c5f6 100644 --- a/sc4-dev-df001/ARMTemplateParametersForFactory.json +++ b/sc4-dev-df001/ARMTemplateParametersForFactory.json @@ -3,19 +3,19 @@ "contentVersion": "1.0.0.0", "parameters": { "factoryName": { - "value": "${data_factory_name}" + "value": "sc4-dev-df001" }, "AzureDataExplorer_properties_typeProperties_endpoint": { - "value": "${kusto_cluster_uri}" + "value": "https://sc4-dev-kusto001.germanywestcentral.kusto.windows.net" }, "AzureDataExplorer_properties_typeProperties_database": { "value": "@linkedService().databaseName" }, "AzureDataLakeStorage_properties_typeProperties_url": { - "value": "${datalake_primary_dfs_endpoint}" + "value": "https://sc4devstg001.dfs.core.windows.net/" }, "AzureKeyVault_properties_typeProperties_baseUrl": { - "value": "${key_vault_uri}" + "value": "https://sc4-dev-vault001.vault.azure.net/" }, "IptvUpload_properties_IptvMainPipeline_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -24,7 +24,7 @@ "value": "@triggerBody().fileName" }, "IptvUpload_properties_typeProperties_scope": { - "value": "${datalake_id}" + "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" }, "OttUpload_properties_OttMainPipeline_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -33,7 +33,7 @@ "value": "@triggerBody().fileName" }, "OttUpload_properties_typeProperties_scope": { - "value": "${datalake_id}" + "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" }, "TestUpload_properties_TestParseBlobTrigger_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -42,7 +42,7 @@ "value": "@triggerBody().fileName" }, "TestUpload_properties_typeProperties_scope": { - "value": "${datalake_id}" + "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" } } } \ No newline at end of file diff --git a/sc4-dev-df001/linkedTemplates/ArmTemplate_0.json b/sc4-dev-df001/linkedTemplates/ArmTemplate_0.json index 9053fd2..330a668 100644 --- a/sc4-dev-df001/linkedTemplates/ArmTemplate_0.json +++ b/sc4-dev-df001/linkedTemplates/ArmTemplate_0.json @@ -752,7 +752,8 @@ " Topology4 as string,", " Topology5 as string,", " TvModel as string,", - " UserId as long", + " UserId as long,", + " EndTime as timestamp", " ),", " allowSchemaDrift: true,", " validateSchema: false,", @@ -832,6 +833,7 @@ "source(output(", " app_version as string,", " country as string,", + " end_time as timestamp 'yyyy-MM-dd\\'T\\'HH:mm:ss.SSS\\'Z\\'',", " happiness_score as float,", " hw_model as string,", " service as string,", @@ -873,7 +875,8 @@ " Topology4 = topology_4,", " Topology5 = topology_5,", " TvModel = tv_model,", - " UserId = user_id", + " UserId = user_id,", + " EndTime = end_time", " ),", " skipDuplicateMapInputs: true,", " skipDuplicateMapOutputs: true) ~> RenameColumns", @@ -965,7 +968,8 @@ " CommercilizationType as string,", " DeviceVendor as string,", " HappinessScore as float,", - " UserId as string", + " UserId as long,", + " EndTime as timestamp", " ),", " allowSchemaDrift: true,", " validateSchema: false,", @@ -1055,7 +1059,8 @@ " {COMMERCIALIZATION TYPE} as string,", " {Device Vendor} as string,", " {Happiness Score} as float,", - " {User ID} as string", + " {User ID} as long,", + " {End Time} as timestamp", " ),", " useSchema: false,", " allowSchemaDrift: true,", @@ -1082,7 +1087,8 @@ " CommercilizationType = {COMMERCIALIZATION TYPE},", " DeviceVendor = {Device Vendor},", " HappinessScore = {Happiness Score},", - " UserId = {User ID}", + " UserId = {User ID},", + " EndTime = {End Time}", " ),", " skipDuplicateMapInputs: true,", " skipDuplicateMapOutputs: true) ~> RenameColumns", diff --git a/sc4-dev-df001/linkedTemplates/ArmTemplate_1.json b/sc4-dev-df001/linkedTemplates/ArmTemplate_1.json index 08fbd5f..a2e59c7 100644 --- a/sc4-dev-df001/linkedTemplates/ArmTemplate_1.json +++ b/sc4-dev-df001/linkedTemplates/ArmTemplate_1.json @@ -1297,7 +1297,7 @@ }, "sourceFolderPath": { "type": "string", - "defaultValue": "iptv" + "defaultValue": "iptv/0156490b-efbe-4a27-af08-a237669f91cc" }, "sourceFileName": { "type": "string", @@ -1934,7 +1934,7 @@ }, "sourceFolderPath": { "type": "string", - "defaultValue": "ott" + "defaultValue": "ott/751cb63e-ce65-4f73-9894-6b1bdb8b7e1d" }, "sourceFileName": { "type": "string", From ba0784fc43a753e61afff997dcb3b86f392c1b85 Mon Sep 17 00:00:00 2001 From: Marvin Buss Date: Mon, 27 May 2024 19:28:33 +0200 Subject: [PATCH 2/2] Update parameter file --- sc4-dev-df001/ARMTemplateParametersForFactory.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sc4-dev-df001/ARMTemplateParametersForFactory.json b/sc4-dev-df001/ARMTemplateParametersForFactory.json index 8a2c5f6..a6d774a 100644 --- a/sc4-dev-df001/ARMTemplateParametersForFactory.json +++ b/sc4-dev-df001/ARMTemplateParametersForFactory.json @@ -3,19 +3,19 @@ "contentVersion": "1.0.0.0", "parameters": { "factoryName": { - "value": "sc4-dev-df001" + "value": "${data_factory_name}" }, "AzureDataExplorer_properties_typeProperties_endpoint": { - "value": "https://sc4-dev-kusto001.germanywestcentral.kusto.windows.net" + "value": "${kusto_cluster_uri}" }, "AzureDataExplorer_properties_typeProperties_database": { "value": "@linkedService().databaseName" }, "AzureDataLakeStorage_properties_typeProperties_url": { - "value": "https://sc4devstg001.dfs.core.windows.net/" + "value": "${datalake_primary_dfs_endpoint}" }, "AzureKeyVault_properties_typeProperties_baseUrl": { - "value": "https://sc4-dev-vault001.vault.azure.net/" + "value": "${key_vault_uri}" }, "IptvUpload_properties_IptvMainPipeline_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -24,7 +24,7 @@ "value": "@triggerBody().fileName" }, "IptvUpload_properties_typeProperties_scope": { - "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" + "value": "${datalake_id}" }, "OttUpload_properties_OttMainPipeline_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -33,7 +33,7 @@ "value": "@triggerBody().fileName" }, "OttUpload_properties_typeProperties_scope": { - "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" + "value": "${datalake_id}" }, "TestUpload_properties_TestParseBlobTrigger_parameters_uploadSourceFolderPath": { "value": "@triggerBody().folderPath" @@ -42,7 +42,7 @@ "value": "@triggerBody().fileName" }, "TestUpload_properties_typeProperties_scope": { - "value": "/subscriptions/be25820a-df86-4794-9e95-6a45cd5c0941/resourceGroups/sc4-dev-stg-rg/providers/Microsoft.Storage/storageAccounts/sc4devstg001" + "value": "${datalake_id}" } } } \ No newline at end of file