cleanup

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

README.md

@@ -52,7 +52,6 @@ Global metrics
 | `azure_loganalytics_query_time`     | Summary metric about query execution time (incl. all subqueries)               |
 | `azure_loganalytics_query_results`  | Number of results from query                                                   |
 | `azure_loganalytics_query_requests` | Count of requests (eg paged subqueries) per query                              |
-| `azure_loganalytics_ratelimit`      | Current rate limit value from the Azure loganalytics API                      |
 
 
 Example

config/opts.go

@@ -16,7 +16,7 @@ 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"`
 		}
 
 		Loganalytics struct {

global-metrics.go

@@ -6,7 +6,6 @@ var (
 	prometheusQueryTime     *prometheus.SummaryVec
 	prometheusQueryResults  *prometheus.GaugeVec
 	prometheusQueryRequests *prometheus.CounterVec
-	prometheusRateLimit     *prometheus.GaugeVec
 )
 
 func initGlobalMetrics() {
@@ -46,13 +45,4 @@ func initGlobalMetrics() {
 		},
 	)
 	prometheus.MustRegister(prometheusQueryRequests)
-
-	prometheusRateLimit = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name: "azure_loganalytics_ratelimit",
-			Help: "Azure loganalytics ratelimit",
-		},
-		[]string{},
-	)
-	prometheus.MustRegister(prometheusRateLimit)
 }

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/subscriptions"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/azure/auth"
@@ -28,12 +27,10 @@ var (
 	argparser *flags.Parser
 	opts      config.Opts
 
-	Config    kusto.Config
+	Config kusto.Config
 
-	AzureAuthorizer       autorest.Authorizer
-	OpInsightsAuthorizer  autorest.Authorizer
-	AzureSubscriptions    []subscriptions.Subscription
-	AzureEnvironment      azure.Environment
+	OpInsightsAuthorizer autorest.Authorizer
+	AzureEnvironment     azure.Environment
 
 	metricCache *cache.Cache
 
@@ -121,12 +118,6 @@ func readConfig() {
 func initAzureConnection() {
 	var err error
 
-	// setup azure authorizer
-	AzureAuthorizer, err = auth.NewAuthorizerFromEnvironment()
-	if err != nil {
-		log.Panic(err)
-	}
-
 	AzureEnvironment, err = azure.EnvironmentFromName(*opts.Azure.Environment)
 	if err != nil {
 		log.Panic(err)

probe.go

@@ -12,12 +12,11 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/webdevops/azure-resourcegraph-exporter/kusto"
 	"net/http"
-	"strconv"
 	"time"
 )
 
 const (
-	RESOURCEGRAPH_QUERY_OPTIONS_TOP = 1000
+	OPINSIGHTS_URL_SUFFIX = "/v1"
 )
 
 func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
@@ -44,14 +43,8 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 
 	ctx := context.Background()
 
-	defaultSubscriptions := []string{}
-	for _, subscription := range AzureSubscriptions {
-		defaultSubscriptions = append(defaultSubscriptions, *subscription.SubscriptionID)
-	}
-
-	// Create and authorize a ResourceGraph client
-//	queryClient := operationalinsights.NewQueryClientWithBaseURI(AzureEnvironment.ResourceIdentifiers.OperationalInsights + "/v1/")
-	queryClient := operationalinsights.NewQueryClient()
+	// Create and authorize a operationalinsights client
+	queryClient := operationalinsights.NewQueryClientWithBaseURI(AzureEnvironment.ResourceIdentifiers.OperationalInsights + OPINSIGHTS_URL_SUFFIX)
 	queryClient.Authorizer = OpInsightsAuthorizer
 	queryClient.ResponseInspector = respondDecorator()
 
@@ -83,7 +76,6 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 			}
 			startTime := time.Now()
 
-
 			contextLogger := probeLogger.WithField("metric", queryConfig.Metric)
 
 			if queryConfig.Timespan == nil {
@@ -100,8 +92,8 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 				// Set options
 				workspaces := []string{}
 				queryBody := operationalinsights.QueryBody{
-					Query: &queryConfig.Query,
-					Timespan: queryConfig.Timespan,
+					Query:      &queryConfig.Query,
+					Timespan:   queryConfig.Timespan,
 					Workspaces: &workspaces,
 				}
 
@@ -115,7 +107,7 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 					contextLogger.Debug("parsing result")
 					resultTables := *results.Tables
 
-					if resultTables != nil && len(resultTables) == 1 {
+					if len(resultTables) == 1 {
 						for _, v := range *resultTables[0].Rows {
 							resultTotalRecords++
 							resultRow := map[string]interface{}{}
@@ -126,7 +118,7 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 
 							for metricName, metric := range kusto.BuildPrometheusMetricList(queryConfig.Metric, queryConfig.MetricConfig, resultRow) {
 								// inject workspaceId
-								for num, _ := range metric {
+								for num := range metric {
 									metric[num].Labels["workspaceId"] = workspaceId
 								}
 
@@ -188,10 +180,6 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 func respondDecorator() autorest.RespondDecorator {
 	return func(p autorest.Responder) autorest.Responder {
 		return autorest.ResponderFunc(func(r *http.Response) error {
-			ratelimit := r.Header.Get("x-ms-user-quota-remaining")
-			if v, err := strconv.ParseInt(ratelimit, 10, 64); err == nil {
-				prometheusRateLimit.WithLabelValues().Set(float64(v))
-			}
 			return nil
 		})
 	}