IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tsdb/cloudwatch: always return underlying metrics query errors (#24632)

Browse Source 
* tsdb/cloudwatch: always return underlying errors
This commit is contained in:
Dan Bond 2020-05-13 19:36:01 +01:00 committed by GitHub
parent 0f964c0214
commit 792e99918c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tsdb/cloudwatch/metric_find_query.go
View File

@ -471,11 +471,11 @@ func (e *CloudWatchExecutor) ensureClientSession(region string) error {
dsInfo := e.getDsInfo(region) dsInfo := e.getDsInfo(region)
cfg, err := getAwsConfig(dsInfo) cfg, err := getAwsConfig(dsInfo)
if err != nil { if err != nil {
return fmt.Errorf("Failed to call ec2:getAwsConfig, %v", err) return fmt.Errorf("Failed to call ec2:getAwsConfig, %w", err)
} }
sess, err := session.NewSession(cfg) sess, err := session.NewSession(cfg)
if err != nil { if err != nil {
return fmt.Errorf("Failed to call ec2:NewSession, %v", err) return fmt.Errorf("Failed to call ec2:NewSession, %w", err)
} }
e.ec2Svc = ec2.New(sess, cfg) e.ec2Svc = ec2.New(sess, cfg)
} }
@ -597,11 +597,11 @@ func (e *CloudWatchExecutor) ensureRGTAClientSession(region string) error {
dsInfo := e.getDsInfo(region) dsInfo := e.getDsInfo(region)
cfg, err := getAwsConfig(dsInfo) cfg, err := getAwsConfig(dsInfo)
if err != nil { if err != nil {
return fmt.Errorf("Failed to call ec2:getAwsConfig, %v", err) return fmt.Errorf("Failed to call ec2:getAwsConfig, %w", err)
} }
sess, err := session.NewSession(cfg) sess, err := session.NewSession(cfg)
if err != nil { if err != nil {
return fmt.Errorf("Failed to call ec2:NewSession, %v", err) return fmt.Errorf("Failed to call ec2:NewSession, %w", err)
} }
e.rgtaSvc = resourcegroupstaggingapi.New(sess, cfg) e.rgtaSvc = resourcegroupstaggingapi.New(sess, cfg)
} }
@ -677,7 +677,7 @@ func (e *CloudWatchExecutor) cloudwatchListMetrics(region string, namespace stri
return !lastPage return !lastPage
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to call cloudwatch:ListMetrics, %v", err) return nil, fmt.Errorf("Failed to call cloudwatch:ListMetrics, %w", err)
} }
return &resp, nil return &resp, nil
@ -699,7 +699,7 @@ func (e *CloudWatchExecutor) ec2DescribeInstances(region string, filters []*ec2.
return !lastPage return !lastPage
}) })
if err != nil { if err != nil {
return nil, errors.New("Failed to call ec2:DescribeInstances") return nil, fmt.Errorf("Failed to call ec2:DescribeInstances, %w", err)
} }
return &resp, nil return &resp, nil
@ -721,7 +721,7 @@ func (e *CloudWatchExecutor) resourceGroupsGetResources(region string, filters [
return !lastPage return !lastPage
}) })
if err != nil { if err != nil {
return nil, errors.New("Failed to call tags:GetResources") return nil, fmt.Errorf("Failed to call tags:GetResources, %w", err)
} }
return &resp, nil return &resp, nil