Skip to content

N
nexpie-grafana-theme
Commit feed90c0 by Mitsuhiro Tanda
Options

re-implement get regions

parent 0c951484
Showing with 308 additions and 236 deletions
pkg/api/cloudwatch/cloudwatch.go
...@@ -80,10 +80,6 @@ func init() { ...@@ -80,10 +80,6 @@ func init() {
"DescribeAlarmsForMetric": handleDescribeAlarmsForMetric, "DescribeAlarmsForMetric": handleDescribeAlarmsForMetric,
"DescribeAlarmHistory": handleDescribeAlarmHistory, "DescribeAlarmHistory": handleDescribeAlarmHistory,
"DescribeInstances": handleDescribeInstances, "DescribeInstances": handleDescribeInstances,
"__GetRegions": handleGetRegions,
"__GetNamespaces": handleGetNamespaces,
"__GetMetrics": handleGetMetrics,
"__GetDimensions": handleGetDimensions,
} }
} }
......
pkg/tsdb/cloudwatch/cloudwatch.go
...@@ -53,6 +53,20 @@ func init() { ...@@ -53,6 +53,20 @@ func init() {
} }
func (e *CloudWatchExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult { func (e *CloudWatchExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
var result *tsdb.BatchResult
queryType := queries[0].Model.Get("type").MustString()
switch queryType {
case "timeSeriesQuery":
result = e.executeTimeSeriesQuery(ctx, queries, queryContext)
break
case "metricFindQuery":
result = e.executeMetricFindQuery(ctx, queries, queryContext)
break
}
return result
}
func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
result := &tsdb.BatchResult{ result := &tsdb.BatchResult{
QueryResults: make(map[string]*tsdb.QueryResult), QueryResults: make(map[string]*tsdb.QueryResult),
} }
......
pkg/tsdb/cloudwatch/metric_find_query.go
package cloudwatch package cloudwatch
import ( import (
"encoding/json" "context"
"sort"
"strings"
"sync"
"time" "time"
"github.com/aws/aws-sdk-go/aws" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/aws/aws-sdk-go/aws/awsutil" "github.com/grafana/grafana/pkg/tsdb"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/util"
) )
var metricsMap map[string][]string var metricsMap map[string][]string
var dimensionsMap map[string][]string var dimensionsMap map[string][]string
type suggestData struct {
Text string
Value string
}
type CustomMetricsCache struct { type CustomMetricsCache struct {
Expire time.Time Expire time.Time
Cache []string Cache []string
...@@ -144,236 +141,279 @@ func init() { ...@@ -144,236 +141,279 @@ func init() {
customMetricsDimensionsMap = make(map[string]map[string]map[string]*CustomMetricsCache) customMetricsDimensionsMap = make(map[string]map[string]map[string]*CustomMetricsCache)
} }
// Whenever this list is updated, frontend list should also be updated. func (e *CloudWatchExecutor) executeMetricFindQuery(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html result := &tsdb.BatchResult{
func handleGetRegions(req *cwRequest, c *middleware.Context) { QueryResults: make(map[string]*tsdb.QueryResult),
regions := []string{
"ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-south-1", "ca-central-1", "cn-north-1",
"eu-central-1", "eu-west-1", "eu-west-2", "sa-east-1", "us-east-1", "us-east-2", "us-gov-west-1", "us-west-1", "us-west-2",
}
result := []interface{}{}
for _, region := range regions {
result = append(result, util.DynMap{"text": region, "value": region})
}
c.JSON(200, result)
}
func handleGetNamespaces(req *cwRequest, c *middleware.Context) {
keys := []string{}
for key := range metricsMap {
keys = append(keys, key)
}
customNamespaces := req.DataSource.JsonData.Get("customMetricsNamespaces").MustString()
if customNamespaces != "" {
keys = append(keys, strings.Split(customNamespaces, ",")...)
} }
queryResult := &tsdb.QueryResult{Meta: simplejson.New(), RefId: queries[0].RefId}
sort.Sort(sort.StringSlice(keys))
parameters := queries[0].Model.Get("parameters")
result := []interface{}{} subType := queries[0].Model.Get("subtype").MustString()
for _, key := range keys { var data []suggestData
result = append(result, util.DynMap{"text": key, "value": key}) var err error
} switch subType {
case "regions":
c.JSON(200, result) data, err = e.handleGetRegions(ctx, parameters, queryContext)
} if err != nil {
queryResult.Error = err
func handleGetMetrics(req *cwRequest, c *middleware.Context) {
reqParam := &struct {
Parameters struct {
Namespace string `json:"namespace"`
} `json:"parameters"`
}{}
json.Unmarshal(req.Body, reqParam)
var namespaceMetrics []string
if !isCustomMetrics(reqParam.Parameters.Namespace) {
var exists bool
if namespaceMetrics, exists = metricsMap[reqParam.Parameters.Namespace]; !exists {
c.JsonApiErr(404, "Unable to find namespace "+reqParam.Parameters.Namespace, nil)
return
}
} else {
var err error
cwData := req.GetDatasourceInfo()
cwData.Namespace = reqParam.Parameters.Namespace
if namespaceMetrics, err = getMetricsForCustomMetrics(cwData, getAllMetrics); err != nil {
c.JsonApiErr(500, "Unable to call AWS API", err)
return
} }
break
} }
sort.Sort(sort.StringSlice(namespaceMetrics)) transformToTable(data, queryResult)
result.QueryResults[queries[0].RefId] = queryResult
result := []interface{}{} return result
for _, name := range namespaceMetrics {
result = append(result, util.DynMap{"text": name, "value": name})
}
c.JSON(200, result)
} }
func handleGetDimensions(req *cwRequest, c *middleware.Context) { func transformToTable(data []suggestData, result *tsdb.QueryResult) {
reqParam := &struct { table := &tsdb.Table{
Parameters struct { Columns: make([]tsdb.TableColumn, 2),
Namespace string `json:"namespace"` Rows: make([]tsdb.RowValues, 0),
} `json:"parameters"`
}{}
json.Unmarshal(req.Body, reqParam)
var dimensionValues []string
if !isCustomMetrics(reqParam.Parameters.Namespace) {
var exists bool
if dimensionValues, exists = dimensionsMap[reqParam.Parameters.Namespace]; !exists {
c.JsonApiErr(404, "Unable to find dimension "+reqParam.Parameters.Namespace, nil)
return
}
} else {
var err error
dsInfo := req.GetDatasourceInfo()
dsInfo.Namespace = reqParam.Parameters.Namespace
if dimensionValues, err = getDimensionsForCustomMetrics(dsInfo, getAllMetrics); err != nil {
c.JsonApiErr(500, "Unable to call AWS API", err)
return
}
} }
sort.Sort(sort.StringSlice(dimensionValues)) table.Columns[0].Text = "text"
table.Columns[1].Text = "value"
result := []interface{}{}
for _, name := range dimensionValues { for _, r := range data {
result = append(result, util.DynMap{"text": name, "value": name}) values := make([]interface{}, 2)
values[0] = r.Text
values[1] = r.Value
table.Rows = append(table.Rows, values)
} }
result.Tables = append(result.Tables, table)
c.JSON(200, result) result.Meta.Set("rowCount", len(data))
} }
func getAllMetrics(cwData *DatasourceInfo) (cloudwatch.ListMetricsOutput, error) { // Whenever this list is updated, frontend list should also be updated.
creds, err := GetCredentials(cwData) // Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
if err != nil { func (e *CloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *simplejson.Json, queryContext *tsdb.QueryContext) ([]suggestData, error) {
return cloudwatch.ListMetricsOutput{}, err regions := []string{
} "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-south-1", "ca-central-1", "cn-north-1",
cfg := &aws.Config{ "eu-central-1", "eu-west-1", "eu-west-2", "sa-east-1", "us-east-1", "us-east-2", "us-gov-west-1", "us-west-1", "us-west-2",
Region: aws.String(cwData.Region),
Credentials: creds,
}
sess, err := session.NewSession(cfg)
if err != nil {
return cloudwatch.ListMetricsOutput{}, err
}
svc := cloudwatch.New(sess, cfg)
params := &cloudwatch.ListMetricsInput{
Namespace: aws.String(cwData.Namespace),
}
var resp cloudwatch.ListMetricsOutput
err = svc.ListMetricsPages(params,
func(page *cloudwatch.ListMetricsOutput, lastPage bool) bool {
metrics.M_Aws_CloudWatch_ListMetrics.Inc()
metrics, _ := awsutil.ValuesAtPath(page, "Metrics")
for _, metric := range metrics {
resp.Metrics = append(resp.Metrics, metric.(*cloudwatch.Metric))
}
return !lastPage
})
if err != nil {
return resp, err
}
return resp, nil
}
var metricsCacheLock sync.Mutex
func getMetricsForCustomMetrics(dsInfo *DatasourceInfo, getAllMetrics func(*DatasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
metricsCacheLock.Lock()
defer metricsCacheLock.Unlock()
if _, ok := customMetricsMetricsMap[dsInfo.Profile]; !ok {
customMetricsMetricsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
}
if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region]; !ok {
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
}
if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
}
if customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
result, err := getAllMetrics(dsInfo)
if err != nil {
return []string{}, err
}
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
for _, metric := range result.Metrics {
if isDuplicate(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName) {
continue
}
customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName)
}
return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
var dimensionsCacheLock sync.Mutex
func getDimensionsForCustomMetrics(dsInfo *DatasourceInfo, getAllMetrics func(*DatasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
dimensionsCacheLock.Lock()
defer dimensionsCacheLock.Unlock()
if _, ok := customMetricsDimensionsMap[dsInfo.Profile]; !ok {
customMetricsDimensionsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
}
if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region]; !ok {
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
}
if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
}
if customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
result, err := getAllMetrics(dsInfo)
if err != nil {
return []string{}, err
} }
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
for _, metric := range result.Metrics { result := make([]suggestData, 0)
for _, dimension := range metric.Dimensions { for _, region := range regions {
if isDuplicate(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name) { result = append(result, suggestData{Text: region, Value: region})
continue
}
customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name)
}
} }
return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil return result, nil
} }
func isDuplicate(nameList []string, target string) bool { //func handleGetNamespaces(req *cwRequest, c *middleware.Context) {
for _, name := range nameList { // keys := []string{}
if name == target { // for key := range metricsMap {
return true // keys = append(keys, key)
} // }
} //
return false // customNamespaces := req.DataSource.JsonData.Get("customMetricsNamespaces").MustString()
} // if customNamespaces != "" {
// for _, key := range strings.Split(customNamespaces, ",") {
func isCustomMetrics(namespace string) bool { // keys = append(keys, key)
return strings.Index(namespace, "AWS/") != 0 // }
} // }
//
// sort.Sort(sort.StringSlice(keys))
//
// result := []interface{}{}
// for _, key := range keys {
// result = append(result, util.DynMap{"text": key, "value": key})
// }
//
// c.JSON(200, result)
//}
//
//func handleGetMetrics(req *cwRequest, c *middleware.Context) {
// reqParam := &struct {
// Parameters struct {
// Namespace string `json:"namespace"`
// } `json:"parameters"`
// }{}
//
// json.Unmarshal(req.Body, reqParam)
//
// var namespaceMetrics []string
// if !isCustomMetrics(reqParam.Parameters.Namespace) {
// var exists bool
// if namespaceMetrics, exists = metricsMap[reqParam.Parameters.Namespace]; !exists {
// c.JsonApiErr(404, "Unable to find namespace "+reqParam.Parameters.Namespace, nil)
// return
// }
// } else {
// var err error
// cwData := req.GetDatasourceInfo()
// cwData.Namespace = reqParam.Parameters.Namespace
//
// if namespaceMetrics, err = getMetricsForCustomMetrics(cwData, getAllMetrics); err != nil {
// c.JsonApiErr(500, "Unable to call AWS API", err)
// return
// }
// }
// sort.Sort(sort.StringSlice(namespaceMetrics))
//
// result := []interface{}{}
// for _, name := range namespaceMetrics {
// result = append(result, util.DynMap{"text": name, "value": name})
// }
//
// c.JSON(200, result)
//}
//
//func handleGetDimensions(req *cwRequest, c *middleware.Context) {
// reqParam := &struct {
// Parameters struct {
// Namespace string `json:"namespace"`
// } `json:"parameters"`
// }{}
//
// json.Unmarshal(req.Body, reqParam)
//
// var dimensionValues []string
// if !isCustomMetrics(reqParam.Parameters.Namespace) {
// var exists bool
// if dimensionValues, exists = dimensionsMap[reqParam.Parameters.Namespace]; !exists {
// c.JsonApiErr(404, "Unable to find dimension "+reqParam.Parameters.Namespace, nil)
// return
// }
// } else {
// var err error
// dsInfo := req.GetDatasourceInfo()
// dsInfo.Namespace = reqParam.Parameters.Namespace
//
// if dimensionValues, err = getDimensionsForCustomMetrics(dsInfo, getAllMetrics); err != nil {
// c.JsonApiErr(500, "Unable to call AWS API", err)
// return
// }
// }
// sort.Sort(sort.StringSlice(dimensionValues))
//
// result := []interface{}{}
// for _, name := range dimensionValues {
// result = append(result, util.DynMap{"text": name, "value": name})
// }
//
// c.JSON(200, result)
//}
//
//func getAllMetrics(cwData *DatasourceInfo) (cloudwatch.ListMetricsOutput, error) {
// creds, err := GetCredentials(cwData)
// if err != nil {
// return cloudwatch.ListMetricsOutput{}, err
// }
// cfg := &aws.Config{
// Region: aws.String(cwData.Region),
// Credentials: creds,
// }
// sess, err := session.NewSession(cfg)
// if err != nil {
// return cloudwatch.ListMetricsOutput{}, err
// }
// svc := cloudwatch.New(sess, cfg)
//
// params := &cloudwatch.ListMetricsInput{
// Namespace: aws.String(cwData.Namespace),
// }
//
// var resp cloudwatch.ListMetricsOutput
// err = svc.ListMetricsPages(params,
// func(page *cloudwatch.ListMetricsOutput, lastPage bool) bool {
// metrics.M_Aws_CloudWatch_ListMetrics.Inc(1)
// metrics, _ := awsutil.ValuesAtPath(page, "Metrics")
// for _, metric := range metrics {
// resp.Metrics = append(resp.Metrics, metric.(*cloudwatch.Metric))
// }
// return !lastPage
// })
// if err != nil {
// return resp, err
// }
//
// return resp, nil
//}
//
//var metricsCacheLock sync.Mutex
//
//func getMetricsForCustomMetrics(dsInfo *DatasourceInfo, getAllMetrics func(*DatasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
// metricsCacheLock.Lock()
// defer metricsCacheLock.Unlock()
//
// if _, ok := customMetricsMetricsMap[dsInfo.Profile]; !ok {
// customMetricsMetricsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
// }
// if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region]; !ok {
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
// }
// if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
// }
//
// if customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
// return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
// }
// result, err := getAllMetrics(dsInfo)
// if err != nil {
// return []string{}, err
// }
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
//
// for _, metric := range result.Metrics {
// if isDuplicate(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName) {
// continue
// }
// customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName)
// }
//
// return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
//}
//
//var dimensionsCacheLock sync.Mutex
//
//func getDimensionsForCustomMetrics(dsInfo *DatasourceInfo, getAllMetrics func(*DatasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
// dimensionsCacheLock.Lock()
// defer dimensionsCacheLock.Unlock()
//
// if _, ok := customMetricsDimensionsMap[dsInfo.Profile]; !ok {
// customMetricsDimensionsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
// }
// if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region]; !ok {
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
// }
// if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
// }
//
// if customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
// return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
// }
// result, err := getAllMetrics(dsInfo)
// if err != nil {
// return []string{}, err
// }
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
//
// for _, metric := range result.Metrics {
// for _, dimension := range metric.Dimensions {
// if isDuplicate(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name) {
// continue
// }
// customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name)
// }
// }
//
// return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
//}
//
//func isDuplicate(nameList []string, target string) bool {
// for _, name := range nameList {
// if name == target {
// return true
// }
// }
// return false
//}
//
//func isCustomMetrics(namespace string) bool {
// return strings.Index(namespace, "AWS/") != 0
//}
public/app/plugins/datasource/cloudwatch/datasource.js
...@@ -11,7 +11,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot ...@@ -11,7 +11,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
'use strict'; 'use strict';
/** @ngInject */ /** @ngInject */
function CloudWatchDatasource(instanceSettings, $q, backendSrv, templateSrv) { function CloudWatchDatasource(instanceSettings, $q, backendSrv, templateSrv, timeSrv) {
this.type = 'cloudwatch'; this.type = 'cloudwatch';
this.name = instanceSettings.name; this.name = instanceSettings.name;
this.supportMetrics = true; this.supportMetrics = true;
...@@ -133,7 +133,21 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot ...@@ -133,7 +133,21 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
}; };
this.getRegions = function() { this.getRegions = function() {
return this.awsRequest({action: '__GetRegions'}); var range = timeSrv.timeRange();
return backendSrv.post('/api/tsdb/query', {
from: range.from,
to: range.to,
queries: [
{
refId: 'metricFindQuery',
intervalMs: 1, // dummy
maxDataPoints: 1, // dummy
datasourceId: this.instanceSettings.id,
type: 'metricFindQuery',
subtype: 'regions'
}
]
});
}; };
this.getNamespaces = function() { this.getNamespaces = function() {
...@@ -200,6 +214,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot ...@@ -200,6 +214,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
var namespace; var namespace;
var metricName; var metricName;
var transformSuggestDataFromTable = function(suggestData) {
return _.map(suggestData.results['metricFindQuery'].tables[0].rows, function (v) {
return {
text: v[0],
value: v[1]
};
});
};
var transformSuggestData = function(suggestData) { var transformSuggestData = function(suggestData) {
return _.map(suggestData, function(v) { return _.map(suggestData, function(v) {
return { text: v }; return { text: v };
...@@ -208,7 +230,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot ...@@ -208,7 +230,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
var regionQuery = query.match(/^regions\(\)/); var regionQuery = query.match(/^regions\(\)/);
if (regionQuery) { if (regionQuery) {
return this.getRegions(); return this.getRegions().then(function (r) { return transformSuggestDataFromTable(r); });
} }
var namespaceQuery = query.match(/^namespaces\(\)/); var namespaceQuery = query.match(/^namespaces\(\)/);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment