Skip to content

Commit 91b2d6e

Browse files
carrieedwardsnpazosmendez
authored andcommitted
Fix error when series passed into timeFunction
1 parent 811adef commit 91b2d6e

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

expr/functions/timeFunction/function.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ func New(configFile string) []interfaces.FunctionMetadata {
2929
}
3030

3131
func (f *timeFunction) Do(ctx context.Context, e parser.Expr, from, until int64, values map[parser.MetricRequest][]*types.MetricData) ([]*types.MetricData, error) {
32-
name, err := e.GetStringArg(0)
33-
if err != nil {
34-
return nil, err
32+
var name string
33+
var err error
34+
if e.Arg(0).IsName() { // Fixes error if a series is passed in as the first argument. See https://github.com/grafana/carbonapi/issues/84
35+
name = ""
36+
} else {
37+
name, err = e.GetStringArg(0)
38+
if err != nil {
39+
return nil, err
40+
}
3541
}
3642

3743
stepInt, err := e.GetIntArgDefault(1, 60)

0 commit comments

Comments
 (0)