Azure
/
azure-iot-remote-monitoring
зеркало из https://github.com/Azure/azure-iot-remote-monitoring.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Change variable naming sb to eh

This commit is contained in:
Kapil Agarwal 2016-08-24 18:20:30 -07:00
Родитель bf4ca64b78
Коммит 5ec25a465f
3 изменённых файлов: 32 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
Common/Deployment/LocalMonitoring.json
Просмотреть файл

@ -92,11 +92,11 @@
"location": "[resourceGroup().location]", "location": "[resourceGroup().location]",
"storageVersion": "2016-01-01", "storageVersion": "2016-01-01",
"storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]", "storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"sbVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]", "ehVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]",
"ehOutName": "[concat(parameters('suiteName'), '-ehout')]", "ehOutName": "[concat(parameters('suiteName'), '-ehout')]",
"ehRuleOutName": "[concat(parameters('suiteName'), '-ehruleout')]", "ehRuleOutName": "[concat(parameters('suiteName'), '-ehruleout')]",
"sbKeyName": "RootManageSharedAccessKey", "sbKeyName": "RootManageSharedAccessKey",
"sbResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]", "ehResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]",
"saVersion": "2015-10-01", "saVersion": "2015-10-01",
"docDBVersion": "2015-04-08", "docDBVersion": "2015-04-08",
"docDBResourceId": "[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]", "docDBResourceId": "[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
@ -178,7 +178,7 @@
] ]
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[parameters('sbName')]", "name": "[parameters('sbName')]",
"type": "Microsoft.Eventhub/namespaces", "type": "Microsoft.Eventhub/namespaces",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -191,7 +191,7 @@
}, },
"resources": [ "resources": [
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehOutName')]", "name": "[variables('ehOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -204,7 +204,7 @@
} }
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehRuleOutName')]", "name": "[variables('ehRuleOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -375,7 +375,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehOutName')]", "EventHubName": "[variables('ehOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -479,7 +479,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehRuleOutName')]", "EventHubName": "[variables('ehRuleOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -567,7 +567,7 @@
}, },
"ehConnectionString": { "ehConnectionString": {
"type": "string", "type": "string",
"value": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]" "value": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]"
} }
} }
} }

24
Common/Deployment/RemoteMonitoring.json
Просмотреть файл

@ -161,11 +161,11 @@
"location": "[resourceGroup().location]", "location": "[resourceGroup().location]",
"storageVersion": "2016-01-01", "storageVersion": "2016-01-01",
"storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]", "storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"sbVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]", "ehVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]",
"ehOutName": "[concat(parameters('sbName'), '-ehout')]", "ehOutName": "[concat(parameters('sbName'), '-ehout')]",
"ehRuleOutName": "[concat(parameters('sbName'), '-ehruleout')]", "ehRuleOutName": "[concat(parameters('sbName'), '-ehruleout')]",
"sbKeyName": "RootManageSharedAccessKey", "sbKeyName": "RootManageSharedAccessKey",
"sbResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]", "ehResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]",
"saVersion": "2015-10-01", "saVersion": "2015-10-01",
"webVersion": "2015-04-01", "webVersion": "2015-04-01",
"bingMapsName": "[concat(parameters('suiteName'), '-map')]", "bingMapsName": "[concat(parameters('suiteName'), '-map')]",
@ -271,7 +271,7 @@
] ]
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[parameters('sbName')]", "name": "[parameters('sbName')]",
"type": "Microsoft.Eventhub/namespaces", "type": "Microsoft.Eventhub/namespaces",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -284,7 +284,7 @@
}, },
"resources": [ "resources": [
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehOutName')]", "name": "[variables('ehOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -297,7 +297,7 @@
} }
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehRuleOutName')]", "name": "[variables('ehRuleOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -468,7 +468,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehOutName')]", "EventHubName": "[variables('ehOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -572,7 +572,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehRuleOutName')]", "EventHubName": "[variables('ehRuleOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -720,10 +720,10 @@
"device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"device.TableName": "DeviceList", "device.TableName": "DeviceList",
"eventHub.HubName": "[variables('ehOutName')]", "eventHub.HubName": "[variables('ehOutName')]",
"eventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "eventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"RulesEventHub.Name": "[variables('ehRuleOutName')]", "RulesEventHub.Name": "[variables('ehRuleOutName')]",
"RulesEventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "RulesEventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"ObjectTypePrefix": "", "ObjectTypePrefix": "",
"MapApiQueryKey": "[listSecrets(variables('bingMapsName'), variables('bingMapsVersion')).QueryKey]", "MapApiQueryKey": "[listSecrets(variables('bingMapsName'), variables('bingMapsVersion')).QueryKey]",
"SolutionName": "[variables('webSiteName')]" "SolutionName": "[variables('webSiteName')]"
@ -782,10 +782,10 @@
"device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"device.TableName": "DeviceList", "device.TableName": "DeviceList",
"eventHub.HubName": "[variables('ehOutName')]", "eventHub.HubName": "[variables('ehOutName')]",
"eventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "eventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"RulesEventHub.Name": "[variables('ehRuleOutName')]", "RulesEventHub.Name": "[variables('ehRuleOutName')]",
"RulesEventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "RulesEventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"ObjectTypePrefix": "", "ObjectTypePrefix": "",
"MapApiQueryKey": "[listSecrets(variables('bingMapsName'), variables('bingMapsVersion')).QueryKey]", "MapApiQueryKey": "[listSecrets(variables('bingMapsName'), variables('bingMapsVersion')).QueryKey]",
"SolutionName": "[variables('webSiteName')]" "SolutionName": "[variables('webSiteName')]"
@ -829,7 +829,7 @@
}, },
"ehConnectionString": { "ehConnectionString": {
"type": "string", "type": "string",
"value": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]" "value": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]"
} }
} }
} }

24
Common/Deployment/RemoteMonitoringMapKey.json
Просмотреть файл

@ -168,11 +168,11 @@
"location": "[resourceGroup().location]", "location": "[resourceGroup().location]",
"storageVersion": "2016-01-01", "storageVersion": "2016-01-01",
"storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]", "storageId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"sbVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]", "ehVersion": "[providers('Microsoft.Eventhub', 'namespaces').apiVersions[0]]",
"ehOutName": "[concat(parameters('sbName'), '-ehout')]", "ehOutName": "[concat(parameters('sbName'), '-ehout')]",
"ehRuleOutName": "[concat(parameters('sbName'), '-ehruleout')]", "ehRuleOutName": "[concat(parameters('sbName'), '-ehruleout')]",
"sbKeyName": "RootManageSharedAccessKey", "sbKeyName": "RootManageSharedAccessKey",
"sbResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]", "ehResourceId": "[resourceId('Microsoft.Eventhub/namespaces/authorizationRules', parameters('sbName'), variables('sbKeyName'))]",
"saVersion": "2015-10-01", "saVersion": "2015-10-01",
"webVersion": "2015-04-01", "webVersion": "2015-04-01",
"webJobPlanName": "[concat(parameters('suiteName'), '-jobsplan')]", "webJobPlanName": "[concat(parameters('suiteName'), '-jobsplan')]",
@ -260,7 +260,7 @@
] ]
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[parameters('sbName')]", "name": "[parameters('sbName')]",
"type": "Microsoft.Eventhub/namespaces", "type": "Microsoft.Eventhub/namespaces",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -273,7 +273,7 @@
}, },
"resources": [ "resources": [
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehOutName')]", "name": "[variables('ehOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -286,7 +286,7 @@
} }
}, },
{ {
"apiVersion": "[variables('sbVersion')]", "apiVersion": "[variables('ehVersion')]",
"name": "[variables('ehRuleOutName')]", "name": "[variables('ehRuleOutName')]",
"type": "eventHubs", "type": "eventHubs",
"location": "[variables('location')]", "location": "[variables('location')]",
@ -457,7 +457,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehOutName')]", "EventHubName": "[variables('ehOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -561,7 +561,7 @@
"Properties": { "Properties": {
"EventHubName": "[variables('ehRuleOutName')]", "EventHubName": "[variables('ehRuleOutName')]",
"ServiceBusNamespace": "[parameters('sbName')]", "ServiceBusNamespace": "[parameters('sbName')]",
"SharedAccessPolicyKey": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryKey]", "SharedAccessPolicyKey": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryKey]",
"SharedAccessPolicyName": "[variables('sbKeyName')]", "SharedAccessPolicyName": "[variables('sbKeyName')]",
"PartitionKey": "PartitionId" "PartitionKey": "PartitionId"
}, },
@ -707,10 +707,10 @@
"device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"device.TableName": "DeviceList", "device.TableName": "DeviceList",
"eventHub.HubName": "[variables('ehOutName')]", "eventHub.HubName": "[variables('ehOutName')]",
"eventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "eventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"RulesEventHub.Name": "[variables('ehRuleOutName')]", "RulesEventHub.Name": "[variables('ehRuleOutName')]",
"RulesEventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "RulesEventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"ObjectTypePrefix": "", "ObjectTypePrefix": "",
"MapApiQueryKey": "[parameters('bingMapsApiKey')]", "MapApiQueryKey": "[parameters('bingMapsApiKey')]",
"SolutionName": "[variables('webSiteName')]" "SolutionName": "[variables('webSiteName')]"
@ -768,10 +768,10 @@
"device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "device.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"device.TableName": "DeviceList", "device.TableName": "DeviceList",
"eventHub.HubName": "[variables('ehOutName')]", "eventHub.HubName": "[variables('ehOutName')]",
"eventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "eventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]", "eventHub.StorageConnectionString": "[concat('DefaultEndpointsProtocol=https;EndpointSuffix=', parameters('storageEndpointSuffix'), ';AccountName=', parameters('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).keys[0].value)]",
"RulesEventHub.Name": "[variables('ehRuleOutName')]", "RulesEventHub.Name": "[variables('ehRuleOutName')]",
"RulesEventHub.ConnectionString": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]", "RulesEventHub.ConnectionString": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]",
"ObjectTypePrefix": "", "ObjectTypePrefix": "",
"MapApiQueryKey": "[parameters('bingMapsApiKey')]", "MapApiQueryKey": "[parameters('bingMapsApiKey')]",
"SolutionName": "[variables('webSiteName')]" "SolutionName": "[variables('webSiteName')]"
@ -815,7 +815,7 @@
}, },
"ehConnectionString": { "ehConnectionString": {
"type": "string", "type": "string",
"value": "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]" "value": "[listkeys(variables('ehResourceId'), variables('ehVersion')).primaryConnectionString]"
} }
} }
} }