diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json index decb6acaac1..be3d125d7c4 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json @@ -8482,7 +8482,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Azure Data Explorer Cluster Resource Insights", + "title": "Azure / Insights / Data Explorer Clusters", "uid": "8UDB1s3Gk", "version": 10 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsights.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsights.json index 3fd3770b797..ebe8bd11f18 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsights.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsights.json @@ -2537,6 +2537,6 @@ }, "timepicker": {}, "timezone": "", - "title": "Azure App monitoring - Application Insights", + "title": "Azure / Insights / Applications", "version": 10 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/arg.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/arg.json index 803617d549c..224a86057c0 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/arg.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/arg.json @@ -4009,7 +4009,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Azure Resources Overview", + "title": "Azure / Resources Overview", "uid": "Mtwt2BV7k", "version": 3 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json index f8c3ed58acc..70c3bdb42a2 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json @@ -4999,7 +4999,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Cosmos DB Insights", + "title": "Azure / Insights / Cosmos DB", "uid": "INH9berMk", "version": 17 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json index 0d4a172292e..533f9e02c53 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json @@ -2676,7 +2676,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Key vault Insights", + "title": "Azure / Insights / Key vaults", "uid": "tQZAMYrMk", "version": 42 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json index e58f472107c..f6268102071 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json @@ -4547,7 +4547,7 @@ }, "timepicker": {}, "timezone": "browser", - "title": "Azure SQL Database", + "title": "Azure / Insights / SQL Database", "uid": "cIld6iqMk", "version": 69 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json index a81b7e592cc..af4f775a4ac 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json @@ -6424,7 +6424,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Azure Storage Insights", + "title": "Azure / Insights / Storage Accounts", "uid": "3n2E8CrGk", "version": 28 } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json index f3a0bb4b2c0..a8adcc5ae6d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json @@ -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