From 31deb2570460f82e8af646108364fd9f5430aa48 Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Mon, 30 Dec 2019 13:55:00 -0600 Subject: [PATCH 1/3] Remove punctuation from translation We already had a colon on both uses of this key, resulting in '::' on the page. --- .../plugins/siem/public/pages/detection_engine/translations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts index 94adbfcde1e53..11b3fb11f6eee 100644 --- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts +++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts @@ -11,7 +11,7 @@ export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.pageTitle', }); export const LAST_SIGNAL = i18n.translate('xpack.siem.detectionEngine.lastSignalTitle', { - defaultMessage: 'Last signal:', + defaultMessage: 'Last signal', }); export const TOTAL_SIGNAL = i18n.translate('xpack.siem.detectionEngine.totalSignalTitle', { From 3b9c26e287adcedac471ca359ad4e345a92705a5 Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Mon, 30 Dec 2019 16:44:25 -0600 Subject: [PATCH 2/3] Ignore 409 errors from our signal creation In my experience these are always due to a rule being run multiple times on the same document, generating a duplicate signal with a (correctly) duplicate id. Only if we encounter non-409 errors do we log a message to the user. --- .../signals/__mocks__/es_results.ts | 22 ++++++++ .../signals/single_bulk_create.test.ts | 28 ++++++++++- .../signals/single_bulk_create.ts | 50 ++++++++----------- 3 files changed, 70 insertions(+), 30 deletions(-) diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts index db5b3701a4fc2..5e50b65b51717 100644 --- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts +++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts @@ -144,6 +144,28 @@ export const sampleBulkCreateDuplicateResult = { ], }; +export const sampleBulkCreateErrorResult = { + ...sampleBulkCreateDuplicateResult, + items: [ + ...sampleBulkCreateDuplicateResult.items, + { + create: { + _index: 'test', + _type: '_doc', + _id: '5', + status: 500, + error: { + type: 'internal_server_error', + reason: '[4]: internal server error', + index_uuid: 'cXmq4Rt3RGGswDTTwZFzvA', + shard: '0', + index: 'test', + }, + }, + }, + ], +}; + export const sampleDocSearchResultsNoSortId = ( someUuid: string = sampleIdGuid ): SignalSearchResponse => ({ diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts index d58f0a22b763d..ca4b1d1e8e84a 100644 --- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts +++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts @@ -13,6 +13,7 @@ import { sampleDocSearchResultsNoSortIdNoVersion, sampleEmptyDocSearchResults, sampleBulkCreateDuplicateResult, + sampleBulkCreateErrorResult, } from './__mocks__/es_results'; import { savedObjectsClientMock } from 'src/core/server/mocks'; import { DEFAULT_SIGNALS_INDEX } from '../../../../common/constants'; @@ -206,7 +207,8 @@ describe('singleBulkCreate', () => { }); expect(successfulsingleBulkCreate).toEqual(true); }); - test('create successful bulk create when bulk create has errors', async () => { + + test('create successful bulk create when bulk create has duplicate errors', async () => { const sampleParams = sampleRuleAlertParams(); const sampleSearchResult = sampleDocSearchResultsNoSortId; mockService.callCluster.mockReturnValue(sampleBulkCreateDuplicateResult); @@ -224,6 +226,30 @@ describe('singleBulkCreate', () => { enabled: true, tags: ['some fake tag 1', 'some fake tag 2'], }); + + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(successfulsingleBulkCreate).toEqual(true); + }); + + test('create successful bulk create when bulk create has multiple error statuses', async () => { + const sampleParams = sampleRuleAlertParams(); + const sampleSearchResult = sampleDocSearchResultsNoSortId; + mockService.callCluster.mockReturnValue(sampleBulkCreateErrorResult); + const successfulsingleBulkCreate = await singleBulkCreate({ + someResult: sampleSearchResult(), + ruleParams: sampleParams, + services: mockService, + logger: mockLogger, + id: sampleRuleGuid, + signalsIndex: DEFAULT_SIGNALS_INDEX, + name: 'rule-name', + createdBy: 'elastic', + updatedBy: 'elastic', + interval: '5m', + enabled: true, + tags: ['some fake tag 1', 'some fake tag 2'], + }); + expect(mockLogger.error).toHaveBeenCalled(); expect(successfulsingleBulkCreate).toEqual(true); }); diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts index 40b2eeab938dc..02cfe61c63cf9 100644 --- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts +++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import { countBy } from 'lodash'; import { performance } from 'perf_hooks'; import { AlertServices } from '../../../../../alerting/server/types'; import { SignalSearchResponse, BulkResponse } from './types'; @@ -68,39 +69,30 @@ export const singleBulkCreate = async ({ }, buildBulkBody({ doc, ruleParams, id, name, createdBy, updatedBy, interval, enabled, tags }), ]); - const time1 = performance.now(); - const firstResult: BulkResponse = await services.callCluster('bulk', { + const start = performance.now(); + const response: BulkResponse = await services.callCluster('bulk', { index: signalsIndex, refresh: false, body: bulkBody, }); - const time2 = performance.now(); - logger.debug( - `individual bulk process time took: ${Number(time2 - time1).toFixed(2)} milliseconds` - ); - logger.debug(`took property says bulk took: ${firstResult.took} milliseconds`); - if (firstResult.errors) { - // go through the response status errors and see what - // types of errors they are, count them up, and log them. - const errorCountMap = firstResult.items.reduce((acc: { [key: string]: number }, item) => { - if (item.create.error) { - const responseStatusKey = item.create.status.toString(); - acc[responseStatusKey] = acc[responseStatusKey] ? acc[responseStatusKey] + 1 : 1; - } - return acc; - }, {}); - /* - the logging output below should look like - {'409': 55} - which is read as "there were 55 counts of 409 errors returned from bulk create" - */ - logger.error( - `[-] bulkResponse had errors with response statuses:counts of...\n${JSON.stringify( - errorCountMap, - null, - 2 - )}` - ); + const end = performance.now(); + logger.debug(`individual bulk process time took: ${Number(end - start).toFixed(2)} milliseconds`); + logger.debug(`took property says bulk took: ${response.took} milliseconds`); + + if (response.errors) { + const itemsWithErrors = response.items.filter(item => item.create.error); + const errorCountsByStatus = countBy(itemsWithErrors, item => item.create.status); + const hasNonDuplicateError = Object.keys(errorCountsByStatus).some(status => status !== '409'); + + if (hasNonDuplicateError) { + logger.error( + `[-] bulkResponse had errors with response statuses:counts of...\n${JSON.stringify( + errorCountsByStatus, + null, + 2 + )}` + ); + } } return true; }; From 1bcf97821bdfe3ef647f45135bbdd18b6248d38b Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Thu, 2 Jan 2020 11:34:18 -0600 Subject: [PATCH 3/3] Hide 409 errors during signal creation These are expected and potentially confusing to the user. Instead, we only show unexpected errors. --- .../lib/detection_engine/signals/single_bulk_create.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts index 02cfe61c63cf9..a6290e57eb225 100644 --- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts +++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { countBy } from 'lodash'; +import { countBy, isEmpty } from 'lodash'; import { performance } from 'perf_hooks'; import { AlertServices } from '../../../../../alerting/server/types'; import { SignalSearchResponse, BulkResponse } from './types'; @@ -82,9 +82,9 @@ export const singleBulkCreate = async ({ if (response.errors) { const itemsWithErrors = response.items.filter(item => item.create.error); const errorCountsByStatus = countBy(itemsWithErrors, item => item.create.status); - const hasNonDuplicateError = Object.keys(errorCountsByStatus).some(status => status !== '409'); + delete errorCountsByStatus['409']; // Duplicate signals are expected - if (hasNonDuplicateError) { + if (!isEmpty(errorCountsByStatus)) { logger.error( `[-] bulkResponse had errors with response statuses:counts of...\n${JSON.stringify( errorCountsByStatus,