Skip to content

[8.12] [Security Solution] [Elastic AI Assistant] Include acknowledged alerts in the LangChain AlertCountsTool aggregation (#173701) #173801

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

Merged
andrew-goldstein merged 1 commit into from
Dec 21, 2023
Merged

[8.12] [Security Solution] [Elastic AI Assistant] Include acknowledged alerts in the LangChain AlertCountsTool aggregation (#173701) #173801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions .../elastic_assistant/server/lib/langchain/tools/alert_counts/get_alert_counts_query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@ describe('getAlertsCountQuery', () => {

expect(query).toEqual({
aggs: {
statusBySeverity: {
kibanaAlertSeverity: {
terms: {
field: 'kibana.alert.severity',
},
aggs: {
kibanaAlertWorkflowStatus: {
terms: {
field: 'kibana.alert.workflow_status',
},
},
},
},
},
index: ['alerts-index-pattern'],
Expand All @@ -26,13 +33,27 @@ describe('getAlertsCountQuery', () => {
filter: [
{
bool: {
must: [],
filter: [
{
match_phrase: {
'kibana.alert.workflow_status': 'open',
bool: {
should: [
{
match_phrase: {
'kibana.alert.workflow_status': 'open',
},
},
{
match_phrase: {
'kibana.alert.workflow_status': 'acknowledged',
},
},
],
minimum_should_match: 1,
},
},
],
should: [],
must_not: [
{
exists: {
Expand All @@ -45,8 +66,8 @@ describe('getAlertsCountQuery', () => {
{
range: {
'@timestamp': {
gte: 'now/d',
lte: 'now/d',
gte: 'now-24h',
lte: 'now',
},
},
},
Expand Down
31 changes: 26 additions & 5 deletions ...ugins/elastic_assistant/server/lib/langchain/tools/alert_counts/get_alert_counts_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@

export const getAlertsCountQuery = (alertsIndexPattern: string) => ({
aggs: {
statusBySeverity: {
kibanaAlertSeverity: {
terms: {
field: 'kibana.alert.severity',
},
aggs: {
kibanaAlertWorkflowStatus: {
terms: {
field: 'kibana.alert.workflow_status',
},
},
},
},
},
index: [alertsIndexPattern],
Expand All @@ -21,25 +28,39 @@ export const getAlertsCountQuery = (alertsIndexPattern: string) => ({
bool: {
filter: [
{
match_phrase: {
'kibana.alert.workflow_status': 'open',
bool: {
should: [
{
match_phrase: {
'kibana.alert.workflow_status': 'open',
},
},
{
match_phrase: {
'kibana.alert.workflow_status': 'acknowledged',
},
},
],
minimum_should_match: 1,
},
},
],
must: [],
must_not: [
{
exists: {
field: 'kibana.alert.building_block_type',
},
},
],
should: [],
},
},
{
range: {
'@timestamp': {
gte: 'now/d',
lte: 'now/d',
gte: 'now-24h',
lte: 'now',
},
},
},
Expand Down
54 changes: 50 additions & 4 deletions ...s/elastic_assistant/server/lib/langchain/tools/alert_counts/get_alert_counts_tool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,64 @@ describe('getAlertCountsTool', () => {
await tool.func('');

expect(esClient.search).toHaveBeenCalledWith({
aggs: { statusBySeverity: { terms: { field: 'kibana.alert.severity' } } },
aggs: {
kibanaAlertSeverity: {
terms: {
field: 'kibana.alert.severity',
},
aggs: {
kibanaAlertWorkflowStatus: {
terms: {
field: 'kibana.alert.workflow_status',
},
},
},
},
},
index: ['alerts-index'],
query: {
bool: {
filter: [
{
bool: {
filter: [{ match_phrase: { 'kibana.alert.workflow_status': 'open' } }],
must_not: [{ exists: { field: 'kibana.alert.building_block_type' } }],
filter: [
{
bool: {
should: [
{
match_phrase: {
'kibana.alert.workflow_status': 'open',
},
},
{
match_phrase: {
'kibana.alert.workflow_status': 'acknowledged',
},
},
],
minimum_should_match: 1,
},
},
],
should: [],
must: [],
must_not: [
{
exists: {
field: 'kibana.alert.building_block_type',
},
},
],
},
},
{
range: {
'@timestamp': {
gte: 'now-24h',
lte: 'now',
},
},
},
{ range: { '@timestamp': { gte: 'now/d', lte: 'now/d' } } },
],
},
},
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/elastic_assistant/server/lib/langchain/tools/alert_counts/get_alert_counts_tool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { requestHasRequiredAnonymizationParams } from '../../helpers';
import type { RequestBody } from '../../types';

export const ALERT_COUNTS_TOOL_DESCRIPTION =
'Call this for the counts of last 24 hours of open alerts in the environment, grouped by their severity';
'Call this for the counts of last 24 hours of open and acknowledged alerts in the environment, grouped by their severity and workflow status.';

export const getAlertCountsTool = ({
alertsIndexPattern,
Expand Down
4 changes: 2 additions & 2 deletions ...ngchain/tools/open_and_acknowledged_alerts/get_open_and_acknowledged_alerts_query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ describe('getOpenAndAcknowledgedAlertsQuery', () => {
{
range: {
'@timestamp': {
gte: 'now-1d/d',
lte: 'now/d',
gte: 'now-24h',
lte: 'now',
format: 'strict_date_optional_time',
},
},
Expand Down
4 changes: 2 additions & 2 deletions ...ib/langchain/tools/open_and_acknowledged_alerts/get_open_and_acknowledged_alerts_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ export const getOpenAndAcknowledgedAlertsQuery = ({
{
range: {
'@timestamp': {
gte: 'now-1d/d',
lte: 'now/d',
gte: 'now-24h',
lte: 'now',
format: 'strict_date_optional_time',
},
},
Expand Down
4 changes: 2 additions & 2 deletions ...angchain/tools/open_and_acknowledged_alerts/get_open_and_acknowledged_alerts_tool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ describe('getOpenAndAcknowledgedAlertsTool', () => {
range: {
'@timestamp': {
format: 'strict_date_optional_time',
gte: 'now-1d/d',
lte: 'now/d',
gte: 'now-24h',
lte: 'now',
},
},
},
Expand Down