From 17445e0c98be2b9471ef957a6d5a02f2bbcc6e15 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Sun, 24 Sep 2017 12:30:34 +0900
Subject: [PATCH] fix alert feature

---
 pkg/tsdb/cloudwatch/cloudwatch.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 1890e538d4a..122cb868fac 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -3,7 +3,6 @@ package cloudwatch
 import (
 	"context"
 	"errors"
-	"fmt"
 	"regexp"
 	"sort"
 	"strconv"
@@ -58,14 +57,14 @@ func (e *CloudWatchExecutor) Query(ctx context.Context, dsInfo *models.DataSourc
 	var err error
 
 	switch queryType {
-	case "timeSeriesQuery":
-		result, err = e.executeTimeSeriesQuery(ctx, queryContext)
-		break
 	case "metricFindQuery":
 		result, err = e.executeMetricFindQuery(ctx, queryContext)
 		break
+	case "timeSeriesQuery":
+		fallthrough
 	default:
-		err = fmt.Errorf("missing querytype")
+		result, err = e.executeTimeSeriesQuery(ctx, queryContext)
+		break
 	}
 
 	return result, err