refactoring

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

Author: mblaschke

config/opts.go

@@ -20,7 +20,7 @@ type (
 		}
 
 		Loganalytics struct {
-			Workspace []string `long:"loganalytics.workspace"   env:"LOGANALYTICS_WORKSPACE"  env-delim:" " description:"Loganalytics workspace IDs" required:"true"`
+			Workspace []string `long:"loganalytics.workspace"   env:"LOGANALYTICS_WORKSPACE"  env-delim:" " description:"Loganalytics workspace IDs"`
 			Parallel  int      `long:"loganalytics.parallel"   env:"LOGANALYTICS_PARALLEL"                        description:"Specifies how many workspaces should be queried in parallel" default:"5"`
 		}
 

global-metrics.go renamed to loganalytics/global-metrics.go

@@ -1,4 +1,4 @@
-package main
+package loganalytics
 
 import "github.com/prometheus/client_golang/prometheus"
 
@@ -8,7 +8,7 @@ var (
 	prometheusQueryRequests *prometheus.CounterVec
 )
 
-func initGlobalMetrics() {
+func InitGlobalMetrics() {
 	prometheusQueryTime = prometheus.NewSummaryVec(
 		prometheus.SummaryOpts{
 			Name: "azure_loganalytics_query_time",

misc.go renamed to loganalytics/misc.go

@@ -1,20 +1,20 @@
-package main
+package loganalytics
 
 import (
 	"fmt"
 	"net/url"
 	"strings"
 )
 
-func paramsGetList(params url.Values, name string) (list []string, err error) {
+func ParamsGetList(params url.Values, name string) (list []string, err error) {
 	for _, v := range params[name] {
 		list = append(list, strings.Split(v, ",")...)
 	}
 	return
 }
 
-func paramsGetListRequired(params url.Values, name string) (list []string, err error) {
-	list, err = paramsGetList(params, name)
+func ParamsGetListRequired(params url.Values, name string) (list []string, err error) {
+	list, err = ParamsGetList(params, name)
 
 	if len(list) == 0 {
 		err = fmt.Errorf("parameter \"%v\" is missing", name)

loganalytics.go renamed to loganalytics/prober.go

@@ -1,29 +1,39 @@
-package main
+package loganalytics
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
-	operationalinsightsProfile "github.com/Azure/azure-sdk-for-go/profiles/latest/operationalinsights/mgmt/operationalinsights"
 	"github.com/Azure/azure-sdk-for-go/services/operationalinsights/v1/operationalinsights"
 	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/patrickmn/go-cache"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/remeh/sizedwaitgroup"
 	log "github.com/sirupsen/logrus"
+	"github.com/webdevops/azure-loganalytics-exporter/config"
 	"github.com/webdevops/azure-resourcegraph-exporter/kusto"
 	"net/http"
 	"strconv"
 	"time"
 )
 
 const (
-	OPINSIGHTS_URL_SUFFIX = "/v1"
+	OperationInsightsWorkspaceUrlSuffix = "/v1"
 )
 
 type (
 	LogAnalyticsProber struct {
+		QueryConfig kusto.Config
+		Conf        config.Opts
+
+		Azure struct {
+			Environment          azure.Environment
+			OpInsightsAuthorizer autorest.Authorizer
+			AzureAuthorizer      autorest.Authorizer
+		}
+
 		workspaceList []string
 
 		request  *http.Request
@@ -48,11 +58,6 @@ type (
 		ServiceDiscovery LogAnalyticsServiceDiscovery
 	}
 
-	LogAnalyticsServiceDiscovery struct {
-		enabled bool
-		prober  *LogAnalyticsProber
-	}
-
 	LogAnalyticsProbeResult struct {
 		Name    string
 		Metrics []kusto.MetricRow
@@ -126,8 +131,8 @@ func (p *LogAnalyticsProber) AddWorkspaces(workspace ...string) {
 
 func (p *LogAnalyticsProber) LogAnalyticsQueryClient() operationalinsights.QueryClient {
 	// Create and authorize a operationalinsights client
-	client := operationalinsights.NewQueryClientWithBaseURI(AzureEnvironment.ResourceIdentifiers.OperationalInsights + OPINSIGHTS_URL_SUFFIX)
-	client.Authorizer = OpInsightsAuthorizer
+	client := operationalinsights.NewQueryClientWithBaseURI(p.Azure.Environment.ResourceIdentifiers.OperationalInsights + OperationInsightsWorkspaceUrlSuffix)
+	client.Authorizer = p.Azure.OpInsightsAuthorizer
 	client.ResponseInspector = p.respondDecorator(nil)
 	return client
 }
@@ -138,7 +143,7 @@ func (p *LogAnalyticsProber) Run() {
 	// check if value is cached
 	executeQuery := true
 	if p.cache != nil && p.config.cacheEnabled {
-		if v, ok := metricCache.Get(*p.config.cacheKey); ok {
+		if v, ok := p.cache.Get(*p.config.cacheKey); ok {
 			if cacheData, ok := v.([]byte); ok {
 				if err := json.Unmarshal(cacheData, &p.metricList); err == nil {
 					p.logger.Debug("fetched from cache")
@@ -165,7 +170,7 @@ func (p *LogAnalyticsProber) Run() {
 			p.logger.Debug("saving metrics to cache")
 			if cacheData, err := json.Marshal(p.metricList); err == nil {
 				p.response.Header().Add("X-metrics-cached-until", time.Now().Add(*p.config.cacheDuration).Format(time.RFC3339))
-				metricCache.Set(*p.config.cacheKey, cacheData, *p.config.cacheDuration)
+				p.cache.Set(*p.config.cacheKey, cacheData, *p.config.cacheDuration)
 				p.logger.Debugf("saved metric to cache for %s", p.config.cacheDuration.String())
 			}
 		}
@@ -197,7 +202,7 @@ func (p *LogAnalyticsProber) Run() {
 func (p *LogAnalyticsProber) executeQueries() {
 	queryClient := p.LogAnalyticsQueryClient()
 
-	for _, queryRow := range Config.Queries {
+	for _, queryRow := range p.QueryConfig.Queries {
 		queryConfig := queryRow
 
 		// check if query matches module name
@@ -342,7 +347,7 @@ func (p *LogAnalyticsProber) parseCacheTime(r *http.Request) (time.Duration, err
 }
 
 func (p *LogAnalyticsProber) NewSizedWaitGroup() sizedwaitgroup.SizedWaitGroup {
-	size := opts.Loganalytics.Parallel
+	size := p.Conf.Loganalytics.Parallel
 
 	parallelString := p.request.URL.Query().Get("parallel")
 	if parallelString != "" {
@@ -353,46 +358,3 @@ func (p *LogAnalyticsProber) NewSizedWaitGroup() sizedwaitgroup.SizedWaitGroup {
 
 	return sizedwaitgroup.New(size)
 }
-
-func (sd *LogAnalyticsServiceDiscovery) ResourcesClient(subscriptionId string) *operationalinsightsProfile.WorkspacesClient {
-	client := operationalinsightsProfile.NewWorkspacesClientWithBaseURI(AzureEnvironment.ResourceManagerEndpoint, subscriptionId)
-	client.Authorizer = AzureAuthorizer
-	client.ResponseInspector = sd.prober.respondDecorator(&subscriptionId)
-
-	return &client
-}
-
-func (sd *LogAnalyticsServiceDiscovery) Use() {
-	sd.enabled = true
-}
-func (sd *LogAnalyticsServiceDiscovery) Find() {
-	contextLogger := sd.prober.logger.WithFields(log.Fields{
-		"type": "servicediscovery",
-	})
-
-	contextLogger.Debug("requesting list for workspaces via Azure API")
-
-	params := sd.prober.request.URL.Query()
-
-	subscriptionList, _ := paramsGetList(params, "subscription")
-	for _, subscriptionId := range subscriptionList {
-		subscriptionLogger := contextLogger.WithFields(log.Fields{
-			"subscription": subscriptionId,
-		})
-
-		list, err := sd.ResourcesClient(subscriptionId).List(sd.prober.ctx)
-		if err != nil {
-			subscriptionLogger.Error(err)
-			panic(LogAnalyticsPanicStop{Message: err.Error()})
-		}
-
-		for _, val := range *list.Value {
-			if val.CustomerID != nil {
-				sd.prober.workspaceList = append(
-					sd.prober.workspaceList,
-					to.String(val.CustomerID),
-				)
-			}
-		}
-	}
-}

loganalytics/servicediscovery.go

@@ -0,0 +1,61 @@
+package loganalytics
+
+import (
+	operationalinsightsProfile "github.com/Azure/azure-sdk-for-go/profiles/latest/operationalinsights/mgmt/operationalinsights"
+	"github.com/Azure/go-autorest/autorest/to"
+	log "github.com/sirupsen/logrus"
+)
+
+type (
+	LogAnalyticsServiceDiscovery struct {
+		enabled bool
+		prober  *LogAnalyticsProber
+	}
+)
+
+func (sd *LogAnalyticsServiceDiscovery) ResourcesClient(subscriptionId string) *operationalinsightsProfile.WorkspacesClient {
+	client := operationalinsightsProfile.NewWorkspacesClientWithBaseURI(sd.prober.Azure.Environment.ResourceManagerEndpoint, subscriptionId)
+	client.Authorizer = sd.prober.Azure.AzureAuthorizer
+	client.ResponseInspector = sd.prober.respondDecorator(&subscriptionId)
+
+	return &client
+}
+
+func (sd *LogAnalyticsServiceDiscovery) Use() {
+	sd.enabled = true
+}
+
+func (sd *LogAnalyticsServiceDiscovery) Find() {
+	contextLogger := sd.prober.logger
+
+	contextLogger.Debug("requesting list for workspaces via Azure API")
+
+	params := sd.prober.request.URL.Query()
+
+	subscriptionList, err := ParamsGetListRequired(params, "subscription")
+	if err != nil {
+		contextLogger.Error(err)
+		panic(LogAnalyticsPanicStop{Message: err.Error()})
+	}
+
+	for _, subscriptionId := range subscriptionList {
+		subscriptionLogger := contextLogger.WithFields(log.Fields{
+			"subscription": subscriptionId,
+		})
+
+		list, err := sd.ResourcesClient(subscriptionId).List(sd.prober.ctx)
+		if err != nil {
+			subscriptionLogger.Error(err)
+			panic(LogAnalyticsPanicStop{Message: err.Error()})
+		}
+
+		for _, val := range *list.Value {
+			if val.CustomerID != nil {
+				sd.prober.workspaceList = append(
+					sd.prober.workspaceList,
+					to.String(val.CustomerID),
+				)
+			}
+		}
+	}
+}

main.go

@@ -10,6 +10,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
 	"github.com/webdevops/azure-loganalytics-exporter/config"
+	"github.com/webdevops/azure-loganalytics-exporter/loganalytics"
 	"github.com/webdevops/azure-resourcegraph-exporter/kusto"
 	"net/http"
 	"os"
@@ -45,7 +46,7 @@ func main() {
 
 	log.Infof("starting azure-loganalytics-exporter v%s (%s; %s; by %v)", gitTag, gitCommit, runtime.Version(), Author)
 	log.Info(string(opts.GetJson()))
-	initGlobalMetrics()
+	loganalytics.InitGlobalMetrics()
 
 	metricCache = cache.New(120*time.Second, 60*time.Second)
 

probe.go

@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
+	"github.com/webdevops/azure-loganalytics-exporter/loganalytics"
 	"net/http"
 )
 
 func handleProbePanic(w http.ResponseWriter, r *http.Request) {
 	if err := recover(); err != nil {
 		switch v := err.(type) {
-		case LogAnalyticsPanicStop:
+		case loganalytics.LogAnalyticsPanicStop:
 			// log entry already sent
 			msg := fmt.Sprintf("ERROR: %v", v.Message)
 			http.Error(w, msg, http.StatusBadRequest)
@@ -37,7 +38,6 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 
 	prober := NewLogAnalyticsProber(w, r)
 	prober.AddWorkspaces(opts.Loganalytics.Workspace...)
-	prober.EnableCache(metricCache)
 	prober.Run()
 
 	h := promhttp.HandlerFor(prober.GetPrometheusRegistry(), promhttp.HandlerOpts{})
@@ -47,14 +47,13 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 func handleProbeWorkspace(w http.ResponseWriter, r *http.Request) {
 	defer handleProbePanic(w, r)
 
-	workspaceList, err := paramsGetListRequired(r.URL.Query(), "workspace")
+	workspaceList, err := loganalytics.ParamsGetListRequired(r.URL.Query(), "workspace")
 	if err != nil {
 		panic("no workspaces defined")
 	}
 
 	prober := NewLogAnalyticsProber(w, r)
 	prober.AddWorkspaces(workspaceList...)
-	prober.EnableCache(metricCache)
 	prober.Run()
 
 	h := promhttp.HandlerFor(prober.GetPrometheusRegistry(), promhttp.HandlerOpts{})
@@ -66,9 +65,20 @@ func handleProbeSubscriptionRequest(w http.ResponseWriter, r *http.Request) {
 
 	prober := NewLogAnalyticsProber(w, r)
 	prober.ServiceDiscovery.Use()
-	prober.EnableCache(metricCache)
 	prober.Run()
 
 	h := promhttp.HandlerFor(prober.GetPrometheusRegistry(), promhttp.HandlerOpts{})
 	h.ServeHTTP(w, r)
 }
+
+func NewLogAnalyticsProber(w http.ResponseWriter, r *http.Request) *loganalytics.LogAnalyticsProber {
+	prober := loganalytics.NewLogAnalyticsProber(w, r)
+	prober.QueryConfig = Config
+	prober.Conf = opts
+	prober.Azure.AzureAuthorizer = AzureAuthorizer
+	prober.Azure.OpInsightsAuthorizer = OpInsightsAuthorizer
+	prober.Azure.Environment = AzureEnvironment
+	prober.EnableCache(metricCache)
+
+	return prober
+}