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

fix: cloudwatch corrected error handling so original error is not thrown away

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-01-19 09:24:44 +01:00
parent 4720b86f5c
commit 4f59d229fe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package cloudwatch
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"reflect" "reflect"
"sort" "sort"
"strings" "strings"
@@ -191,11 +192,11 @@ func (e *CloudWatchExecutor) executeMetricFindQuery(ctx context.Context, queryCo
dsInfo := e.getDsInfo(region) dsInfo := e.getDsInfo(region)
cfg, err := e.getAwsConfig(dsInfo) cfg, err := e.getAwsConfig(dsInfo)
if err != nil { if err != nil {
return nil, errors.New("Failed to call ec2:DescribeInstances") return nil, fmt.Errorf("Failed to call ec2:DescribeInstances, %v", err)
} }
sess, err := session.NewSession(cfg) sess, err := session.NewSession(cfg)
if err != nil { if err != nil {
return nil, errors.New("Failed to call ec2:DescribeInstances") return nil, fmt.Errorf("Failed to call ec2:DescribeInstances, %v", err)
} }
e.ec2Svc = ec2.New(sess, cfg) e.ec2Svc = ec2.New(sess, cfg)
@@ -478,7 +479,7 @@ func (e *CloudWatchExecutor) cloudwatchListMetrics(region string, namespace stri
return !lastPage return !lastPage
}) })
if err != nil { if err != nil {
return nil, errors.New("Failed to call cloudwatch:ListMetrics") return nil, fmt.Errorf("Failed to call cloudwatch:ListMetrics, %v", err)
} }
return &resp, nil return &resp, nil