From f44e360b0d8ed4b767a348564daa58ebc033ae80 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 14 Oct 2016 10:15:30 +0200 Subject: [PATCH] fix(opentsdb): fmt --- pkg/tsdb/opentsdb/opentsdb.go | 230 +++++++++++++++++----------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go index 574c0f90d6d..bd1684397ce 100644 --- a/pkg/tsdb/opentsdb/opentsdb.go +++ b/pkg/tsdb/opentsdb/opentsdb.go @@ -1,23 +1,23 @@ package opentsdb import ( - "fmt" - "path" - "strings" - "context" - "strconv" + "context" + "fmt" + "path" + "strconv" + "strings" - "net/url" - "net/http" - "io/ioutil" - //"net/http/httputil" - "encoding/json" + "io/ioutil" + "net/http" + "net/url" + //"net/http/httputil" + "encoding/json" - "gopkg.in/guregu/null.v3" + "gopkg.in/guregu/null.v3" "github.com/grafana/grafana/pkg/log" - "github.com/grafana/grafana/pkg/tsdb" - "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/tsdb" ) type OpenTsdbExecutor struct { @@ -41,112 +41,112 @@ func init() { func (e *OpenTsdbExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult { result := &tsdb.BatchResult{} - var tsdbQuery OpenTsdbQuery - - tsdbQuery.Start = queryContext.TimeRange.GetFromAsMsEpoch() - tsdbQuery.End = queryContext.TimeRange.GetToAsMsEpoch() - - for _, query := range queries { - tsdbQuery.Queries = []OpenTsdbMetric { - OpenTsdbMetric{ - Metric: query.Model.Get("metric").MustString(), - Aggregator: query.Model.Get("aggregator").MustString(), - }, - } - } - - if setting.Env == setting.DEV { - plog.Debug("OpenTsdb request", "params", tsdbQuery) - } - - req, err := e.createRequest(tsdbQuery) - if err != nil { - result.Error = err - return result - } - - res, err := HttpClient.Do(req) - if err != nil { - result.Error = err - return result - } - - queryResult, err := e.parseResponse(tsdbQuery, res) - if err != nil { - return result.WithError(err) - } - - result.QueryResults = queryResult - return result + var tsdbQuery OpenTsdbQuery + + tsdbQuery.Start = queryContext.TimeRange.GetFromAsMsEpoch() + tsdbQuery.End = queryContext.TimeRange.GetToAsMsEpoch() + + for _, query := range queries { + tsdbQuery.Queries = []OpenTsdbMetric{ + OpenTsdbMetric{ + Metric: query.Model.Get("metric").MustString(), + Aggregator: query.Model.Get("aggregator").MustString(), + }, + } + } + + if setting.Env == setting.DEV { + plog.Debug("OpenTsdb request", "params", tsdbQuery) + } + + req, err := e.createRequest(tsdbQuery) + if err != nil { + result.Error = err + return result + } + + res, err := HttpClient.Do(req) + if err != nil { + result.Error = err + return result + } + + queryResult, err := e.parseResponse(tsdbQuery, res) + if err != nil { + return result.WithError(err) + } + + result.QueryResults = queryResult + return result } func (e *OpenTsdbExecutor) createRequest(data OpenTsdbQuery) (*http.Request, error) { - u, _ := url.Parse(e.Url) - u.Path = path.Join(u.Path, "api/query") - - postData, err := json.Marshal(data) - - req, err := http.NewRequest(http.MethodPost, u.String(), strings.NewReader(string(postData))) - if err != nil { - plog.Info("Failed to create request", "error", err) - return nil, fmt.Errorf("Failed to create request. error: %v", err) - } - - req.Header.Set("Content-Type", "application/json") - if e.BasicAuth { - req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword) - } - - /* - requestDump, err := httputil.DumpRequest(req, true) - if err != nil { - fmt.Println(err) - } - fmt.Println(string(requestDump)) - */ - return req, err + u, _ := url.Parse(e.Url) + u.Path = path.Join(u.Path, "api/query") + + postData, err := json.Marshal(data) + + req, err := http.NewRequest(http.MethodPost, u.String(), strings.NewReader(string(postData))) + if err != nil { + plog.Info("Failed to create request", "error", err) + return nil, fmt.Errorf("Failed to create request. error: %v", err) + } + + req.Header.Set("Content-Type", "application/json") + if e.BasicAuth { + req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword) + } + + /* + requestDump, err := httputil.DumpRequest(req, true) + if err != nil { + fmt.Println(err) + } + fmt.Println(string(requestDump)) + */ + return req, err } func (e *OpenTsdbExecutor) parseResponse(query OpenTsdbQuery, res *http.Response) (map[string]*tsdb.QueryResult, error) { - - queryResults := make(map[string]*tsdb.QueryResult) - queryRes := tsdb.NewQueryResult() - - body, err := ioutil.ReadAll(res.Body) - defer res.Body.Close() - if err != nil { - return nil, err - } - - if res.StatusCode/100 != 2 { - plog.Info("Request failed", "status", res.Status, "body", string(body)) - return nil, fmt.Errorf("Request failed status: %v", res.Status) - } - - var data []OpenTsdbResponse - err = json.Unmarshal(body, &data) - if err != nil { - plog.Info("Failed to unmarshal opentsdb response", "error", err, "status", res.Status, "body", string(body)) - return nil, err - } - - for _, val := range data { - series := tsdb.TimeSeries{ - Name: val.Metric, - } - - for timeString, value := range val.DataPoints { - timestamp, err := strconv.ParseFloat(timeString, 64) - if err != nil { - plog.Info("Failed to unmarshal opentsdb timestamp", "timestamp", timeString) - return nil, err - } - series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(value), timestamp)) - } - - queryRes.Series = append(queryRes.Series, &series) - } - - queryResults["A"] = queryRes - return queryResults, nil + + queryResults := make(map[string]*tsdb.QueryResult) + queryRes := tsdb.NewQueryResult() + + body, err := ioutil.ReadAll(res.Body) + defer res.Body.Close() + if err != nil { + return nil, err + } + + if res.StatusCode/100 != 2 { + plog.Info("Request failed", "status", res.Status, "body", string(body)) + return nil, fmt.Errorf("Request failed status: %v", res.Status) + } + + var data []OpenTsdbResponse + err = json.Unmarshal(body, &data) + if err != nil { + plog.Info("Failed to unmarshal opentsdb response", "error", err, "status", res.Status, "body", string(body)) + return nil, err + } + + for _, val := range data { + series := tsdb.TimeSeries{ + Name: val.Metric, + } + + for timeString, value := range val.DataPoints { + timestamp, err := strconv.ParseFloat(timeString, 64) + if err != nil { + plog.Info("Failed to unmarshal opentsdb timestamp", "timestamp", timeString) + return nil, err + } + series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(value), timestamp)) + } + + queryRes.Series = append(queryRes.Series, &series) + } + + queryResults["A"] = queryRes + return queryResults, nil }