Updated templates

Infrastructure/ARM/parameters.json

@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "shards": {
-            "value": 20
+            "value": 10
         },
         "shardprefix": {
             "value": "adxbench"

Infrastructure/AzureBatchTemplates/generator-job.json

@@ -15,33 +15,20 @@
         "description": "Pool id"
       }
     },
-    "partitionStart": {
-      "type": "int",
-      "defaultValue": 0,
-      "metadata": {
-        "description": "Partition start index"
-      }
-    },
-    "partitionEnd": {
-      "type": "int",
-      "defaultValue": 6,
-      "metadata": {
-        "description": "Partition end index"
-      }
-    },
     "size": {
       "type": "string",
-      "defaultValue": "HundredTB",
+      "defaultValue": "OneTB",
       "metadata": {
         "description": "Size"
       }
     },
-    "outputContainerUrl": {
+    "storageConnStr": {
-      "type": "string",
+      "type": "array",
-      "defaultValue": "YOUR BLOB CONNECTION STRING",
+      "defaultValue": [
-      "metadata": {
+        "DefaultEndpointsProtocol=https;AccountName=ACC1;AccountKey=ACCKEY1;EndpointSuffix=core.windows.net",
-        "description": "Output container URL"
+        "DefaultEndpointsProtocol=https;AccountName=ACC2;AccountKey=ACCKEY2;EndpointSuffix=core.windows.net",
-      }
+        "DefaultEndpointsProtocol=https;AccountName=ACC3;AccountKey=ACCKEY3;EndpointSuffix=core.windows.net"
+      ]
     }
   },
   "job": {
@@ -53,18 +40,21 @@
         "poolId": "[parameters('poolId')]"
       },
       "taskFactory": {
-        "type": "parametricSweep",
+        "type": "taskCollection",
-        "parameterSets": [
+        "tasks": [
           {
-            "start": "[parameters('partitionStart')]",
+            "id": "task0",
-            "end": "[parameters('partitionEnd')]",
+            "commandLine": "%AZ_BATCH_APP_PACKAGE_GENERATOR#1.0%/publish/BenchmarkLogGenerator.exe -output:AzureStorage -cc:\"[parameters('storageConnStr')[0]]\" -size:[parameters('size')] -partition:0"
-            "step": 1
+          },
-          }
+          {
-        ],
+            "id": "task1",
-        "repeatTask": {
+            "commandLine": "%AZ_BATCH_APP_PACKAGE_GENERATOR#1.0%/publish/BenchmarkLogGenerator.exe -output:AzureStorage -cc:\"[parameters('storageConnStr')[1]]\" -size:[parameters('size')] -partition:1"
-          "displayName": "Task for partition {0}",
+          },
-          "commandLine": "%AZ_BATCH_APP_PACKAGE_GENERATOR#1.0%/publish/BenchmarkLogGenerator.exe -output:AzureStorage -cc:\"[parameters('outputContainerUrl')]\" -size:[parameters('size')] -partition:{0}"
+          {
+            "id": "task2",
+            "commandLine": "%AZ_BATCH_APP_PACKAGE_GENERATOR#1.0%/publish/BenchmarkLogGenerator.exe -output:AzureStorage -cc:\"[parameters('storageConnStr')[2]]\" -size:[parameters('size')] -partition:2"
           }
+        ]
       }
     }
   }

Infrastructure/AzureBatchTemplates/generator-pool.json

@@ -11,7 +11,7 @@
     },
     "vmDedicatedCount": {
       "type": "int",
-      "defaultValue": 7,
+      "defaultValue": 3,
       "metadata": {
         "description": "The number of dedicated virtual machines"
       }