github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Osquery] Add tagging support for osquery assets (#143417)

Browse source
This commit is contained in:
Patryk Kopyciński 2022-10-20 14:18:43 +02:00 • committed by GitHub
parent c3db6614f6
commit 323244ef2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
View file

@ -51,7 +51,7 @@ export type ArchiveAsset = Pick<
// KibanaSavedObjectTypes are used to ensure saved objects being created for a given
// KibanaAssetType have the correct type
const KibanaSavedObjectTypeMapping: Record<KibanaAssetType, KibanaSavedObjectType> = {
export const KibanaSavedObjectTypeMapping: Record<KibanaAssetType, KibanaSavedObjectType> = {
[KibanaAssetType.dashboard]: KibanaSavedObjectType.dashboard,
[KibanaAssetType.indexPattern]: KibanaSavedObjectType.indexPattern,
[KibanaAssetType.map]: KibanaSavedObjectType.map,

10
x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.test.ts
View file

@ -94,6 +94,8 @@ describe('tagKibanaAssets', () => {
search: [{ id: 's1', type: 'search' }],
config: [{ id: 'c1', type: 'config' }],
visualization: [{ id: 'v1', type: 'visualization' }],
osquery_pack_asset: [{ id: 'osquery-pack-asset1', type: 'osquery-pack-asset' }],
osquery_saved_query: [{ id: 'osquery_saved_query1', type: 'osquery_saved_query' }],
} as any;
await tagKibanaAssets({
@ -106,7 +108,13 @@ describe('tagKibanaAssets', () => {
expect(savedObjectTagAssignmentService.updateTagAssignments).toHaveBeenCalledWith({
tags: ['managed', 'system'],
assign: [...kibanaAssets.dashboard, ...kibanaAssets.search, ...kibanaAssets.visualization],
assign: [
...kibanaAssets.dashboard,
...kibanaAssets.search,
...kibanaAssets.visualization,
...kibanaAssets.osquery_pack_asset,
...kibanaAssets.osquery_saved_query,
],
unassign: [],
refresh: false,
});

3
x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.ts
View file

@ -11,6 +11,7 @@ import type { IAssignmentService, ITagsClient } from '@kbn/saved-objects-tagging
import type { KibanaAssetType } from '../../../../../common';
import type { ArchiveAsset } from './install';
import { KibanaSavedObjectTypeMapping } from './install';
const TAG_COLOR = '#FFFFFF';
const MANAGED_TAG_NAME = 'Managed';
@ -30,7 +31,7 @@ export async function tagKibanaAssets({
pkgName: string;
}) {
const taggableAssets = Object.entries(kibanaAssets).flatMap(([assetType, assets]) => {
if (!taggableTypes.includes(assetType as KibanaAssetType)) {
if (!taggableTypes.includes(KibanaSavedObjectTypeMapping[assetType as KibanaAssetType])) {
return [];
}

8
x-pack/plugins/osquery/server/utils/register_features.ts
View file

@ -115,7 +115,7 @@ export const registerFeatures = (features: SetupPlugins['features']) => {
name: 'All',
savedObject: {
all: [savedQuerySavedObjectType],
read: [],
read: ['tag'],
},
ui: ['writeSavedQueries', 'readSavedQueries'],
},
@ -126,7 +126,7 @@ export const registerFeatures = (features: SetupPlugins['features']) => {
name: 'Read',
savedObject: {
all: [],
read: [savedQuerySavedObjectType],
read: [savedQuerySavedObjectType, 'tag'],
},
ui: ['readSavedQueries'],
},
@ -149,7 +149,7 @@ export const registerFeatures = (features: SetupPlugins['features']) => {
name: 'All',
savedObject: {
all: [packSavedObjectType, packAssetSavedObjectType],
read: [],
read: ['tag'],
},
ui: ['writePacks', 'readPacks'],
},
@ -160,7 +160,7 @@ export const registerFeatures = (features: SetupPlugins['features']) => {
name: 'Read',
savedObject: {
all: [],
read: [packSavedObjectType],
read: [packSavedObjectType, 'tag'],
},
ui: ['readPacks'],
},

11
x-pack/plugins/saved_objects_tagging/common/constants.ts
View file

@ -20,4 +20,13 @@ export const tagManagementSectionId = 'tags';
/**
* The list of saved object types that are currently supporting tagging.
*/
export const taggableTypes = ['dashboard', 'visualization', 'map', 'lens', 'search'];
export const taggableTypes = [
'dashboard',
'visualization',
'map',
'lens',
'search',
'osquery-pack',
'osquery-pack-asset',
'osquery-saved-query',
];

3
x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
View file

@ -23,5 +23,8 @@ export const tagUsageCollectorSchema: MakeSchemaFrom<TaggingUsageData> = {
visualization: perTypeSchema,
map: perTypeSchema,
search: perTypeSchema,
'osquery-pack': perTypeSchema,
'osquery-pack-asset': perTypeSchema,
'osquery-saved-query': perTypeSchema,
},
};

30
x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
View file

@ -9355,6 +9355,36 @@
"type": "integer"
}
}
},
"osquery-pack": {
"properties": {
"usedTags": {
"type": "integer"
},
"taggedObjects": {
"type": "integer"
}
}
},
"osquery-pack-asset": {
"properties": {
"usedTags": {
"type": "integer"
},
"taggedObjects": {
"type": "integer"
}
}
},
"osquery-saved-query": {
"properties": {
"usedTags": {
"type": "integer"
},
"taggedObjects": {
"type": "integer"
}
}
}
}
}

11
x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
View file

@ -32,7 +32,16 @@ export default function (ftrContext: FtrProviderContext) {
});
const assignablePerUser = {
[USERS.SUPERUSER.username]: ['dashboard', 'visualization', 'map', 'lens', 'search'],
[USERS.SUPERUSER.username]: [
'dashboard',
'visualization',
'map',
'lens',
'search',
'osquery-pack',
'osquery-pack-asset',
'osquery-saved-query',
],
[USERS.DEFAULT_SPACE_SO_TAGGING_READ_USER.username]: [],
[USERS.DEFAULT_SPACE_READ_USER.username]: [],
[USERS.DEFAULT_SPACE_ADVANCED_SETTINGS_READ_USER.username]: [],