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

Merge pull request #1078 from prometheus/whats-our-vector-victor 

Remove optional vector() 2nd argument
This commit is contained in:
Brian Brazil 2015-09-13 14:14:20 +01:00
parent 896928ad00 9b382647b5
commit 29de4ee2b0
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
promql/functions.go
View File

@ -650,24 +650,11 @@ func funcLabelReplace(ev *evaluator, args Expressions) model.Value {
return vector
}
// === vector(s scalar, vector model.ValVectora={}) Vector ===
// === vector(s scalar) Vector ===
func funcVector(ev *evaluator, args Expressions) model.Value {
m := model.Metric{}
if len(args) >= 2 {
if vs, ok := args[1].(*VectorSelector); ok {
for _, matcher := range vs.LabelMatchers {
if matcher.Type == metric.Equal && matcher.Name != model.MetricNameLabel {
m[matcher.Name] = matcher.Value
}
}
}
}
return vector{
&sample{
Metric: metric.Metric{
Metric: m,
Copied: true,
},
Metric: metric.Metric{},
Value: model.SampleValue(ev.evalFloat(args[0])),
Timestamp: ev.Timestamp,
},
@ -871,9 +858,8 @@ var functions = map[string]*Function{
},
"vector": {
Name: "vector",
ArgTypes: []model.ValueType{model.ValScalar, model.ValVector},
ArgTypes: []model.ValueType{model.ValScalar},
ReturnType: model.ValVector,
OptionalArgs: 1,
Call: funcVector,
},
}

6
promql/testdata/functions.test vendored
View File

@ -155,9 +155,3 @@ eval instant at 0m vector(1)
eval instant at 60m vector(time())
{} 3600
eval instant at 0m vector(1, {a="b"})
{a="b"} 1
eval instant at 0m vector(1, {a="b", c=~"d", e!="f", g!~"h", a="z"})
{a="z"} 1