From 105e54fe96241a4d2a80e2b79f5a1b2d7b7347cc Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 14 Nov 2022 22:03:04 +0000 Subject: [PATCH 1/2] [TriggersActionsUi] disable jest config in CI (#145186) This PR disables the jest config on CI for `triggers_actions_ui` plugin as it has been failing regularly during the entire day. We are not sure about what is the problem but when running this test suite the CI is logging `console.error` multiple times across many test files warning around tests not being properly wrapped or using unsupported syntax. Those should be fixed by the owning teams and I've opened an issue for that at https://github.com/elastic/kibana/issues/145188 --- .buildkite/disabled_jest_configs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/disabled_jest_configs.json b/.buildkite/disabled_jest_configs.json index a64c34ae741b4..9727d38158520 100644 --- a/.buildkite/disabled_jest_configs.json +++ b/.buildkite/disabled_jest_configs.json @@ -1,3 +1,4 @@ [ + "x-pack/plugins/triggers_actions_ui/jest.config.js", "x-pack/plugins/watcher/jest.config.js" ] From 24df1db3a5c61877044e5bce001608dd9c223fb7 Mon Sep 17 00:00:00 2001 From: JD Kurma Date: Mon, 14 Nov 2022 17:12:58 -0500 Subject: [PATCH 2/2] [Security Solution] Add Task Metric Collection to New Tasks (#145181) ## Summary Adding task metric collections to the recently added kibana tasks --- .../server/lib/telemetry/tasks/configuration.ts | 11 ++++++++++- .../server/lib/telemetry/tasks/filterlists.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts index 27dd32f5d48f1..71e96e4c82c3f 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts @@ -6,13 +6,14 @@ */ import type { Logger } from '@kbn/core/server'; +import { TASK_METRICS_CHANNEL } from '../constants'; import type { ITelemetryEventsSender } from '../sender'; import type { TelemetryConfiguration } from '../types'; import type { ITelemetryReceiver } from '../receiver'; import type { TaskExecutionPeriod } from '../task'; import { artifactService } from '../artifact'; import { telemetryConfiguration } from '../configuration'; -import { tlog } from '../helpers'; +import { createTaskMetric, tlog } from '../helpers'; export function createTelemetryConfigurationTaskConfig() { return { @@ -28,6 +29,8 @@ export function createTelemetryConfigurationTaskConfig() { sender: ITelemetryEventsSender, taskExecutionPeriod: TaskExecutionPeriod ) => { + const startTime = Date.now(); + const taskName = 'Security Solution Telemetry Configuration Task'; try { const artifactName = 'telemetry-buffer-and-batch-sizes-v1'; const configArtifact = (await artifactService.getArtifact( @@ -42,10 +45,16 @@ export function createTelemetryConfigurationTaskConfig() { configArtifact.max_endpoint_telemetry_batch; telemetryConfiguration.max_security_list_telemetry_batch = configArtifact.max_security_list_telemetry_batch; + await sender.sendOnDemand(TASK_METRICS_CHANNEL, [ + createTaskMetric(taskName, true, startTime), + ]); return 0; } catch (err) { tlog(logger, `Failed to set telemetry configuration due to ${err.message}`); telemetryConfiguration.resetAllToDefault(); + await sender.sendOnDemand(TASK_METRICS_CHANNEL, [ + createTaskMetric(taskName, false, startTime, err.message), + ]); return 0; } }, diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/filterlists.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/filterlists.ts index 67a6c4d270b6f..3919f3c8c7f4c 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/filterlists.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/filterlists.ts @@ -6,13 +6,14 @@ */ import type { Logger } from '@kbn/core/server'; +import { TASK_METRICS_CHANNEL } from '../constants'; import type { ITelemetryEventsSender } from '../sender'; import type { TelemetryFilterListArtifact } from '../types'; import type { ITelemetryReceiver } from '../receiver'; import type { TaskExecutionPeriod } from '../task'; import { artifactService } from '../artifact'; import { filterList } from '../filterlists'; -import { tlog } from '../helpers'; +import { createTaskMetric, tlog } from '../helpers'; export function createTelemetryFilterListArtifactTaskConfig() { return { @@ -28,6 +29,8 @@ export function createTelemetryFilterListArtifactTaskConfig() { sender: ITelemetryEventsSender, taskExecutionPeriod: TaskExecutionPeriod ) => { + const startTime = Date.now(); + const taskName = 'Security Solution Telemetry Filter List Artifact Task'; try { const artifactName = 'telemetry-filterlists-v1'; const artifact = (await artifactService.getArtifact( @@ -36,10 +39,16 @@ export function createTelemetryFilterListArtifactTaskConfig() { filterList.endpointAlerts = artifact.endpoint_alerts; filterList.exceptionLists = artifact.exception_lists; filterList.prebuiltRulesAlerts = artifact.prebuilt_rules_alerts; + await sender.sendOnDemand(TASK_METRICS_CHANNEL, [ + createTaskMetric(taskName, true, startTime), + ]); return 0; } catch (err) { tlog(logger, `Failed to set telemetry filterlist artifact due to ${err.message}`); filterList.resetAllToDefault(); + await sender.sendOnDemand(TASK_METRICS_CHANNEL, [ + createTaskMetric(taskName, false, startTime, err.message), + ]); return 0; } },