Provide valid characters for idVar with Sensu

pull/4882/head
Brandon Farmer 2018-11-27 15:18:46 -08:00
parent 140433b084
commit dbbfa1db74
3 changed files with 16 additions and 16 deletions

View File

@ -170,7 +170,7 @@ var whereFilter = lambda: TRUE
var name = 'rule 1'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = ''
@ -259,7 +259,7 @@ var whereFilter = lambda: TRUE
var name = 'rule 1'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = ''
@ -504,7 +504,7 @@ var whereFilter = lambda: TRUE
var name = 'rule 1'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = ''
@ -590,7 +590,7 @@ var whereFilter = lambda: TRUE
var name = 'rule 1'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = ''
@ -1354,7 +1354,7 @@ var period = 1d
var name = 'myname\'s'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = ''

View File

@ -138,7 +138,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -284,7 +284,7 @@ var every = 10s
var name = 'haproxy'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'Haproxy monitor : {{.ID}} : {{ index .Tags "server" }} : {{ index .Tags "pxname" }} is {{ .Level }} '
@ -433,7 +433,7 @@ var every = 10s
var name = 'haproxy'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'Haproxy monitor : {{.ID}} : {{ index .Tags "server" }} : {{ index .Tags "pxname" }} is {{ .Level }} '
@ -591,7 +591,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -751,7 +751,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -910,7 +910,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -1058,7 +1058,7 @@ var whereFilter = lambda: ("cpu" == 'cpu_total') AND ("host" == 'acc-0eabc309-eu
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -1212,7 +1212,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -1382,7 +1382,7 @@ var every = 30s
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'
@ -1547,7 +1547,7 @@ var period = 10m
var name = 'name'
var idVar = name + ':{{.Group}}'
var idVar = name + '-{{.Group}}'
var message = 'message'

View File

@ -200,7 +200,7 @@ func groupBy(q *chronograf.QueryConfig) string {
func idVar(q *chronograf.QueryConfig) string {
if len(q.GroupBy.Tags) > 0 {
return `name + ':{{.Group}}'`
return `name + '-{{.Group}}'`
}
return "name"
}