Skip to content

Commit 299dc9d

Browse files
Update spacing in removeBelowSeries assignment of name to match Graphite web (#88)
* Fix spacing difference in removeBelowSeries setting of name * Update tests to reflect change in name assignment
1 parent 072c479 commit 299dc9d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

expr/functions/removeBelowSeries/function.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (f *removeBelowSeries) Do(ctx context.Context, e parser.Expr, from, until i
7070
}
7171

7272
r := a.CopyLink()
73-
r.Name = e.Target() + "(" + a.Name + "," + numberStr + ")"
73+
r.Name = e.Target() + "(" + a.Name + ", " + numberStr + ")"
7474
r.Values = make([]float64, len(a.Values))
7575
r.Tags["removeBelowSeries"] = fmt.Sprintf("%f", threshold)
7676

expr/functions/removeBelowSeries/function_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@ func TestFunction(t *testing.T) {
3131
map[parser.MetricRequest][]*types.MetricData{
3232
{"metric1", 0, 1}: {types.MakeMetricData("metric1", []float64{1, 2, -1, 7, 8, 20, 30, math.NaN()}, 1, now32)},
3333
},
34-
[]*types.MetricData{types.MakeMetricData("removeBelowValue(metric1,0)",
34+
[]*types.MetricData{types.MakeMetricData("removeBelowValue(metric1, 0)",
3535
[]float64{1, 2, math.NaN(), 7, 8, 20, 30, math.NaN()}, 1, now32)},
3636
},
3737
{
3838
"removeAboveValue(metric1, 10)",
3939
map[parser.MetricRequest][]*types.MetricData{
4040
{"metric1", 0, 1}: {types.MakeMetricData("metric1", []float64{1, 2, -1, 7, 8, 20, 30, math.NaN()}, 1, now32)},
4141
},
42-
[]*types.MetricData{types.MakeMetricData("removeAboveValue(metric1,10)",
42+
[]*types.MetricData{types.MakeMetricData("removeAboveValue(metric1, 10)",
4343
[]float64{1, 2, -1, 7, 8, math.NaN(), math.NaN(), math.NaN()}, 1, now32)},
4444
},
4545
{
4646
"removeBelowPercentile(metric1, 50)",
4747
map[parser.MetricRequest][]*types.MetricData{
4848
{"metric1", 0, 1}: {types.MakeMetricData("metric1", []float64{1, 2, -1, 7, 8, 20, 30, math.NaN()}, 1, now32)},
4949
},
50-
[]*types.MetricData{types.MakeMetricData("removeBelowPercentile(metric1,50)",
50+
[]*types.MetricData{types.MakeMetricData("removeBelowPercentile(metric1, 50)",
5151
[]float64{math.NaN(), math.NaN(), math.NaN(), 7, 8, 20, 30, math.NaN()}, 1, now32)},
5252
},
5353
{
5454
"removeAbovePercentile(metric1, 50)",
5555
map[parser.MetricRequest][]*types.MetricData{
5656
{"metric1", 0, 1}: {types.MakeMetricData("metric1", []float64{1, 2, -1, 7, 8, 20, 30, math.NaN()}, 1, now32)},
5757
},
58-
[]*types.MetricData{types.MakeMetricData("removeAbovePercentile(metric1,50)",
58+
[]*types.MetricData{types.MakeMetricData("removeAbovePercentile(metric1, 50)",
5959
[]float64{1, 2, -1, 7, math.NaN(), math.NaN(), math.NaN(), math.NaN()}, 1, now32)},
6060
},
6161
}

0 commit comments

Comments
 (0)