Skip to content

Commit

Permalink
Updated Monitoring to latest version
Browse files Browse the repository at this point in the history 
* Alert performance and accuracy improvement.

* Updated to latest
  • Loading branch information
@sc-jiannannding
sc-jiannannding authored Aug 4, 2020
1 parent b18210c commit a22c9db
Show file tree
Hide file tree
Showing 302 changed files with 16,313 additions and 2,674 deletions.
340 changes: 340 additions & 0 deletions Monitoring 10.0.0/xm/azuredeploy.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,340 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"standard": {
"type": "secureObject",
"defaultValue": {
"deploymentId": null,
"searchServiceName": null,
"solrConnectionString": null
}
},
"searchProvider": {
"type": "string",
"defaultValue": "[if(empty(parameters('standard').solrConnectionString),'Azure','Solr')]",
"allowedValues": [
"Azure",
"Solr"
]
},
"extension": {
"type": "secureObject",
"defaultValue": {
"omsWorkspaceAlertRecipients": null,
"omsWorkspaceMetricsRetentionDays": null,
"omsWorkspaceLocation": null,
"applicationInsightsLocation": null,
"templateLinkAccessToken": ""
}
},
"deploymentId": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').deploymentId, resourceGroup().name)]"
},
"searchServiceName": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').searchServiceName, concat(parameters('deploymentId'), '-as'))]"
},
"omsWorkspaceMetricsRetentionDays": {
"type": "int",
"defaultValue": "[parameters('extension').omsWorkspaceMetricsRetentionDays]",
"metadata": {
"description": "Number of days of retention from 30 to 730."
}
},
"omsWorkspaceAlertRecipients": {
"type": "string",
"defaultValue": "[parameters('extension').omsWorkspaceAlertRecipients]",
"metadata": {
"Description": "List of recipients for the email alert separated by semicolon"
}
},
"omsWorkspaceLocation": {
"type": "string",
"defaultValue": "[parameters('extension').omsWorkspaceLocation]",
"metadata": {
"description": "the Location in which your OMS will be provisioned"
}
},
"applicationInsightsLocation": {
"type": "string",
"defaultValue": "[parameters('extension').applicationInsightsLocation]",
"metadata": {
"description": "the Location in which your Application Insight exists"
}
},
"templateLinkBase": {
"type": "string",
"defaultValue": "[uri(replace(json(string(deployment().properties.templateLink)).uri,' ','%20'), '.')]"
},
"templateLinkAccessToken": {
"type": "securestring",
"defaultValue": "[if(contains(parameters('extension'), 'templateLinkAccessToken'), parameters('extension').templateLinkAccessToken, '')]"
}
},
"variables": {
"resourcesApiVersion": "2016-09-01"
},
"resources": [
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name,'-infrastructure')]",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/infrastructure.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"omsWorkspaceMetricsRetentionDays": {
"value": "[parameters('omsWorkspaceMetricsRetentionDays')]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
},
"templateLinkAccessToken": {
"value": "[parameters('templateLinkAccessToken')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name,'-application')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/application.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name, '-integration')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/integration.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"searchProvider": {
"value": "[parameters('searchProvider')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name, '-availability')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/availability.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
},
"applicationInsightsLocation": {
"value": "[parameters('applicationInsightsLocation')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"condition": "[equals(parameters('searchProvider'), 'Azure')]",
"name": "[concat(parameters('deploymentId'), '-alertsearchsearchservices')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/alertsearchsearchservices.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(parameters('deploymentId'), '-alertwebserverfarms')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/alertwebserverfarms.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(parameters('deploymentId'), '-alertwebsites')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/alertwebsites.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(parameters('deploymentId'), '-alertsqlserversdatabases')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/alertsqlserversdatabases.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
}
}
}
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(parameters('deploymentId'), '-alertcacheredis')]",
"type": "Microsoft.Resources/deployments",
"dependson": [
"[concat(deployment().name,'-infrastructure')]"
],
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/alertcacheredis.json'), parameters('templateLinkAccessToken'))]",
"contentVersion": "1.0.0.0"
},
"parameters": {
"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"infrastructure": {
"value": "[reference(concat(deployment().name,'-infrastructure')).outputs.infrastructure.value]"
},
"omsWorkspaceLocation": {
"value": "[parameters('omsWorkspaceLocation')]"
},
"omsWorkspaceAlertRecipients": {
"value": "[parameters('omsWorkspaceAlertRecipients')]"
}
}
}
}
]
}
21 changes: 21 additions & 0 deletions Monitoring 10.0.0/xm/azuredeploy.parameters.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"deploymentId": {
"value": ""
},
"omsWorkspaceMetricsRetentionDays": {
"value": ""
},
"omsWorkspaceAlertRecipients": {
"value": ""
},
"omsWorkspaceLocation": {
"value": ""
},
"applicationInsightsLocation": {
"value": ""
}
}
}
Loading

0 comments on commit a22c9db

Please sign in to comment.