From 6634984a38ef9bbf2bb22d7921fc0fb5d25925e9 Mon Sep 17 00:00:00 2001 From: Goutham Veeramachaneni Date: Mon, 6 Mar 2017 17:16:37 +0530 Subject: [PATCH 1/3] Comments and Typo Fixes --- promql/engine.go | 8 ++++---- web/api/v1/api.go | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/promql/engine.go b/promql/engine.go index 72f019e00b..1cdac0828e 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -59,7 +59,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "query_duration_seconds", - Help: "Query timmings", + Help: "Query timings", ConstLabels: prometheus.Labels{"slice": "prepare_time"}, }, ) @@ -68,7 +68,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "query_duration_seconds", - Help: "Query timmings", + Help: "Query timings", ConstLabels: prometheus.Labels{"slice": "inner_eval"}, }, ) @@ -77,7 +77,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "query_duration_seconds", - Help: "Query timmings", + Help: "Query timings", ConstLabels: prometheus.Labels{"slice": "result_append"}, }, ) @@ -86,7 +86,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "query_duration_seconds", - Help: "Query timmings", + Help: "Query timings", ConstLabels: prometheus.Labels{"slice": "result_sort"}, }, ) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 9a2e2361be..566f626801 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -345,6 +345,7 @@ func (api *API) dropSeries(r *http.Request) (interface{}, *apiError) { return res, nil } +// Target has the information for 1 target. type Target struct { // Labels before any processing. DiscoveredLabels model.LabelSet `json:"discoveredLabels"` @@ -358,6 +359,7 @@ type Target struct { Health retrieval.TargetHealth `json:"health"` } +// TargetDiscovery has all the active targets. type TargetDiscovery struct { ActiveTargets []*Target `json:"activeTargets"` } @@ -386,10 +388,12 @@ func (api *API) targets(r *http.Request) (interface{}, *apiError) { return res, nil } +// AlertmanagerDiscovery has all the active alert-managers type AlertmanagerDiscovery struct { ActiveAlertmanagers []*AlertmanagerTarget `json:"activeAlertmanagers"` } +// AlertmanagerTarget has info on 1 AM type AlertmanagerTarget struct { URL string `json:"url"` } From c6b329c55b076018225578092eb367353d87151e Mon Sep 17 00:00:00 2001 From: Goutham Veeramachaneni Date: Mon, 6 Mar 2017 23:02:21 +0530 Subject: [PATCH 2/3] Support Custom Timeouts for Queries --- web/api/v1/api.go | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 566f626801..1d8dee5551 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -169,12 +169,24 @@ func (api *API) query(r *http.Request) (interface{}, *apiError) { ts = api.now() } + ctx := api.context(r) + if to := r.FormValue("timeout"); to != "" { + var cancel context.CancelFunc + timeout, err := parseDuration(to) + if err != nil { + return nil, &apiError{errorBadData, err} + } + + ctx, cancel = context.WithTimeout(ctx, timeout) + defer cancel() + } + qry, err := api.QueryEngine.NewInstantQuery(r.FormValue("query"), ts) if err != nil { return nil, &apiError{errorBadData, err} } - res := qry.Exec(api.context(r)) + res := qry.Exec(ctx) if res.Err != nil { switch res.Err.(type) { case promql.ErrQueryCanceled: @@ -221,12 +233,24 @@ func (api *API) queryRange(r *http.Request) (interface{}, *apiError) { return nil, &apiError{errorBadData, err} } + ctx := api.context(r) + if to := r.FormValue("timeout"); to != "" { + var cancel context.CancelFunc + timeout, err := parseDuration(to) + if err != nil { + return nil, &apiError{errorBadData, err} + } + + ctx, cancel = context.WithTimeout(ctx, timeout) + defer cancel() + } + qry, err := api.QueryEngine.NewRangeQuery(r.FormValue("query"), start, end, step) if err != nil { return nil, &apiError{errorBadData, err} } - res := qry.Exec(api.context(r)) + res := qry.Exec(ctx) if res.Err != nil { switch res.Err.(type) { case promql.ErrQueryCanceled: From 4b0270290b027b850c422d367f470f2688d91bd7 Mon Sep 17 00:00:00 2001 From: Goutham Veeramachaneni Date: Mon, 6 Mar 2017 23:21:27 +0530 Subject: [PATCH 3/3] Fix comments to match convention --- web/api/v1/api.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 1d8dee5551..b7e9512f8b 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -369,7 +369,7 @@ func (api *API) dropSeries(r *http.Request) (interface{}, *apiError) { return res, nil } -// Target has the information for 1 target. +// Target has the information for one target. type Target struct { // Labels before any processing. DiscoveredLabels model.LabelSet `json:"discoveredLabels"` @@ -412,12 +412,12 @@ func (api *API) targets(r *http.Request) (interface{}, *apiError) { return res, nil } -// AlertmanagerDiscovery has all the active alert-managers +// AlertmanagerDiscovery has all the active Alertmanagers. type AlertmanagerDiscovery struct { ActiveAlertmanagers []*AlertmanagerTarget `json:"activeAlertmanagers"` } -// AlertmanagerTarget has info on 1 AM +// AlertmanagerTarget has info on one AM. type AlertmanagerTarget struct { URL string `json:"url"` }