Skip to content

[Asset Management] Osquery agent picker #94541

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
lykkin merged 20 commits into from
Mar 31, 2021
Merged

[Asset Management] Osquery agent picker #94541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2157345
first pass of osquery host picker
lykkin Jan 29, 2021
0ee193b
passes type checking and linting
lykkin Mar 15, 2021
6cd9a3c
reworked everything
lykkin Mar 23, 2021
cc0291e
Merge branch 'master' into osquery-livequery-host-picker
kibanamachine Mar 23, 2021
2bab6a7
fixed the policy query and pill colors
lykkin Mar 23, 2021
a745ee1
fix i18n test failures
lykkin Mar 23, 2021
200a98f
refactor server side logic
lykkin Mar 23, 2021
191fd63
more clean up
lykkin Mar 23, 2021
fe354f5
address pr comments
lykkin Mar 25, 2021
b5f34d1
Merge branch 'master' into osquery-livequery-host-picker
lykkin Mar 25, 2021
dbd24f9
fix types, await the parsed agents on the server side
lykkin Mar 25, 2021
7111ac5
primitive is spelled with an i
lykkin Mar 25, 2021
8db9196
agents come in as list rather than agents
lykkin Mar 25, 2021
cd26dba
added more helpers tests, added some edge case guarding
lykkin Mar 26, 2021
d6916f3
Merge branch 'master' into osquery-livequery-host-picker
kibanamachine Mar 29, 2021
6c00d9e
unwrap agents off response in useAllAgents
lykkin Mar 30, 2021
4914692
used proper types for aggregations
lykkin Mar 30, 2021
41e5945
translations for more ui text
lykkin Mar 30, 2021
8d5aa8d
fix linting errors
lykkin Mar 31, 2021
dad0a2d
Merge branch 'master' into osquery-livequery-host-picker
kibanamachine Mar 31, 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
2 changes: 2 additions & 0 deletions x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import type { estypes } from '@elastic/elasticsearch';
import { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
import { ESQuery } from '../../typed_json';
import {
Expand Down Expand Up @@ -36,6 +37,7 @@ export type FactoryQueryTypes = OsqueryQueries;

export interface RequestBasicOptions extends IEsSearchRequest {
filterQuery: ESQuery | string | undefined;
aggregations?: Record<string, estypes.AggregationContainer>;
docValueFields?: DocValueFields[];
factoryQueryType?: FactoryQueryTypes;
}
Expand Down
18 changes: 6 additions & 12 deletions x-pack/plugins/osquery/public/action_results/action_results_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { useActionResults } from './use_action_results';
import { useAllResults } from '../results/use_all_results';
import { Direction, ResultEdges } from '../../common/search_strategy';
import { useRouterNavigate } from '../common/lib/kibana';
import { useOsqueryPolicies } from '../agents/use_osquery_policies';

const DataContext = createContext<ResultEdges>([]);

Expand Down Expand Up @@ -91,12 +92,8 @@ const ActionResultsTableComponent: React.FC<ActionResultsTableProps> = ({ action
setVisibleColumns,
]);

const { data: agentsData } = useAllAgents({
activePage: 0,
limit: 1000,
direction: Direction.desc,
sortField: 'updated_at',
});
const osqueryPolicyData = useOsqueryPolicies();
const { agents } = useAllAgents(osqueryPolicyData);

const renderCellValue: EuiDataGridProps['renderCellValue'] = useMemo(
() => ({ rowIndex, columnId }) => {
Expand Down Expand Up @@ -134,8 +131,7 @@ const ActionResultsTableComponent: React.FC<ActionResultsTableProps> = ({ action

if (columnId === 'agent_status') {
const agentIdValue = value.fields?.agent_id[0];
// @ts-expect-error update types
const agent = find(['_id', agentIdValue], agentsData?.agents);
const agent = find(['_id', agentIdValue], agents);
const online = agent?.active;
const color = online ? 'success' : 'danger';
const label = online ? 'Online' : 'Offline';
Expand All @@ -144,8 +140,7 @@ const ActionResultsTableComponent: React.FC<ActionResultsTableProps> = ({ action

if (columnId === 'agent') {
const agentIdValue = value.fields?.agent_id[0];
// @ts-expect-error update types
const agent = find(['_id', agentIdValue], agentsData?.agents);
const agent = find(['_id', agentIdValue], agents);
const agentName = agent?.local_metadata.host.name;

// eslint-disable-next-line react-hooks/rules-of-hooks
Expand All @@ -162,8 +157,7 @@ const ActionResultsTableComponent: React.FC<ActionResultsTableProps> = ({ action

return '-';
},
// @ts-expect-error update types
[actionId, agentsData?.agents, pagination.pageIndex, pagination.pageSize]
[actionId, agents, pagination.pageIndex, pagination.pageSize]
);

const tableSorting: EuiDataGridSorting = useMemo(
Expand Down
Loading