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

Merge pull request #15011 from influxdata/fix/pivot-deadman-check 

fix(notification/check): pivot table before sending to deadman call
pull/15013/head
Michael Desa 2019-09-06 12:04:41 -04:00 committed by GitHub
parent a17277f27a 354746cb1b
commit 4c55419ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
notification/check/deadman.go
View File

@ -62,7 +62,7 @@ func (c Deadman) GenerateFluxAST() (*ast.Package, error) {
f := p.Files[0]
assignPipelineToData(f)
f.Imports = append(f.Imports, flux.Imports("influxdata/influxdb/monitor", "experimental")...)
f.Imports = append(f.Imports, flux.Imports("influxdata/influxdb/monitor", "experimental", "influxdata/influxdb/v1")...)
f.Body = append(f.Body, c.generateFluxASTBody()...)
return p, nil
@ -92,6 +92,7 @@ func (c Deadman) generateFluxASTChecksFunction() ast.Statement {
sub := flux.Call(flux.Member("experimental", "subDuration"), flux.Object(flux.Property("from", now), flux.Property("d", dur)))
return flux.ExpressionStatement(flux.Pipe(
flux.Identifier("data"),
flux.Call(flux.Member("v1", "fieldsAsCols"), flux.Object()),
flux.Call(flux.Member("monitor", "deadman"), flux.Object(flux.Property("t", sub))),
c.generateFluxASTChecksCall(),
))

4
notification/check/deadman_test.go
View File

@ -58,6 +58,7 @@ func TestDeadman_GenerateFlux(t *testing.T) {
script: `package main
import "influxdata/influxdb/monitor"
import "experimental"
import "influxdata/influxdb/v1"
data = from(bucket: "foo")
|> range(start: -10m)
@ -76,6 +77,7 @@ messageFn = (r) =>
("whoa! {r.dead}")
data
|> v1.fieldsAsCols()
|> monitor.deadman(t: experimental.subDuration(from: now(), d: 60s))
|> monitor.check(data: check, messageFn: messageFn, info: info)`,
},
@ -117,6 +119,7 @@ data
script: `package main
import "influxdata/influxdb/monitor"
import "experimental"
import "influxdata/influxdb/v1"
data = from(bucket: "foo")
|> range(start: -10m)
@ -135,6 +138,7 @@ messageFn = (r) =>
("whoa! {r.dead}")
data
|> v1.fieldsAsCols()
|> monitor.deadman(t: experimental.subDuration(from: now(), d: 60s))
|> monitor.check(data: check, messageFn: messageFn, info: info)`,
},