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

Merge pull request #12302 from grafana/12199_cloudwatch_panic

Browse Source 
cloudwatch: handle invalid time range
This commit is contained in:
Carl Bergquist 2018-06-16 16:57:23 +02:00 committed by GitHub
commit e2adb4ced5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/cloudwatch/cloudwatch.go
View File

@ -3,6 +3,7 @@ package cloudwatch
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"regexp" "regexp"
"sort" "sort"
"strconv" "strconv"
@ -144,6 +145,10 @@ func (e *CloudWatchExecutor) executeQuery(ctx context.Context, parameters *simpl
return nil, err return nil, err
} }
if endTime.Before(startTime) {
return nil, fmt.Errorf("Invalid time range: End time can't be before start time")
}
params := &cloudwatch.GetMetricStatisticsInput{ params := &cloudwatch.GetMetricStatisticsInput{
Namespace: aws.String(query.Namespace), Namespace: aws.String(query.Namespace),
MetricName: aws.String(query.MetricName), MetricName: aws.String(query.MetricName),