diff --git a/orbit/pkg/table/extension.go b/orbit/pkg/table/extension.go index 192cdf4c1f29..87b376fd4a5b 100644 --- a/orbit/pkg/table/extension.go +++ b/orbit/pkg/table/extension.go @@ -9,6 +9,7 @@ import ( "time" "github.com/fleetdm/fleet/v4/orbit/pkg/table/sntp_request" + "github.com/kolide/launcher/pkg/osquery/tables/zfs" "github.com/macadmins/osquery-extension/tables/chromeuserprofiles" "github.com/macadmins/osquery-extension/tables/fileline" "github.com/macadmins/osquery-extension/tables/puppet" @@ -133,7 +134,8 @@ func OrbitDefaultTables() []osquery.OsqueryPlugin { table.NewPlugin("sntp_request", sntp_request.Columns(), sntp_request.GenerateFunc), // Kolide extensions. - + zfs.ZfsPropertiesPlugin(serverClient, kolideLogger), // table name is "kolide_zfs" + zfs.ZpoolPropertiesPlugin(serverClient, kolideLogger), // table name is "kolide_zfs" } return plugins } diff --git a/orbit/pkg/table/extension_darwin.go b/orbit/pkg/table/extension_darwin.go index c97ac7b67f82..fd3d6c71d2f9 100644 --- a/orbit/pkg/table/extension_darwin.go +++ b/orbit/pkg/table/extension_darwin.go @@ -18,6 +18,7 @@ import ( "github.com/fleetdm/fleet/v4/orbit/pkg/table/software_update" "github.com/fleetdm/fleet/v4/orbit/pkg/table/sudo_info" "github.com/fleetdm/fleet/v4/orbit/pkg/table/user_login_settings" + "github.com/kolide/launcher/pkg/osquery/tables/systemprofiler" "github.com/macadmins/osquery-extension/tables/filevaultusers" "github.com/macadmins/osquery-extension/tables/macos_profiles" "github.com/macadmins/osquery-extension/tables/macosrsr" @@ -59,5 +60,8 @@ func PlatformTables() []osquery.OsqueryPlugin { // 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), + + // Kolide tables + systemprofiler.TablePlugin(serverClient, kolideLogger), // table name is "kolide_systemprofiler" } } diff --git a/orbit/pkg/table/extension_linux.go b/orbit/pkg/table/extension_linux.go new file mode 100644 index 000000000000..23b91da7d1cf --- /dev/null +++ b/orbit/pkg/table/extension_linux.go @@ -0,0 +1,17 @@ +//go:build windows + +package table + +import ( + "github.com/kolide/launcher/pkg/osquery/tables/xconf" + "github.com/kolide/launcher/pkg/osquery/tables/xrdb" + "github.com/osquery/osquery-go" +) + +func PlatformTables() []osquery.OsqueryPlugin { + return []osquery.OsqueryPlugin{ + // Kolide tables + xconf.TablePlugin(serverClient, kolideLogger), // table name is "kolide_xconf" + xrdb.TablePlugin(serverClient, kolideLogger), // table name is "kolide_xrdb" + } +} diff --git a/orbit/pkg/table/extension_windows.go b/orbit/pkg/table/extension_windows.go index 943d913dbd69..bc79c95fe4f2 100644 --- a/orbit/pkg/table/extension_windows.go +++ b/orbit/pkg/table/extension_windows.go @@ -3,8 +3,11 @@ package table import ( - "github.com/fleetdm/fleet/v4/orbit/pkg/table/cis_audit" - "github.com/fleetdm/fleet/v4/orbit/pkg/table/mdm" + cisaudit "github.com/fleetdm/fleet/v4/orbit/pkg/table/cis_audit" + mdmbridge "github.com/fleetdm/fleet/v4/orbit/pkg/table/mdm" + "github.com/kolide/launcher/pkg/osquery/tables/wifi_networks" + "github.com/kolide/launcher/pkg/osquery/tables/windowsupdatetable" + "github.com/kolide/launcher/pkg/osquery/tables/wmitable" "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" ) @@ -14,5 +17,10 @@ func PlatformTables() []osquery.OsqueryPlugin { // Fleet tables table.NewPlugin("mdm_bridge", mdmbridge.Columns(), mdmbridge.Generate), table.NewPlugin("cis_audit", cisaudit.Columns(), cisaudit.Generate), + + // Kolide tables + wifi_networks.TablePlugin(serverClient, kolideLogger), // table name is "kolide_wifi_networks" + windowsupdatetable.TablePlugin(serverClient, kolideLogger), // table name is "kolide_windowsupdatetable" // TODO, more complicated + wmitable.TablePlugin(serverClient, kolideLogger), // table name is "kolide_wmitable" } }