From 1e62613450059e70ff409924997b1d0d7b10ff42 Mon Sep 17 00:00:00 2001 From: Sharvil Shah Date: Fri, 19 Aug 2022 07:29:14 +0530 Subject: [PATCH] orbit: rename `unified_log` table from extension to `macadmins_unified_log` (#7295) --- frontend/interfaces/platform.ts | 2 +- orbit/changes/rename-unified-log | 1 + orbit/pkg/table/extension_darwin.go | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 orbit/changes/rename-unified-log diff --git a/frontend/interfaces/platform.ts b/frontend/interfaces/platform.ts index 0eab38cfa6..327a0e99c2 100644 --- a/frontend/interfaces/platform.ts +++ b/frontend/interfaces/platform.ts @@ -33,5 +33,5 @@ export const MACADMINS_EXTENSION_TABLES: Record = { puppet_info: ["darwin", "linux", "windows"], puppet_logs: ["darwin", "linux", "windows"], puppet_state: ["darwin", "linux", "windows"], - unified_log: ["darwin"], + macadmins_unified_log: ["darwin"], }; diff --git a/orbit/changes/rename-unified-log b/orbit/changes/rename-unified-log new file mode 100644 index 0000000000..42ec5858f5 --- /dev/null +++ b/orbit/changes/rename-unified-log @@ -0,0 +1 @@ +* Rename `unified_log` table to `macadmins_unified_log` to avoid collision with core \ No newline at end of file diff --git a/orbit/pkg/table/extension_darwin.go b/orbit/pkg/table/extension_darwin.go index 91ce9cc9d2..00919ef013 100644 --- a/orbit/pkg/table/extension_darwin.go +++ b/orbit/pkg/table/extension_darwin.go @@ -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), } }