Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX-TEMPLATE: diagnostics-eventhub-elk #10345

Merged
merged 31 commits into from May 26, 2021
Merged

FIX-TEMPLATE: diagnostics-eventhub-elk #10345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ad022a0
initial commit
Apr 19, 2021
bee81fd
Merge branch 'master' of git://github.com/Azure/azure-quickstart-temp…
Apr 22, 2021
e487459
initial commit
Apr 22, 2021
61c65b8
Merge branch 'master' of git://github.com/Azure/azure-quickstart-temp…
May 1, 2021
c70c648
changing the password to unique one
May 2, 2021
da399da
Merge branch 'master' of git://github.com/Azure/azure-quickstart-temp…
May 7, 2021
54306b5
Merge branch 'master' of git://github.com/Azure/azure-quickstart-temp…
May 7, 2021
315f7ec
Merge branch 'master' of https://github.com/olga-spektra/azure-quicks…
May 7, 2021
f6d88d4
initial commit
Apr 22, 2021
4132e31
changing the password to unique one
May 2, 2021
4a5e07b
Merge branch 'master' of https://github.com/olga-spektra/azure-quicks…
May 7, 2021
da667eb
initial commit
Apr 19, 2021
f6e3cf7
initial commit
Apr 22, 2021
2da16ad
reverting
May 7, 2021
6f26313
Merge branch 'master' of https://github.com/olga-spektra/azure-quicks…
May 8, 2021
685cd7e
adding openedx version
May 10, 2021
3ea90c2
STAGED
May 10, 2021
bb0e98b
Merge branch 'master' of https://github.com/Azure/azure-quickstart-te…
May 11, 2021
7954a25
initial commit
May 21, 2021
29de356
Merge branch 'master' of https://github.com/Azure/azure-quickstart-te…
May 22, 2021
b6b7411
revert
May 22, 2021
ec71cfa
initial commmit
May 23, 2021
75df10a
fixing elastic template uri
May 24, 2021
decc394
revert
May 24, 2021
a810585
revert
May 24, 2021
a97d224
changing elastic template uri
May 24, 2021
b3856d1
changing elastic template uri
May 24, 2021
21d4db4
fixing vm sizes
May 24, 2021
7cd0e34
fixing api version for the nested template
May 24, 2021
0443e5f
removing gov deployment
May 24, 2021
7110d28
concat to uri
May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 6 additions & 76 deletions diagnostics-eventhub-elk/azuredeploy.json
View file
Open in desktop
Expand Up @@ -12,31 +12,13 @@
"esVersion": {
"type": "string",
"defaultValue": "2.3.1",
"allowedValues": [
"2.3.1",
"2.2.2",
"2.1.2",
"1.7.5"
],
"metadata": {
"description": "Elasticsearch version to install."
}
},
"vmClientNodeCount": {
"type": "int",
"defaultValue": 1,
"allowedValues": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
],
"metadata": {
"description": "Number of Elasticsearch client nodes to provision (Setting this to zero puts the data nodes on the load balancer)"
}
Expand All @@ -51,65 +33,20 @@
"vmSizeMasterNodes": {
"type": "string",
"defaultValue": "Standard_D2_v2",
"allowedValues": [
"Standard_D2_v2",
"Standard_D3_v2",
"Standard_D4_v2",
"Standard_A2",
"Standard_A3",
"Standard_A4",
"Standard_A5",
"Standard_A6",
"Standard_A7",
"Standard_DS2",
"Standard_DS3",
"Standard_DS4",
"Standard_DS13"
],
"metadata": {
"description": "Size of the Elasticsearch cluster master nodes"
}
},
"vmSizeClientNodes": {
"type": "string",
"defaultValue": "Standard_D2_v2",
"allowedValues": [
"Standard_D2_v2",
"Standard_D3_v2",
"Standard_D4_v2",
"Standard_A2",
"Standard_A3",
"Standard_A4",
"Standard_A5",
"Standard_A6",
"Standard_A7",
"Standard_DS2",
"Standard_DS3",
"Standard_DS4",
"Standard_DS13"
],
"metadata": {
"description": "Size of the Elasticsearch cluster client nodes"
}
},
"vmSizeDataNodes": {
"type": "string",
"defaultValue": "Standard_D2_v2",
"allowedValues": [
"Standard_D2_v2",
"Standard_D3_v2",
"Standard_D4_v2",
"Standard_A2",
"Standard_A3",
"Standard_A4",
"Standard_A5",
"Standard_A6",
"Standard_A7",
"Standard_DS2",
"Standard_DS3",
"Standard_DS4",
"Standard_DS13"
],
"metadata": {
"description": "Size of the Elasticsearch cluster data nodes"
}
Expand All @@ -129,11 +66,6 @@
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "14.04.4-LTS",
"allowedValues": [
"12.04.5-LTS",
"14.04.4-LTS",
"16.04.0-LTS"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version."
}
Expand Down Expand Up @@ -170,7 +102,7 @@
},
"_artifactsLocation": {
"type": "string",
"defaultValue": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/diagnostics-eventhub-elk",
"defaultValue": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/diagnostics-eventhub-elk/",
"metadata": {
"description": "Change this value to your repo name if deploying from a fork"
}
Expand All @@ -195,9 +127,7 @@
"storageAccountName": "[concat(variables('storageAccountPrefix'), 'log')]",
"imagePublisher": "Canonical",
"imageOffer": "UbuntuServer",
"OSDiskName": "osdiskforlinuxsimple",
"storageAccountType": "Standard_LRS",
"vmStorageAccountContainerName": "vhds",
"vmName": "logstashvm1",
"vmSize": "Standard_D1",
"vmNicName": "[concat(variables('vmName'), '-nic')]",
Expand All @@ -206,18 +136,18 @@
"virtualNetworkName": "elkvnet2",
"subnetRef": "[concat(resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName')), '/subnets/', 'other')]",
"esHost": "10.0.2.100",
"esTemplateBase": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/elasticsearch",
"esTemplateBase": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/application-workloads/elastic/elasticsearch/",
"esDeploymentName": "esDeploymentForDiagnosticsEventHubELK"
},
"resources": [
{
"apiVersion": "2015-01-01",
"apiVersion": "2017-05-10",
"name": "[variables('esDeploymentName')]",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(variables('esTemplateBase'), '/', 'azuredeploy.json')]",
"uri": "[concat(variables('esTemplateBase'), 'azuredeploy.json')]",
"contentVersion": "1.0.0.0"
},
"parameters": {
Expand Down Expand Up @@ -441,11 +371,11 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[concat(parameters('_artifactsLocation'), '/scripts/logstash-eventhub-install-ubuntu.sh', parameters('_artifactsLocationSasToken'))]"
"[uri(parameters('_artifactsLocation'), concat('scripts/logstash-eventhub-install-ubuntu.sh', parameters('_artifactsLocationSasToken')))]"
]
},
"protectedSettings": {
"commandToExecute": "[concat('bash ./logstash-eventhub-install-ubuntu.sh -n ', parameters('existingEHNamespace'), ' -a ', parameters('existingEHSharedAccessKeyName'), ' -k ', parameters('existingEHSharedAccessKey'), ' -e ', parameters('existingEHEntityPath'), ' -p ', parameters('existingEHPartitions'), ' -i ', variables('esHost'))]"
"commandToExecute": "[concat('bash logstash-eventhub-install-ubuntu.sh -n ', parameters('existingEHNamespace'), ' -a ', parameters('existingEHSharedAccessKeyName'), ' -k ', parameters('existingEHSharedAccessKey'), ' -e ', parameters('existingEHEntityPath'), ' -p ', parameters('existingEHPartitions'), ' -i ', variables('esHost'))]"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion diagnostics-eventhub-elk/metadata.json
View file
Open in desktop
Expand Up @@ -5,7 +5,10 @@
"description": "This template deploys an Elasticsearch cluster and Kibana and Logstash VMs. Logstash is configured with an input plugin to pull diagnostics data from Event Hub.",
"summary": "Install Elasticsearch cluster, Kibana and Logstash configured to pull diagnostics from Event Hub",
"githubUsername": "skantha",
"dateUpdated": "2018-07-02"
"dateUpdated": "2018-07-02",
"environments": [
"AzureCloud"
]
}


Expand Down