IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure Monitor: Append /default to the resource URI if needed (#52884)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2022-07-27 16:49:51 +02:00 committed by GitHub
parent dc0ef2913e
commit d66e178b66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/azuremonitor/metrics/url-builder.go
View File

@ -33,6 +33,11 @@ func (params *urlBuilder) buildResourceURI() string {
provider := metricNamespaceArray[0] provider := metricNamespaceArray[0]
metricNamespaceArray = metricNamespaceArray[1:] metricNamespaceArray = metricNamespaceArray[1:]
if strings.HasPrefix(strings.ToLower(params.MetricNamespace), "microsoft.storage/storageaccounts/") &&
!strings.HasSuffix(params.ResourceName, "default") {
resourceNameArray = append(resourceNameArray, "default")
}
urlArray := []string{ urlArray := []string{
"/subscriptions", "/subscriptions",
subscription, subscription,

12
pkg/tsdb/azuremonitor/metrics/url-builder_test.go
View File

@ -91,6 +91,18 @@ func TestURLBuilder(t *testing.T) {
url := ub.BuildMetricsURL() 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) 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)
})
}) })
}) })
} }