diff --git a/orbit/cmd/orbit/orbit.go b/orbit/cmd/orbit/orbit.go index 41fe007bdad9..96fb4dc80df5 100644 --- a/orbit/cmd/orbit/orbit.go +++ b/orbit/cmd/orbit/orbit.go @@ -1257,6 +1257,7 @@ func main() { trw, startTime, scriptsEnabledFn, + opt.ServerURL, )), ) diff --git a/orbit/pkg/table/orbit_info/orbit_info.go b/orbit/pkg/table/orbit_info/orbit_info.go index 5ac71fe278d9..3d3c1a51a1e7 100644 --- a/orbit/pkg/table/orbit_info/orbit_info.go +++ b/orbit/pkg/table/orbit_info/orbit_info.go @@ -22,6 +22,7 @@ type Extension struct { dektopVersion string trw *token.ReadWriter scriptsEnabled func() bool + updateURL string } var _ orbit_table.Extension = (*Extension)(nil) @@ -29,6 +30,7 @@ var _ orbit_table.Extension = (*Extension)(nil) func New( orbitClient *service.OrbitClient, orbitChannel, osquerydChannel, desktopChannel string, desktopVersion string, trw *token.ReadWriter, startTime time.Time, scriptsEnabled func() bool, + updateURL string, ) *Extension { return &Extension{ startTime: startTime, @@ -39,6 +41,7 @@ func New( dektopVersion: desktopVersion, trw: trw, scriptsEnabled: scriptsEnabled, + updateURL: updateURL, } } @@ -60,6 +63,7 @@ func (o Extension) Columns() []table.ColumnDefinition { table.TextColumn("desktop_version"), table.BigIntColumn("uptime"), table.IntegerColumn("scripts_enabled"), + table.TextColumn("update_url"), } } @@ -104,5 +108,6 @@ func (o Extension) GenerateFunc(_ context.Context, _ table.QueryContext) ([]map[ "desktop_version": o.dektopVersion, "uptime": strconv.FormatInt(int64(time.Since(o.startTime).Seconds()), 10), "scripts_enabled": strconv.FormatInt(boolToInt(o.scriptsEnabled()), 10), + "update_url": o.updateURL, }}, nil } diff --git a/schema/osquery_fleet_schema.json b/schema/osquery_fleet_schema.json index 33f950a6a4fa..01f1cff31341 100644 --- a/schema/osquery_fleet_schema.json +++ b/schema/osquery_fleet_schema.json @@ -17870,6 +17870,12 @@ "type": "integer", "required": false, "description": "1 if running scripts is enabled, 0 if disabled." + }, + { + "name": "update_url", + "type": "text", + "required": false, + "description": "The Update Framework server URL." } ], "notes": "This table is not a core osquery table. It is included as part of Fleet's agent ([fleetd](https://fleetdm.com/docs/get-started/anatomy#fleetd)).", diff --git a/schema/tables/orbit_info.yml b/schema/tables/orbit_info.yml index cc0d9236826c..1890d284390e 100644 --- a/schema/tables/orbit_info.yml +++ b/schema/tables/orbit_info.yml @@ -45,5 +45,9 @@ columns: type: integer required: false description: 1 if running scripts is enabled, 0 if disabled. + - name: update_url + type: text + required: false + description: The Update Framework server URL. notes: This table is not a core osquery table. It is included as part of Fleet's agent ([fleetd](https://fleetdm.com/docs/get-started/anatomy#fleetd)). evented: false