Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

orbit: rename unified_log table from extension to macadmins_unified_log (#7295)

Browse source
This commit is contained in:
Sharvil Shah 2022-08-19 07:29:14 +05:30 committed by GitHub
parent 4013cbbdfc
commit 1e62613450
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/interfaces/platform.ts
View file

@ -33,5 +33,5 @@ export const MACADMINS_EXTENSION_TABLES: Record<string, IOsqueryPlatform[]> = {
puppet_info: ["darwin", "linux", "windows"],
puppet_logs: ["darwin", "linux", "windows"],
puppet_state: ["darwin", "linux", "windows"],
unified_log: ["darwin"],
macadmins_unified_log: ["darwin"],
};

1
orbit/changes/rename-unified-log Normal file
View file

@ -0,0 +1 @@
* Rename `unified_log` table to `macadmins_unified_log` to avoid collision with core

4
orbit/pkg/table/extension_darwin.go
View file

@ -20,6 +20,8 @@ func platformTables() []osquery.OsqueryPlugin {
table.NewPlugin("mdm", mdm.MDMInfoColumns(), mdm.MDMInfoGenerate),
table.NewPlugin("munki_info", munki.MunkiInfoColumns(), munki.MunkiInfoGenerate),
table.NewPlugin("munki_installs", munki.MunkiInstallsColumns(), munki.MunkiInstallsGenerate),
table.NewPlugin("unified_log", unifiedlog.UnifiedLogColumns(), unifiedlog.UnifiedLogGenerate),
// osquery version 5.5.0 and up ships a unified_log table in core
// we are renaming the one from the macadmins extension to avoid collision
table.NewPlugin("macadmins_unified_log", unifiedlog.UnifiedLogColumns(), unifiedlog.UnifiedLogGenerate),
}
}