From ac345312a46f86f520af0b5399b08df29685b1d9 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 11 Feb 2019 14:42:12 +0100 Subject: [PATCH] azuremonitor: don't use make for maps and array --- pkg/tsdb/azuremonitor/azuremonitor-datasource.go | 6 +++--- pkg/tsdb/azuremonitor/azuremonitor.go | 2 +- pkg/tsdb/azuremonitor/time-grain.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/tsdb/azuremonitor/azuremonitor-datasource.go b/pkg/tsdb/azuremonitor/azuremonitor-datasource.go index 5def94aebf6..cae8d8bfb73 100644 --- a/pkg/tsdb/azuremonitor/azuremonitor-datasource.go +++ b/pkg/tsdb/azuremonitor/azuremonitor-datasource.go @@ -41,7 +41,7 @@ var ( // 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) { result := &tsdb.Response{ - Results: make(map[string]*tsdb.QueryResult), + Results: map[string]*tsdb.QueryResult{}, } queries, err := e.buildQueries(originalQueries, timeRange) @@ -84,7 +84,7 @@ func (e *AzureMonitorDatasource) buildQueries(queries []*tsdb.Query, timeRange * azureMonitorTarget := query.Model.Get("azureMonitor").MustMap() azlog.Debug("AzureMonitor", "target", azureMonitorTarget) - urlComponents := make(map[string]string) + urlComponents := map[string]string{} urlComponents["resourceGroup"] = fmt.Sprintf("%v", azureMonitorTarget["resourceGroup"]) urlComponents["metricDefinition"] = fmt.Sprintf("%v", azureMonitorTarget["metricDefinition"]) 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 { - points := make([]tsdb.TimePoint, 0) + points := []tsdb.TimePoint{} metadataName := "" metadataValue := "" diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go index 32d4a6f0f29..31a42d21a12 100644 --- a/pkg/tsdb/azuremonitor/azuremonitor.go +++ b/pkg/tsdb/azuremonitor/azuremonitor.go @@ -46,7 +46,7 @@ func (e *AzureMonitorExecutor) Query(ctx context.Context, dsInfo *models.DataSou var result *tsdb.Response var err error - azureMonitorQueries := make([]*tsdb.Query, 0) + var azureMonitorQueries []*tsdb.Query for _, query := range tsdbQuery.Queries { queryType := query.Model.Get("queryType").MustString("") diff --git a/pkg/tsdb/azuremonitor/time-grain.go b/pkg/tsdb/azuremonitor/time-grain.go index e6a15aef64f..425e39b6208 100644 --- a/pkg/tsdb/azuremonitor/time-grain.go +++ b/pkg/tsdb/azuremonitor/time-grain.go @@ -34,7 +34,7 @@ func (tg *TimeGrain) createISO8601DurationFromIntervalMS(interval int64) (string unit := formatted[len(formatted)-1:] if unit == "s" && timeValue < 60 { - // mimumum interval is 1m for Azure Monitor + // minimum interval is 1m for Azure Monitor return "PT1M", nil }