diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Create.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Create.json index fe11b37e409a..c72e1969c201 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Create.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Create.json @@ -12,7 +12,14 @@ "publicNetworkAccess": "Enabled", "zoneRedundancy": "Enabled", "apiKey": "Enabled", - "deterministicOutboundIP": "Enabled" + "deterministicOutboundIP": "Enabled", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "identity": { "type": "SystemAssigned" @@ -44,7 +51,14 @@ "192.168.0.2" ], "publicNetworkAccess": "Enabled", - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "identity": { "type": "SystemAssigned" @@ -79,7 +93,14 @@ "apiKey": "Enabled", "deterministicOutboundIP": "Enabled", "publicNetworkAccess": "Enabled", - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev" diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Get.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Get.json index eca0f1e8d976..a4c53c306ce0 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Get.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Get.json @@ -25,7 +25,14 @@ "192.168.0.1", "192.168.0.2" ], - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev" diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_List.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_List.json index 17955e78c360..8fdf7ebfbcce 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_List.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_List.json @@ -25,7 +25,14 @@ "192.168.0.1", "192.168.0.2" ], - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev" diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_ListByResourceGroup.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_ListByResourceGroup.json index 32dcecbba15c..b9e2c93a9ca5 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_ListByResourceGroup.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_ListByResourceGroup.json @@ -26,7 +26,14 @@ "192.168.0.1", "192.168.0.2" ], - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev" diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Update.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Update.json index 0d67a6f5740e..d95c7b667d0d 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Update.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Update.json @@ -10,7 +10,14 @@ }, "properties": { "apiKey": "Enabled", - "deterministicOutboundIP": "Enabled" + "deterministicOutboundIP": "Enabled", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } } } }, @@ -34,7 +41,14 @@ "192.168.0.1", "192.168.0.2" ], - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev 2" @@ -58,7 +72,14 @@ "apiKey": "Enabled", "deterministicOutboundIP": "Enabled", "publicNetworkAccess": "Enabled", - "autoGeneratedDomainNameLabelScope": "TenantReuse" + "autoGeneratedDomainNameLabelScope": "TenantReuse", + "grafanaIntegrations": { + "azureMonitorWorkspaceIntegrations": [ + { + "azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + } + ] + } }, "tags": { "Environment": "Dev 2" diff --git a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/grafana.json b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/grafana.json index bfb8ec608f92..3949102a2125 100644 --- a/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/grafana.json +++ b/specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/grafana.json @@ -793,6 +793,9 @@ "autoGeneratedDomainNameLabelScope": { "description": "Scope for dns deterministic name hash calculation.", "$ref": "#/definitions/AutoGeneratedDomainNameLabelScope" + }, + "grafanaIntegrations": { + "$ref": "#/definitions/GrafanaIntegrations" } } }, @@ -836,6 +839,9 @@ "publicNetworkAccess": { "description": "Indicate the state for enable or disable traffic over the public interface.", "$ref": "#/definitions/PublicNetworkAccess" + }, + "grafanaIntegrations": { + "$ref": "#/definitions/GrafanaIntegrations" } } }, @@ -932,6 +938,29 @@ "create" ] }, + "GrafanaIntegrations": { + "description": "GrafanaIntegrations is a bundled observability experience (e.g. pre-configured data source, tailored Grafana dashboards, alerting defaults) for common monitoring scenarios.", + "type": "object", + "properties": { + "azureMonitorWorkspaceIntegrations": { + "type": "array", + "x-ms-identifiers": [], + "items": { + "$ref": "#/definitions/AzureMonitorWorkspaceIntegration" + } + } + } + }, + "AzureMonitorWorkspaceIntegration": { + "description": "Integrations for Azure Monitor Workspace.", + "type": "object", + "properties": { + "azureMonitorWorkspaceResourceId": { + "description": "The resource Id of the connected Azure Monitor Workspace.", + "type": "string" + } + } + }, "PrivateEndpointConnection": { "type": "object", "properties": {