mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 22:49:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #150 from prometheus/julius-mf

Browse source 
Run "make format".
This commit is contained in:
juliusv 2013-04-16 08:24:51 -07:00
parent a13bc4494d 5f5ea03105
commit fdea26e359
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rules/ast/functions.go
View file

@ -137,7 +137,7 @@ func rateImpl(timestamp time.Time, view *viewAdapter, args []Node) interface{} {
// MatrixLiteral exists). Find a better way of getting the duration of a // MatrixLiteral exists). Find a better way of getting the duration of a
// matrix, such as looking at the samples themselves. // matrix, such as looking at the samples themselves.
interval := args[0].(*MatrixLiteral).interval interval := args[0].(*MatrixLiteral).interval
for i, _ := range vector { for i := range vector {
vector[i].Value /= model.SampleValue(interval / time.Second) vector[i].Value /= model.SampleValue(interval / time.Second)
} }
return vector return vector

4
rules/rules_test.go
View file

@ -219,8 +219,8 @@ var expressionTests = []struct {
intervalRanges: 1, intervalRanges: 1,
}, { }, {
// Lower-cased aggregation operators should work too. // Lower-cased aggregation operators should work too.
expr: "sum(http_requests) by (job) + min(http_requests) by (job) + max(http_requests) by (job) + avg(http_requests) by (job)", expr: "sum(http_requests) by (job) + min(http_requests) by (job) + max(http_requests) by (job) + avg(http_requests) by (job)",
output: []string{ output: []string{
"http_requests{job='app-server'} => 4550 @[%v]", "http_requests{job='app-server'} => 4550 @[%v]",
"http_requests{job='api-server'} => 1750 @[%v]", "http_requests{job='api-server'} => 1750 @[%v]",
}, },