Browse Source

azuremonitor: don't use make for maps and array

Daniel Lee 6 years ago
parent
commit
ac345312a4

+ 3 - 3
pkg/tsdb/azuremonitor/azuremonitor-datasource.go

@@ -41,7 +41,7 @@ var (
 // 3. parses the responses for each query into the timeseries format
 // 3. parses the responses for each query into the timeseries format
 func (e *AzureMonitorDatasource) executeTimeSeriesQuery(ctx context.Context, originalQueries []*tsdb.Query, timeRange *tsdb.TimeRange) (*tsdb.Response, error) {
 func (e *AzureMonitorDatasource) executeTimeSeriesQuery(ctx context.Context, originalQueries []*tsdb.Query, timeRange *tsdb.TimeRange) (*tsdb.Response, error) {
 	result := &tsdb.Response{
 	result := &tsdb.Response{
-		Results: make(map[string]*tsdb.QueryResult),
+		Results: map[string]*tsdb.QueryResult{},
 	}
 	}
 
 
 	queries, err := e.buildQueries(originalQueries, timeRange)
 	queries, err := e.buildQueries(originalQueries, timeRange)
@@ -84,7 +84,7 @@ func (e *AzureMonitorDatasource) buildQueries(queries []*tsdb.Query, timeRange *
 		azureMonitorTarget := query.Model.Get("azureMonitor").MustMap()
 		azureMonitorTarget := query.Model.Get("azureMonitor").MustMap()
 		azlog.Debug("AzureMonitor", "target", azureMonitorTarget)
 		azlog.Debug("AzureMonitor", "target", azureMonitorTarget)
 
 
-		urlComponents := make(map[string]string)
+		urlComponents := map[string]string{}
 		urlComponents["resourceGroup"] = fmt.Sprintf("%v", azureMonitorTarget["resourceGroup"])
 		urlComponents["resourceGroup"] = fmt.Sprintf("%v", azureMonitorTarget["resourceGroup"])
 		urlComponents["metricDefinition"] = fmt.Sprintf("%v", azureMonitorTarget["metricDefinition"])
 		urlComponents["metricDefinition"] = fmt.Sprintf("%v", azureMonitorTarget["metricDefinition"])
 		urlComponents["resourceName"] = fmt.Sprintf("%v", azureMonitorTarget["resourceName"])
 		urlComponents["resourceName"] = fmt.Sprintf("%v", azureMonitorTarget["resourceName"])
@@ -247,7 +247,7 @@ func (e *AzureMonitorDatasource) parseResponse(queryRes *tsdb.QueryResult, data
 	}
 	}
 
 
 	for _, series := range data.Value[0].Timeseries {
 	for _, series := range data.Value[0].Timeseries {
-		points := make([]tsdb.TimePoint, 0)
+		points := []tsdb.TimePoint{}
 
 
 		metadataName := ""
 		metadataName := ""
 		metadataValue := ""
 		metadataValue := ""

+ 1 - 1
pkg/tsdb/azuremonitor/azuremonitor.go

@@ -46,7 +46,7 @@ func (e *AzureMonitorExecutor) Query(ctx context.Context, dsInfo *models.DataSou
 	var result *tsdb.Response
 	var result *tsdb.Response
 	var err error
 	var err error
 
 
-	azureMonitorQueries := make([]*tsdb.Query, 0)
+	var azureMonitorQueries []*tsdb.Query
 
 
 	for _, query := range tsdbQuery.Queries {
 	for _, query := range tsdbQuery.Queries {
 		queryType := query.Model.Get("queryType").MustString("")
 		queryType := query.Model.Get("queryType").MustString("")

+ 1 - 1
pkg/tsdb/azuremonitor/time-grain.go

@@ -34,7 +34,7 @@ func (tg *TimeGrain) createISO8601DurationFromIntervalMS(interval int64) (string
 	unit := formatted[len(formatted)-1:]
 	unit := formatted[len(formatted)-1:]
 
 
 	if unit == "s" && timeValue < 60 {
 	if unit == "s" && timeValue < 60 {
-		// mimumum interval is 1m for Azure Monitor
+		// minimum interval is 1m for Azure Monitor
 		return "PT1M", nil
 		return "PT1M", nil
 	}
 	}