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

Jump to bottom

[Security Solution, Timelines] Replace more legacy elasticsearch types #108087

Merged
merged 2 commits into from
Aug 11, 2021
Merged

[Security Solution, Timelines] Replace more legacy elasticsearch types #108087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f996e0b
Replace more legacy elasticsearch types
rylnd Aug 10, 2021
8bb736c
Handle possibly undefined response fields
rylnd Aug 10, 2021
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
8 changes: 4 additions & 4 deletions ...olution/public/detections/containers/detection_engine/alerts/use_fetch_ecs_alerts_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/
import { useEffect, useState } from 'react';
import { SearchResponse } from 'elasticsearch';
import type { estypes } from '@elastic/elasticsearch';
import { isEmpty } from 'lodash';

import {
Expand Down Expand Up @@ -37,18 +37,18 @@ export const useFetchEcsAlertsData = ({
try {
setIsLoading(true);
const alertResponse = await KibanaServices.get().http.fetch<
SearchResponse<{ '@timestamp': string; [key: string]: unknown }>
estypes.SearchResponse<{ '@timestamp': string; [key: string]: unknown }>
>(DETECTION_ENGINE_QUERY_SIGNALS_URL, {
method: 'POST',
body: JSON.stringify(buildAlertsQuery(alertIds ?? [])),
});

setAlertEcsData(
alertResponse?.hits.hits.reduce<Ecs[]>(
(acc, { _id, _index, _source }) => [
(acc, { _id, _index, _source = {} }) => [
...acc,
{
...formatAlertToEcsSignal(_source as {}),
...formatAlertToEcsSignal(_source),
_id,
_index,
timestamp: _source['@timestamp'],
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/timelines/public/container/use_update_alerts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* 2.0.
*/

import { UpdateDocumentByQueryResponse } from 'elasticsearch';
import type { estypes } from '@elastic/elasticsearch';

import { useKibana } from '../../../../../src/plugins/kibana_react/public';
import { AlertStatus } from '../../../timelines/common';

Expand All @@ -24,7 +25,7 @@ export const useUpdateAlertsStatus = (): {
updateAlertStatus: (params: {
query: object;
status: AlertStatus;
}) => Promise<UpdateDocumentByQueryResponse>;
}) => Promise<estypes.UpdateByQueryResponse>;
} => {
const { http } = useKibana().services;

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/timelines/public/hooks/use_status_bulk_action_items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ export const useStatusBulkActionItems = ({
// TODO: Only delete those that were successfully updated from updatedRules
setEventsDeleted({ eventIds, isDeleted: true });

if (response.version_conflicts > 0 && eventIds.length === 1) {
if (response.version_conflicts && eventIds.length === 1) {
throw new Error(i18n.BULK_ACTION_FAILED_SINGLE_ALERT);
}

onUpdateSuccess(response.updated, response.version_conflicts, status);
onUpdateSuccess(response.updated ?? 0, response.version_conflicts ?? 0, status);
} catch (error) {
onUpdateFailure(status, error);
} finally {
Expand Down