diff --git a/sdk/eventhub/azure-eventhub/stress/Chart.lock b/sdk/eventhub/azure-eventhub/stress/Chart.lock index c3c0a4b0aa0b..8774aad37604 100644 --- a/sdk/eventhub/azure-eventhub/stress/Chart.lock +++ b/sdk/eventhub/azure-eventhub/stress/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: stress-test-addons repository: https://stresstestcharts.blob.core.windows.net/helm/ - version: 0.1.6 -digest: sha256:b97697ef5f303eec43e9a94fca8e312d20b8aed71318250499344aeca9880d31 -generated: "2021-08-24T11:24:15.375395-07:00" + version: 0.1.13 +digest: sha256:007ec9983233e0f8c8ad8aa7f1df5f57b1b4c127d223d59d233b3c5366bd5173 +generated: "2021-12-02T16:05:20.2152434-05:00" diff --git a/sdk/eventhub/azure-eventhub/stress/Chart.yaml b/sdk/eventhub/azure-eventhub/stress/Chart.yaml index 0f42b0429a4b..ea1f03f40727 100644 --- a/sdk/eventhub/azure-eventhub/stress/Chart.yaml +++ b/sdk/eventhub/azure-eventhub/stress/Chart.yaml @@ -5,9 +5,9 @@ version: 0.1.2 appVersion: v0.2 annotations: stressTest: 'true' - namespace: python-eventhubs-stress-test-ns + namespace: python dependencies: - name: stress-test-addons - version: 0.1.6 - repository: https://stresstestcharts.blob.core.windows.net/helm/ \ No newline at end of file + version: 0.1.13 + repository: https://stresstestcharts.blob.core.windows.net/helm/ diff --git a/sdk/eventhub/azure-eventhub/stress/stress-test-resources.json b/sdk/eventhub/azure-eventhub/stress/stress-test-resources.json deleted file mode 100644 index 3b46c8e656a7..000000000000 --- a/sdk/eventhub/azure-eventhub/stress/stress-test-resources.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "baseName": { - "type": "string", - "defaultValue": "[resourceGroup().name]", - "metadata": { - "description": "The base resource name." - } - }, - "testApplicationOid": { - "type": "string", - "metadata": { - "description": "The client OID to grant access to test resources." - } - }, - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "The location of the resources. By default, this is the same as the resource group." - } - }, - "storageEndpointSuffix": { - "type": "string", - "defaultValue": "core.windows.net", - "metadata": { - "description": "The url suffix to use when creating storage connection strings." - } - } - }, - "variables": { - "ehVersion": "2017-04-01", - "contributorRoleId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "eventHubsDataOwnerRoleId": "f526a384-b230-433a-b45c-95f59c4a2dec", - "eventHubsNamespace": "[concat('eh-', parameters('baseName'))]", - "eventHubName": "[concat('eh-', parameters('baseName'), '-hub')]", - "eventHubAuthRuleName": "[concat('eh-', parameters('baseName'), '-hub-auth-rule')]", - "storageAccount": "[replace(concat('blb', parameters('baseName')), '-', '')]", - "containerName": "your-blob-container-name", - "defaultSASKeyName": "RootManageSharedAccessKey", - "eventHubsAuthRuleResourceId": "[resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('eventHubsNamespace'), variables('defaultSASKeyName'))]", - "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]" - }, - "resources": [ - { - "apiVersion": "[variables('ehVersion')]", - "name": "[variables('eventHubsNamespace')]", - "type": "Microsoft.EventHub/Namespaces", - "location": "[parameters('location')]", - "sku": { - "name": "Standard", - "tier": "Standard" - }, - "resources": [ - { - "type": "Microsoft.EventHub/namespaces/eventhubs", - "apiVersion": "[variables('ehVersion')]", - "name": "[concat(variables('eventHubsNamespace'), '/', variables('eventHubName'))]", - "location": "[parameters('location')]", - "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespace'))]" - ], - "properties": { - "messageRetentionInDays": 1, - "partitionCount": 32 - }, - "resources": [ - { - "apiVersion": "[variables('ehVersion')]", - "name": "[variables('eventHubAuthRuleName')]", - "type": "authorizationRules", - "dependsOn": [ - "[variables('eventHubName')]" - ], - "properties": { - "Rights": ["Manage", "Send", "Listen"] - } - } - ] - } - ], - "properties": {} - }, - { - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2019-06-01", - "name": "[variables('storageAccount')]", - "location": "[parameters('location')]", - "sku": { - "name": "Standard_LRS", - "tier": "Standard" - }, - "kind": "StorageV2", - "properties": { - "accessTier": "Hot" - }, - "resources": [ - { - "type": "blobServices/containers", - "apiVersion": "2019-06-01", - "name": "[concat('default/', variables('containerName'))]", - "dependsOn": [ - "[variables('storageAccount')]" - ] - } - ] - }, - { - "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2019-04-01-preview", - "name": "[guid(resourceGroup().id, deployment().name, parameters('baseName'), variables('eventHubsDataOwnerRoleId'), parameters('testApplicationOid'))]", - "properties": { - "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('eventHubsDataOwnerRoleId'))]", - "principalId": "[parameters('testApplicationOid')]", - "scope": "[resourceGroup().id]" - } - }, - { - "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2019-04-01-preview", - "name": "[guid(resourceGroup().id, deployment().name, parameters('baseName'), variables('contributorRoleId'), parameters('testApplicationOid'))]", - "properties": { - "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('contributorRoleId'))]", - "principalId": "[parameters('testApplicationOid')]", - "scope": "[resourceGroup().id]" - } - } - ], - "outputs": { - "EVENT_HUB_NAMESPACE": { - "type": "string", - "value": "[variables('eventHubsNamespace')]" - }, - "EVENT_HUB_HOSTNAME": { - "type": "string", - "value": "[concat(variables('eventHubsNamespace'), '.servicebus.windows.net')]" - }, - "EVENT_HUB_CONN_STR": { - "type": "string", - "value": "[listkeys(variables('eventHubAuthRuleName'), variables('ehVersion')).primaryConnectionString]" - }, - "EVENT_HUB_NAME": { - "type": "string", - "value": "[variables('eventHubName')]" - }, - "EVENT_HUB_SAS_POLICY":{ - "type": "string", - "value": "[variables('eventHubAuthRuleName')]" - }, - "EVENT_HUB_SAS_KEY":{ - "type": "string", - "value": "[listkeys(variables('eventHubAuthRuleName'), variables('ehVersion')).primaryKey]" - }, - "AZURE_STORAGE_CONN_STR": { - "type": "string", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccount'), ';AccountKey=', listKeys(variables('storageAccountId'), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]" - }, - "AZURE_STORAGE_ACCOUNT": { - "type": "string", - "value": "[variables('storageAccount')]" - }, - "AZURE_STORAGE_ACCESS_KEY":{ - "type": "string", - "value": "[listKeys(variables('storageAccountId'), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value]" - } - } -} diff --git a/sdk/eventhub/azure-eventhub/stress/templates/testjob.yaml b/sdk/eventhub/azure-eventhub/stress/templates/testjob.yaml index fde684783937..b645b6777de8 100644 --- a/sdk/eventhub/azure-eventhub/stress/templates/testjob.yaml +++ b/sdk/eventhub/azure-eventhub/stress/templates/testjob.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: python-eh-stress - image: {{ default "stresstestregistry.azurecr.io/python" .Values.repository }}/stress:{{ default "v2" .Values.tag }} + image: {{ .Values.image }} command: ['bash', '-c', 'python3 azure_eventhub_producer_stress.py & python3 azure_eventhub_consumer_stress_sync.py'] {{- include "stress-test-addons.container-env" . | nindent 6 }} # async test command