public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AzureMonitor: Update alerts dashboard (#50712) (#50920)

Browse Source 
(cherry picked from commit ab8176d234)

Co-authored-by: jcolladokuri <jcolladokuri@microsoft.com>
This commit is contained in:
Grot (@grafanabot)
2022-06-16 10:42:03 +02:00
committed by GitHub
co-authored by jcolladokuri
parent 959e368feb
commit 52d7c8e914
11 changed files with 47 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json
+1 -1
View File
@@ -8482,7 +8482,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure Data Explorer Cluster Resource Insights",
"title": "Azure / Insights / Data Explorer Clusters",
"uid": "8UDB1s3Gk",
"version": 10
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsights.json
+1 -1
View File
@@ -2537,6 +2537,6 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure App monitoring - Application Insights",
"title": "Azure / Insights / Applications",
"version": 10
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/arg.json
+1 -1
View File
@@ -4009,7 +4009,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure Resources Overview",
"title": "Azure / Resources Overview",
"uid": "Mtwt2BV7k",
"version": 3
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json
+1 -1
View File
@@ -4999,7 +4999,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Cosmos DB Insights",
"title": "Azure / Insights / Cosmos DB",
"uid": "INH9berMk",
"version": 17
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json
+1 -1
View File
@@ -2676,7 +2676,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Key vault Insights",
"title": "Azure / Insights / Key vaults",
"uid": "tQZAMYrMk",
"version": 42
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json
+1 -1
View File
@@ -4547,7 +4547,7 @@
},
"timepicker": {},
"timezone": "browser",
"title": "Azure SQL Database",
"title": "Azure / Insights / SQL Database",
"uid": "cIld6iqMk",
"version": 69
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json
+1 -1
View File
@@ -6424,7 +6424,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure Storage Insights",
"title": "Azure / Insights / Storage Accounts",
"uid": "3n2E8CrGk",
"version": 28
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json
+26 -65
View File
@@ -27,31 +27,9 @@
"version": ""
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"target": {
"limit": 100,
"matchAny": false,
"tags": [],
"type": "dashboard"
},
"type": "dashboard"
}
]
},
"description": "A summary of all alerts for the subscription and other filters selected",
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": null,
"iteration": 1647624046153,
"links": [],
"liveNow": false,
"panels": [
@@ -93,7 +71,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev0&var-sev=Sev1&var-sev=Sev2&var-sev=Sev3&var-sev=Sev4&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev0&var-sev=Sev1&var-sev=Sev2&var-sev=Sev3&var-sev=Sev4&${__url_time_range}"
}
]
}
@@ -120,7 +98,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -128,7 +105,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg)\r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev)\r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -193,7 +170,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev0&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev0&${__url_time_range}"
}
]
}
@@ -220,7 +197,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -228,7 +204,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.severity == \"Sev0\" \r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev) and properties.essentials.severity == \"Sev0\" \r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -293,7 +269,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev1&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev1&${__url_time_range}"
}
]
}
@@ -320,7 +296,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -328,7 +303,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.severity == \"Sev1\" \r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev) and properties.essentials.severity == \"Sev1\" \r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -393,7 +368,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev2&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev2&${__url_time_range}"
}
]
}
@@ -420,7 +395,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -428,7 +402,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.severity == \"Sev2\" \r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev) and properties.essentials.severity == \"Sev2\" \r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -493,7 +467,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev3&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev3&${__url_time_range}"
}
]
}
@@ -520,7 +494,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -528,7 +501,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.severity == \"Sev3\" \r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev) and properties.essentials.severity == \"Sev3\" \r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -593,7 +566,7 @@
{
"targetBlank": false,
"title": "",
"url": "d/dyzn5SK7z/alert-consumption?${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev4&${__url_time_range}"
"url": "d/dyzn5SK7z/azure-alert-consumption?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${__url_time_range}&var-mc=Fired&var-mc=Resolved&var-as=New&var-as=Acknowledged&var-as=Closed&var-sev=Sev4&${__url_time_range}"
}
]
}
@@ -620,7 +593,6 @@
},
"textMode": "value_and_name"
},
"pluginVersion": "8.4.3",
"targets": [
{
"azureMonitor": {
@@ -628,7 +600,7 @@
"timeGrain": "auto"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.severity == \"Sev4\" \r\n| summarize count()"
"query": "alertsmanagementresources\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev) and properties.essentials.severity == \"Sev4\" \r\n| summarize count()"
},
"datasource": {
"type": "grafana-azure-monitor-datasource",
@@ -805,28 +777,10 @@
"showHeader": true,
"sortBy": []
},
"pluginVersion": "8.4.3",
"targets": [
{
"appInsights": {
"dimension": [],
"metricName": "select",
"timeGrain": "auto"
},
"azureLogAnalytics": {
"query": "//change this example to create your own time series query\n<table name> //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated) //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
"resultFormat": "time_series"
},
"azureMonitor": {
"aggOptions": [],
"dimensionFilter": "*",
"dimensionFilters": [],
"timeGrain": "auto",
"timeGrains": [],
"top": "10"
},
"azureResourceGraph": {
"query": "alertsmanagementresources\r\n| join kind=leftouter (ResourceContainers | where type=='microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where subscriptionId == \"$sub\" and properties.essentials.targetResourceGroup in ($rg) and properties.essentials.monitorCondition in ($mc)\r\nand properties.essentials.alertState in ($as) and properties.essentials.severity in ($sev)\r\nand todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| parse id with * \"alerts/\" alertId\r\n| project name, properties.essentials.severity, tostring(properties.essentials.monitorCondition), \r\ntostring(properties.essentials.alertState), todatetime(properties.essentials.lastModifiedDateTime), alertId\r\n",
"query": "alertsmanagementresources\r\n| join kind=leftouter (ResourceContainers | where type=='microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId\r\n| where type == \"microsoft.alertsmanagement/alerts\"\r\n| where tolower(subscriptionId) == tolower(\"$sub\") and properties.essentials.targetResourceGroup in~ ($rg) and properties.essentials.monitorCondition in~ ($mc)\r\nand properties.essentials.alertState in~ ($as) and properties.essentials.severity in~ ($sev)\r\nand todatetime(properties.essentials.lastModifiedDateTime) >= $__timeFrom and todatetime(properties.essentials.lastModifiedDateTime) <= $__timeTo\r\n| parse id with * \"alerts/\" alertId\r\n| project name, properties.essentials.severity, tostring(properties.essentials.monitorCondition), \r\ntostring(properties.essentials.alertState), todatetime(properties.essentials.lastModifiedDateTime), tostring(properties.essentials.monitorService), alertId\r\n",
"resultFormat": "table"
},
"datasource": {
@@ -851,11 +805,20 @@
"excludeByName": {
"alertId": false
},
"indexByName": {},
"indexByName": {
"alertId": 6,
"name": 0,
"properties_essentials_alertState": 3,
"properties_essentials_lastModifiedDateTime": 5,
"properties_essentials_monitorCondition": 2,
"properties_essentials_monitorService": 4,
"properties_essentials_severity": 1
},
"renameByName": {
"alertId": "Alert ID",
"name": "Name",
"properties_essentials_alertState": "User Response",
"properties_essentials_monitorService": "Monitor Service",
"properties_essentials_lastModifiedDateTime": "Fired Time",
"properties_essentials_monitorCondition": "Alert Condition",
"properties_essentials_severity": "Severity"
@@ -917,7 +880,7 @@
"definition": "ResourceGroups($sub)",
"hide": 0,
"includeAll": false,
"label": "Resource group",
"label": "Resource Group(s)",
"multi": true,
"name": "rg",
"options": [],
@@ -1042,9 +1005,7 @@
"hidden": false,
"refresh_intervals": ["30m", "1h", "12h", "24h", "3d", "7d", "30d"]
},
"timezone": "",
"title": "Azure Alert Consumption",
"title": "Azure / Alert Consumption",
"uid": "dyzn5SK7z",
"version": 45,
"weekStart": ""
"version": 45
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsRG.json
+2 -1
View File
@@ -2654,6 +2654,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure VM Monitoring - VM Insights by Resource Group",
"title": "Azure / Insights / Virtual Machines by Resource Group",
"uid": "AzVmInsightsByRG",
"version": 9
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsWorkspace.json
+2 -1
View File
@@ -2647,6 +2647,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Azure VM Monitoring - VM Insights by Workspace",
"title": "Azure / Insights / Virtual Machines by Workspace",
"uid": "AzVmInsightsByWS",
"version": 21
}
public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json
+10 -10
View File
@@ -4,26 +4,26 @@
"id": "grafana-azure-monitor-datasource",
"category": "cloud",
"includes": [
{ "type": "dashboard", "name": "Azure Monitor Storage Insights", "path": "dashboards/storage.json" },
{ "type": "dashboard", "name": "Azure Monitor CosmosDB Insights", "path": "dashboards/cosmosdb.json" },
{ "type": "dashboard", "name": "Azure Monitor Key Vault Insights", "path": "dashboards/keyvault.json" },
{ "type": "dashboard", "name": "Azure SQL Database Insights", "path": "dashboards/sqldb.json" },
{ "type": "dashboard", "name": "Azure Data Explorer Insights", "path": "dashboards/adx.json" },
{ "type": "dashboard", "name": "Azure Resource Overview", "path": "dashboards/arg.json" },
{ "type": "dashboard", "name": "Azure Alert Consumption", "path": "dashboards/v1Alerts.json" },
{ "type": "dashboard", "name": "Azure / Insights / Storage Accounts", "path": "dashboards/storage.json" },
{ "type": "dashboard", "name": "Azure / Insights / CosmosDB", "path": "dashboards/cosmosdb.json" },
{ "type": "dashboard", "name": "Azure / Insights / Key Vaults", "path": "dashboards/keyvault.json" },
{ "type": "dashboard", "name": "Azure / Insights / SQL Database", "path": "dashboards/sqldb.json" },
{ "type": "dashboard", "name": "Azure / Insights / Data Explorer Clusters", "path": "dashboards/adx.json" },
{ "type": "dashboard", "name": "Azure / Resources Overview", "path": "dashboards/arg.json" },
{ "type": "dashboard", "name": "Azure / Alert Consumption", "path": "dashboards/v1Alerts.json" },
{
"type": "dashboard",
"name": "Azure App Monitoring - Application Insights",
"name": "Azure / Insights / Applications",
"path": "dashboards/appInsights.json"
},
{
"type": "dashboard",
"name": "Azure VM Monitoring - VM Insights by Workspace",
"name": "Azure / Insights / Virtual Machines by Workspace",
"path": "dashboards/vMInsightsWorkspace.json"
},
{
"type": "dashboard",
"name": "Azure VM Monitoring - VM Insights by Resource Group",
"name": "Azure / Insights / Virtual Machines by Resource Group",
"path": "dashboards/vMInsightsRG.json"
}
],