RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #848 from prometheus/fabxc/apifix 

promql: add json tags, fix query constructor.
This commit is contained in:
Julius Volz 2015-06-25 13:46:09 +02:00
parent 689ed7978f 70d7a987a7
commit ef4ba843a2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
promql/engine.go
View File

@ -44,8 +44,8 @@ type Sample struct {
// Scalar is a scalar value evaluated at the set timestamp.
type Scalar struct {
Value clientmodel.SampleValue
Timestamp clientmodel.Timestamp
Value clientmodel.SampleValue `json:"value"`
Timestamp clientmodel.Timestamp `json:"timestamp"`
}
func (s *Scalar) String() string {
@ -54,8 +54,8 @@ func (s *Scalar) String() string {
// String is a string value evaluated at the set timestamp.
type String struct {
Value string
Timestamp clientmodel.Timestamp
Value string `json:"value"`
Timestamp clientmodel.Timestamp `json:"timestamp"`
}
func (s *String) String() string {
@ -279,8 +279,15 @@ func (ng *Engine) Stop() {
}
// NewInstantQuery returns an evaluation query for the given expression at the given time.
func (ng *Engine) NewInstantQuery(es string, ts clientmodel.Timestamp) (Query, error) {
return ng.NewRangeQuery(es, ts, ts, 0)
func (ng *Engine) NewInstantQuery(qs string, ts clientmodel.Timestamp) (Query, error) {
expr, err := ParseExpr(qs)
if err != nil {
return nil, err
}
qry := ng.newQuery(expr, ts, ts, 0)
qry.q = qs
return qry, nil
}
// NewRangeQuery returns an evaluation query for the given time range and with