Skip to content

Add Grafana integrations #20072

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

Merged
akning-ms merged 1 commit into from
Aug 3, 2022
Merged

Add Grafana integrations #20072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions ...board/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
9 changes: 8 additions & 1 deletion ...ashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 8 additions & 1 deletion ...shboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 8 additions & 1 deletion ...e-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
27 changes: 24 additions & 3 deletions ...board/resource-manager/Microsoft.Dashboard/stable/2022-08-01/examples/Grafana_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
}
},
Expand All @@ -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"
Expand All @@ -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"
Expand Down
29 changes: 29 additions & 0 deletions specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2022-08-01/grafana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,9 @@
"autoGeneratedDomainNameLabelScope": {
"description": "Scope for dns deterministic name hash calculation.",
"$ref": "#/definitions/AutoGeneratedDomainNameLabelScope"
},
"grafanaIntegrations": {
"$ref": "#/definitions/GrafanaIntegrations"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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": {
Expand Down