implement proper azure cloud environment support

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

azure_loganalytics.go

@@ -24,13 +24,13 @@ func NewAzureLogAnalysticsMetrics() *AzureLogAnalysticsMetrics {
 func (m *AzureLogAnalysticsMetrics) QueryClient() *operationalinsights.QueryClient {
 	if m.client == nil {
 		m.clientMutex.Lock()
-		keyvaultAuth, err := auth.NewAuthorizerFromEnvironmentWithResource("https://api.loganalytics.io")
+		authorizer, err := auth.NewAuthorizerFromEnvironmentWithResource(AzureEnvironment.ResourceIdentifiers.OperationalInsights)
 		if err != nil {
 			panic(err)
 		}
 
 		client := operationalinsights.NewQueryClient()
-		client.Authorizer = keyvaultAuth
+		client.Authorizer = authorizer
 		m.client = &client
 		m.clientMutex.Unlock()
 	}

config/opts.go

@@ -14,10 +14,17 @@ type (
 			LogJson bool `           long:"log.json"     env:"LOG_JSON" description:"Switch log output to json format"`
 		}
 
-		// concurrency settings
-		ConcurrencySubscription         int  `long:"concurrency.subscription"          env:"CONCURRENCY_SUBSCRIPTION"           description:"Concurrent subscription fetches"                                  default:"5"`
-		ConcurrencySubscriptionResource int  `long:"concurrency.subscription.resource" env:"CONCURRENCY_SUBSCRIPTION_RESOURCE"  description:"Concurrent requests per resource (inside subscription requests)"  default:"10"`
-		Cache                           bool `long:"enable-caching"                    env:"ENABLE_CACHING"                     description:"Enable internal caching"`
+		// azure
+		Azure struct {
+			Environment *string `long:"azure-environment"            env:"AZURE_ENVIRONMENT"                description:"Azure environment name" default:"AZUREPUBLICCLOUD"`
+		}
+
+		// Prober settings
+		Prober struct {
+			ConcurrencySubscription         int  `long:"concurrency.subscription"          env:"CONCURRENCY_SUBSCRIPTION"           description:"Concurrent subscription fetches"                                  default:"5"`
+			ConcurrencySubscriptionResource int  `long:"concurrency.subscription.resource" env:"CONCURRENCY_SUBSCRIPTION_RESOURCE"  description:"Concurrent requests per resource (inside subscription requests)"  default:"10"`
+			Cache                           bool `long:"enable-caching"                    env:"ENABLE_CACHING"                     description:"Enable internal caching"`
+		}
 
 		// general options
 		ServerBind string `long:"bind"     env:"SERVER_BIND"   description:"Server address"     default:":8080"`

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/azure/auth"
 	"github.com/jessevdk/go-flags"
 	"github.com/patrickmn/go-cache"
@@ -42,7 +43,8 @@ var (
 	argparser *flags.Parser
 	opts      config.Opts
 
-	AzureAuthorizer autorest.Authorizer
+	AzureEnvironment azure.Environment
+	AzureAuthorizer  autorest.Authorizer
 
 	prometheusCollectTime    *prometheus.SummaryVec
 	prometheusMetricRequests *prometheus.CounterVec
@@ -125,10 +127,15 @@ func initArgparser() {
 func initAzureConnection() {
 	var err error
 
+	AzureEnvironment, err = azure.EnvironmentFromName(*opts.Azure.Environment)
+	if err != nil {
+		log.Panic(err)
+	}
+
 	// setup azure authorizer
 	AzureAuthorizer, err = auth.NewAuthorizerFromEnvironment()
 	if err != nil {
-		panic(err)
+		log.Panic(err)
 	}
 
 	azureInsightMetrics = NewAzureInsightMetrics()

probe_loganalytics_query.go

@@ -20,7 +20,7 @@ func probeLogAnalyticsQueryHandler(w http.ResponseWriter, r *http.Request) {
 	startTime := time.Now()
 
 	contextLogger := buildContextLoggerFromRequest(r)
-	
+
 	// If a timeout is configured via the Prometheus header, add it to the request.
 	timeoutSeconds, err = getPrometheusTimeout(r, ProbeLoganalyticsScrapeTimeoutDefault)
 	if err != nil {

probe_metrics_list.go

@@ -16,7 +16,7 @@ import (
 func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) {
 	var err error
 	var timeoutSeconds float64
-	wg := sizedwaitgroup.New(opts.ConcurrencySubscription)
+	wg := sizedwaitgroup.New(opts.Prober.ConcurrencySubscription)
 
 	startTime := time.Now()
 
@@ -57,7 +57,7 @@ func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) {
 			wg.Add()
 			go func(subscription string) {
 				defer wg.Done()
-				wgResource := sizedwaitgroup.New(opts.ConcurrencySubscriptionResource)
+				wgResource := sizedwaitgroup.New(opts.Prober.ConcurrencySubscriptionResource)
 
 				// fetch list of resources
 				list, err := azureInsightMetrics.ListResources(subscription, settings.Filter)
@@ -78,7 +78,7 @@ func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) {
 
 						resourceLogger := contextLogger.WithFields(log.Fields{
 							"azureSubscription": subscription,
-							"azureResource": *val.ID,
+							"azureResource":     *val.ID,
 						})
 
 						if err == nil {

probe_metrics_resource.go

@@ -70,7 +70,7 @@ func probeMetricsResourceHandler(w http.ResponseWriter, r *http.Request) {
 
 			resourceLogger := contextLogger.WithFields(log.Fields{
 				"azureSubscription": subscription,
-				"azureResource": target,
+				"azureResource":     target,
 			})
 
 			if err != nil {

probe_metrics_scrape.go

@@ -17,7 +17,7 @@ func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) {
 	var err error
 	var timeoutSeconds float64
 	var metricTagName, aggregationTagName string
-	wg := sizedwaitgroup.New(opts.ConcurrencySubscription)
+	wg := sizedwaitgroup.New(opts.Prober.ConcurrencySubscription)
 	params := r.URL.Query()
 
 	startTime := time.Now()
@@ -70,11 +70,10 @@ func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) {
 			wg.Add()
 			go func(subscription string) {
 				defer wg.Done()
-				wgResource := sizedwaitgroup.New(opts.ConcurrencySubscriptionResource)
+				wgResource := sizedwaitgroup.New(opts.Prober.ConcurrencySubscriptionResource)
 
 				list, err := azureInsightMetrics.ListResources(subscription, settings.Filter)
 
-
 				if err != nil {
 					contextLogger.Errorln(err)
 					http.Error(w, err.Error(), http.StatusBadRequest)
@@ -86,7 +85,7 @@ func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) {
 
 					resourceLogger := contextLogger.WithFields(log.Fields{
 						"azureSubscription": subscription,
-						"azureResource": *val.ID,
+						"azureResource":     *val.ID,
 					})
 
 					wgResource.Add()

request.metric.go

@@ -100,7 +100,7 @@ func NewRequestMetricSettings(r *http.Request) (RequestMetricSettings, error) {
 	ret.MetricOrderBy = paramsGetWithDefault(params, "metricOrderBy", "")
 
 	// param cache (timespan as default)
-	if opts.Cache {
+	if opts.Prober.Cache {
 		cacheDefaultDuration, err := iso8601.FromString(ret.Timespan)
 		cacheDefaultDurationString := ""
 		if err == nil {