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

fix(notification/rule): Include the edge of the boundary we are observing. (#19392) 

* fix(notification/rule): Include the edge of the boundary we are observing.

* chore(changelog): Add 19392 to changelog.
pull/19325/head
Brett Buddin 2020-08-24 10:08:14 -04:00 committed by GitHub
parent 32fb699ecf
commit 77fcf692c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
### Bug Fixes
1. [19331](https://github.com/influxdata/influxdb/pull/19331): Add description to auth influx command outputs.
1. [19392](https://github.com/influxdata/influxdb/pull/19392) Include the edge of the boundary we are observing.
## v2.0.0-beta.16 [2020-08-07]

8
notification/rule/http_test.go
View File

@ -33,7 +33,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: endpoint(mapFn: (r) => {
@ -102,7 +102,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: endpoint(mapFn: (r) => {
@ -177,7 +177,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: endpoint(mapFn: (r) => {
@ -250,7 +250,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 5s)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 5s)))
all_statuses
|> monitor["notify"](data: notification, endpoint: endpoint(mapFn: (r) => {

6
notification/rule/pagerduty_test.go
View File

@ -83,7 +83,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: pagerduty_endpoint(mapFn: (r) =>
@ -166,7 +166,7 @@ info_to_crit = statuses
|> monitor["stateChanges"](fromLevel: "info", toLevel: "crit")
all_statuses = info_to_crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: pagerduty_endpoint(mapFn: (r) =>
@ -256,7 +256,7 @@ ok_to_warn = statuses
all_statuses = union(tables: [crit, ok_to_warn])
|> sort(columns: ["_time"])
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: pagerduty_endpoint(mapFn: (r) =>

9
notification/rule/rule.go
View File

@ -136,16 +136,17 @@ func (b *Base) generateLevelChecks() []ast.Statement {
now := flux.Call(flux.Identifier("now"), flux.Object())
timeFilter := flux.Function(
flux.FunctionParams("r"),
flux.GreaterThan(
flux.Member("r", "_time"),
flux.Call(
&ast.BinaryExpression{
Operator: ast.GreaterThanEqualOperator,
Left: flux.Member("r", "_time"),
Right: flux.Call(
flux.Member("experimental", "subDuration"),
flux.Object(
flux.Property("from", now),
flux.Property("d", (*ast.DurationLiteral)(b.Every)),
),
),
),
},
)
var pipe *ast.PipeExpression

8
notification/rule/slack_test.go
View File

@ -61,7 +61,7 @@ any = statuses
(true))
all_statuses = any
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: slack_endpoint(mapFn: (r) =>
@ -133,7 +133,7 @@ info_to_warn = statuses
all_statuses = union(tables: [crit, info_to_warn])
|> sort(columns: ["_time"])
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: slack_endpoint(mapFn: (r) =>
@ -210,7 +210,7 @@ info_to_warn = statuses
all_statuses = union(tables: [crit, info_to_warn])
|> sort(columns: ["_time"])
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: slack_endpoint(mapFn: (r) =>
@ -289,7 +289,7 @@ info_to_warn = statuses
all_statuses = union(tables: [crit, info_to_warn])
|> sort(columns: ["_time"])
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: slack_endpoint(mapFn: (r) =>

4
notification/rule/telegram_test.go
View File

@ -125,7 +125,7 @@ crit = statuses
(r["_level"] == "crit"))
all_statuses = crit
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: telegram_endpoint(mapFn: (r) =>
@ -197,7 +197,7 @@ any = statuses
(true))
all_statuses = any
|> filter(fn: (r) =>
(r["_time"] > experimental["subDuration"](from: now(), d: 1h)))
(r["_time"] >= experimental["subDuration"](from: now(), d: 1h)))
all_statuses
|> monitor["notify"](data: notification, endpoint: telegram_endpoint(mapFn: (r) =>