Merge pull request #2 from sfairat15/fix-clients-base-uri

Fix clients base uri according Azure Cloud

Author: mblaschke

README.md

@@ -24,6 +24,7 @@ Application Options:
  -v, --verbose verbose mode [$VERBOSE]
  --log.json Switch log output to json format [$LOG_JSON]
  --azure-environment= Azure environment name (default: AZUREPUBLICCLOUD) [$AZURE_ENVIRONMENT]
+ --azure-ad-resource-url= Specifies the AAD resource ID to use. If not set, it defaults to ResourceManagerEndpoint for operations with Azure Resource Manager [$AZURE_AD_RESOURCE]
  --concurrency.subscription= Concurrent subscription fetches (default: 5) [$CONCURRENCY_SUBSCRIPTION]
  --concurrency.subscription.resource= Concurrent requests per resource (inside subscription requests) (default:
  10) [$CONCURRENCY_SUBSCRIPTION_RESOURCE]

azure_insights.go

@@ -34,7 +34,7 @@ func (m *AzureInsightMetrics) MetricsClient(subscriptionId string) *insights.Met
 m.clientMutex.Lock()
 
 if _, ok := m.metricsClientCache[subscriptionId]; !ok {
-client := insights.NewMetricsClient(subscriptionId)
+client := insights.NewMetricsClientWithBaseURI(AzureAdResourceUrl, subscriptionId)
 client.Authorizer = AzureAuthorizer
 m.metricsClientCache[subscriptionId] = &client
 }
@@ -49,7 +49,7 @@ func (m *AzureInsightMetrics) ResourcesClient(subscriptionId string) *resources.
 m.clientMutex.Lock()
 
 if _, ok := m.resourceClientCache[subscriptionId]; !ok {
-client := resources.NewClient(subscriptionId)
+client := resources.NewClientWithBaseURI(AzureAdResourceUrl, subscriptionId)
 client.Authorizer = AzureAuthorizer
 m.resourceClientCache[subscriptionId] = &client
 }

config/opts.go

@@ -16,7 +16,8 @@ type (
 
 // azure
 Azure struct {
-Environment *string `long:"azure-environment" env:"AZURE_ENVIRONMENT" description:"Azure environment name" default:"AZUREPUBLICCLOUD"`
+Environment *string `long:"azure-environment" env:"AZURE_ENVIRONMENT" description:"Azure environment name" default:"AZUREPUBLICCLOUD"`
+AdResourceUrl *string `long:"azure-ad-resource-url" env:"AZURE_AD_RESOURCE" description:"Specifies the AAD resource ID to use. If not set, it defaults to ResourceManagerEndpoint for operations with Azure Resource Manager"`
 }
 
 // Prober settings

main.go

@@ -43,8 +43,9 @@ var (
 argparser *flags.Parser
 opts config.Opts
 
-AzureEnvironment azure.Environment
-AzureAuthorizer autorest.Authorizer
+AzureEnvironment azure.Environment
+AzureAuthorizer autorest.Authorizer
+AzureAdResourceUrl string
 
 prometheusCollectTime *prometheus.SummaryVec
 prometheusMetricRequests *prometheus.CounterVec
@@ -132,6 +133,12 @@ func initAzureConnection() {
 log.Panic(err)
 }
 
+if opts.Azure.AdResourceUrl == nil {
+AzureAdResourceUrl = AzureEnvironment.ResourceManagerEndpoint
+} else {
+AzureAdResourceUrl = *opts.Azure.AdResourceUrl
+}
+
 // setup azure authorizer
 AzureAuthorizer, err = auth.NewAuthorizerFromEnvironment()
 if err != nil {