mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Azure Monitor: Append /default to the resource URI if needed (#52884)
This commit is contained in:
parent
dc0ef2913e
commit
d66e178b66
@ -33,6 +33,11 @@ func (params *urlBuilder) buildResourceURI() string {
|
||||
provider := metricNamespaceArray[0]
|
||||
metricNamespaceArray = metricNamespaceArray[1:]
|
||||
|
||||
if strings.HasPrefix(strings.ToLower(params.MetricNamespace), "microsoft.storage/storageaccounts/") &&
|
||||
!strings.HasSuffix(params.ResourceName, "default") {
|
||||
resourceNameArray = append(resourceNameArray, "default")
|
||||
}
|
||||
|
||||
urlArray := []string{
|
||||
"/subscriptions",
|
||||
subscription,
|
||||
|
@ -91,6 +91,18 @@ func TestURLBuilder(t *testing.T) {
|
||||
url := ub.BuildMetricsURL()
|
||||
assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.NetApp/netAppAccounts/rn1/capacityPools/rn2/volumes/rn3/providers/microsoft.insights/metrics", url)
|
||||
})
|
||||
|
||||
t.Run("when metric definition is Microsoft.Storage/storageAccounts/blobServices", func(t *testing.T) {
|
||||
ub := &urlBuilder{
|
||||
DefaultSubscription: "default-sub",
|
||||
ResourceGroup: "rg",
|
||||
MetricNamespace: "Microsoft.Storage/storageAccounts/blobServices",
|
||||
ResourceName: "rn1",
|
||||
}
|
||||
|
||||
url := ub.buildResourceURI()
|
||||
assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default", url)
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user