Browse Source

azuremonitor: small refactoring

Daniel Lee 7 years ago
parent
commit
d6904ba9b4
2 changed files with 11 additions and 11 deletions
  1. 11 0
      pkg/tsdb/azuremonitor/azuremonitor-datasource.go
  2. 0 11
      pkg/tsdb/azuremonitor/legend-key.go

+ 11 - 0
pkg/tsdb/azuremonitor/azuremonitor-datasource.go

@@ -285,6 +285,9 @@ func (e *AzureMonitorDatasource) parseResponse(queryRes *tsdb.QueryResult, data
 	return nil
 }
 
+// findClosestAllowedIntervalMs is used for the auto time grain setting.
+// It finds the closest time grain from the list of allowed time grains for Azure Monitor
+// using the Grafana interval in milliseconds
 func (e *AzureMonitorDatasource) findClosestAllowedIntervalMs(intervalMs int64) int64 {
 	closest := allowedIntervalsMS[0]
 
@@ -299,3 +302,11 @@ func (e *AzureMonitorDatasource) findClosestAllowedIntervalMs(intervalMs int64)
 	}
 	return closest
 }
+
+// formatLegendKey builds the legend key or timeseries name
+func formatLegendKey(resourceName string, metricName string, metadataName string, metadataValue string) string {
+	if len(metadataName) > 0 {
+		return fmt.Sprintf("%s{%s=%s}.%s", resourceName, metadataName, metadataValue, metricName)
+	}
+	return fmt.Sprintf("%s.%s", resourceName, metricName)
+}

+ 0 - 11
pkg/tsdb/azuremonitor/legend-key.go

@@ -1,11 +0,0 @@
-package azuremonitor
-
-import "fmt"
-
-// formatLegendKey builds the legend key or timeseries name
-func formatLegendKey(resourceName string, metricName string, metadataName string, metadataValue string) string {
-	if len(metadataName) > 0 {
-		return fmt.Sprintf("%s{%s=%s}.%s", resourceName, metadataName, metadataValue, metricName)
-	}
-	return fmt.Sprintf("%s.%s", resourceName, metricName)
-}