maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Osquery] Fix Osquery plugin initialization (#99591) (#99676)

Browse source
This commit is contained in:
Patryk Kopyciński 2021-05-10 23:06:57 +02:00 committed by GitHub
parent 14f4c553aa
commit a5745393cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
x-pack/plugins/osquery/public/plugin.ts
View file

@ -38,6 +38,14 @@ export function toggleOsqueryPlugin(
http: CoreStart['http'],
registerExtension?: StartPlugins['fleet']['registerExtension']
) {
if (http.anonymousPaths.isAnonymous(window.location.pathname)) {
updater$.next(() => ({
status: AppStatus.inaccessible,
navLinkStatus: AppNavLinkStatus.hidden,
}));
return;
}
http
.fetch<GetPackagesResponse>(epmRouteService.getListPath(), { query: { experimental: true } })
.then(({ response }) => {
@ -134,22 +142,23 @@ export class OsqueryPlugin implements Plugin<OsqueryPluginSetup, OsqueryPluginSt
if (config.enabled) {
toggleOsqueryPlugin(this.appUpdater$, core.http, registerExtension);
registerExtension({
package: OSQUERY_INTEGRATION_NAME,
view: 'package-policy-create',
component: LazyOsqueryManagedPolicyCreateImportExtension,
});
registerExtension({
package: OSQUERY_INTEGRATION_NAME,
view: 'package-policy-edit',
component: LazyOsqueryManagedPolicyEditExtension,
});
}
registerExtension({
package: OSQUERY_INTEGRATION_NAME,
view: 'package-policy-create',
component: LazyOsqueryManagedPolicyCreateImportExtension,
});
registerExtension({
package: OSQUERY_INTEGRATION_NAME,
view: 'package-policy-edit',
component: LazyOsqueryManagedPolicyEditExtension,
});
} else {
this.appUpdater$.next(() => ({
status: AppStatus.inaccessible,
navLinkStatus: AppNavLinkStatus.hidden,
}));
}

5
x-pack/plugins/osquery/public/scheduled_query_groups/form/index.tsx
View file

@ -151,6 +151,11 @@ const ScheduledQueryGroupFormComponent: React.FC<ScheduledQueryGroupFormProps> =
// @ts-expect-error update types
draft.inputs[0].streams.forEach((stream) => {
delete stream.compiled_stream;
// we don't want to send id as null when creating the policy
if (stream.id == null) {
delete stream.id;
}
});
return draft;
});

2
x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
View file

@ -43,7 +43,7 @@ export const buildResultsQuery = ({
aggs: {
count_by_agent_id: {
terms: {
field: 'agent.id',
field: 'elastic_agent.id',
size: 10000,
},
},