Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Uptime] Fix alerting false positives #75577

Merged
merged 15 commits into from
Aug 31, 2020
Merged

[Uptime] Fix alerting false positives #75577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7d985b
Add test and modify code to account for complex filter input.
justinkambic Aug 20, 2020
f1062c2
Avoid unnecessary nesting.
justinkambic Aug 20, 2020
6172d35
Simplify filtering code.
justinkambic Aug 20, 2020
e009808
Use `must` instead of `should`.
justinkambic Aug 20, 2020
383e136
Fix types.
justinkambic Aug 20, 2020
58e627f
Refresh snapshots.
justinkambic Aug 20, 2020
7e588ed
Use `filter` instead of `must`.
justinkambic Aug 21, 2020
61e9c94
Refactor to improve readability.
justinkambic Aug 25, 2020
f15b877
Merge branch 'master' into uptime_fix-monitor-status-alert-filters
justinkambic Aug 26, 2020
78b031e
Resolve filtering issue for availability query.
justinkambic Aug 26, 2020
3f90287
Add test covering filter fix.
justinkambic Aug 26, 2020
3946bf7
Merge branch 'master' into uptime_fix-monitor-status-alert-filters
elasticmachine Aug 27, 2020
5e010f3
Merge branch 'master' into uptime_fix-monitor-status-alert-filters
justinkambic Aug 31, 2020
07e6915
Removed unused var.
justinkambic Aug 31, 2020
08262ce
Merge branch 'uptime_fix-monitor-status-alert-filters' of github.com:…
justinkambic Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 145 additions & 14 deletions x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_availability.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,28 +203,32 @@ describe('monitor availability', () => {
},
},
},
],
"minimum_should_match": 1,
"should": Array [
Object {
"bool": Object {
"minimum_should_match": 1,
"should": Array [
Object {
"match_phrase": Object {
"monitor.id": "apm-dev",
"bool": Object {
"minimum_should_match": 1,
"should": Array [
Object {
"match_phrase": Object {
"monitor.id": "apm-dev",
},
},
],
},
},
],
},
},
Object {
"bool": Object {
"minimum_should_match": 1,
"should": Array [
Object {
"match_phrase": Object {
"monitor.id": "auto-http-0X8D6082B94BBE3B8A",
"bool": Object {
"minimum_should_match": 1,
"should": Array [
Object {
"match_phrase": Object {
"monitor.id": "auto-http-0X8D6082B94BBE3B8A",
},
},
],
},
},
],
Expand Down Expand Up @@ -797,6 +801,133 @@ describe('monitor availability', () => {
]
`);
});

it('does not overwrite filters', async () => {
const [callES, esMock] = setupMockEsCompositeQuery<
AvailabilityKey,
GetMonitorAvailabilityResult,
AvailabilityDoc
>(
[
{
bucketCriteria: [],
},
],
genBucketItem
);
await getMonitorAvailability({
callES,
dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
range: 3,
rangeUnit: 's',
threshold: '99',
filters: JSON.stringify({ bool: { filter: [{ term: { 'monitor.id': 'foo' } }] } }),
});
const [, params] = esMock.callAsCurrentUser.mock.calls[0];
expect(params).toMatchInlineSnapshot(`
Object {
"body": Object {
"aggs": Object {
"monitors": Object {
"aggs": Object {
"down_sum": Object {
"sum": Object {
"field": "summary.down",
"missing": 0,
},
},
"fields": Object {
"top_hits": Object {
"size": 1,
"sort": Array [
Object {
"@timestamp": Object {
"order": "desc",
},
},
],
},
},
"filtered": Object {
"bucket_selector": Object {
"buckets_path": Object {
"threshold": "ratio.value",
},
"script": "params.threshold < 0.99",
},
},
"ratio": Object {
"bucket_script": Object {
"buckets_path": Object {
"downTotal": "down_sum",
"upTotal": "up_sum",
},
"script": "
if (params.upTotal + params.downTotal > 0) {
return params.upTotal / (params.upTotal + params.downTotal);
} return null;",
},
},
"up_sum": Object {
"sum": Object {
"field": "summary.up",
"missing": 0,
},
},
},
"composite": Object {
"size": 2000,
"sources": Array [
Object {
"monitorId": Object {
"terms": Object {
"field": "monitor.id",
},
},
},
Object {
"location": Object {
"terms": Object {
"field": "observer.geo.name",
"missing_bucket": true,
},
},
},
],
},
},
},
"query": Object {
"bool": Object {
"filter": Array [
Object {
"range": Object {
"@timestamp": Object {
"gte": "now-3s",
"lte": "now",
},
},
},
Object {
"bool": Object {
"filter": Array [
Object {
"term": Object {
"monitor.id": "foo",
},
},
],
},
},
],
},
},
"size": 0,
},
"index": "heartbeat-8*",
}
`);
});
});

describe('formatBuckets', () => {
Expand Down
Loading