Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update tickscript lambda function generation to be sorted

pull/10616/head
Chris Goller 2016-11-02 21:05:21 -05:00
parent 7061818605
commit d2a1f4ce73
2 changed files with 5 additions and 3 deletions

6
kapacitor/tickscripts_test.go
View File

@ -126,7 +126,7 @@ var field = 'usage_user'
var groupby = ['host', 'cluster_id']
var where_filter = lambda: ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod') AND ("cpu" == 'cpu_total')
var where_filter = lambda: ("cpu" == 'cpu_total') AND ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod')
var id = 'kapacitor/{{ .Name }}/{{ .Group }}'
@ -263,7 +263,7 @@ var field = 'usage_user'
var groupby = ['host', 'cluster_id']
var where_filter = lambda: ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod') AND ("cpu" == 'cpu_total')
var where_filter = lambda: ("cpu" == 'cpu_total') AND ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod')
var id = 'kapacitor/{{ .Name }}/{{ .Group }}'
@ -414,7 +414,7 @@ var field = 'usage_user'
var groupby = ['host', 'cluster_id']
var where_filter = lambda: ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod') AND ("cpu" == 'cpu_total')
var where_filter = lambda: ("cpu" == 'cpu_total') AND ("host" == 'acc-0eabc309-eu-west-1-data-3' OR "host" == 'prod')
var id = 'kapacitor/{{ .Name }}/{{ .Group }}'

2
kapacitor/vars.go
View File

@ -2,6 +2,7 @@ package kapacitor
import (
"fmt"
"sort"
"strings"
"github.com/influxdata/chronograf"
@ -175,6 +176,7 @@ func whereFilter(q chronograf.QueryConfig) string {
outer = append(outer, "("+strings.Join(inner, " OR ")+")")
}
if len(outer) > 0 {
sort.Strings(outer)
return "lambda: " + strings.Join(outer, " AND ")
}