Bump macadmins/osquery-extension to v1.4.1 and add network_quality ta… (#44214)
**Related issue:** Resolves #44202. - [X] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. ## Testing - [X] QA'd all new/changed functionality manually ## fleetd/orbit/Fleet Desktop - [X] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [X] Verified that fleetd runs on macOS, Linux and Windows - [X] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added network quality table for macOS to monitor download and upload speeds with results formatted in both kilobits and megabits per second (requires macOS 12+) * **Chores** * Updated MacAdmins osquery extension dependency to v1.4.1 <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Lucas Manuel Rodriguez
@@ -80,7 +80,7 @@ export const MACADMINS_EXTENSION_TABLES: Record<string, QueryablePlatform[]> = {
|
||||
munki_info: ["darwin"],
|
||||
munki_install: ["darwin"],
|
||||
crowdstrike_falcon: ["darwin", "linux"],
|
||||
// network_quality: ["darwin"], // TODO: add this table if/when it is incorporated into orbit
|
||||
network_quality: ["darwin"],
|
||||
puppet_info: ["darwin", "linux", "windows"],
|
||||
puppet_logs: ["darwin", "linux", "windows"],
|
||||
puppet_state: ["darwin", "linux", "windows"],
|
||||
|
||||
@@ -94,7 +94,7 @@ require (
|
||||
github.com/klauspost/compress v1.18.4
|
||||
github.com/kolide/launcher v1.0.12
|
||||
github.com/lib/pq v1.10.9
|
||||
github.com/macadmins/osquery-extension v1.4.0
|
||||
github.com/macadmins/osquery-extension v1.4.1
|
||||
github.com/manifoldco/promptui v0.9.0
|
||||
github.com/mattn/go-sqlite3 v1.14.22
|
||||
github.com/micromdm/micromdm v1.9.0
|
||||
|
||||
@@ -598,8 +598,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
||||
github.com/macadmins/osquery-extension v1.4.0 h1:xsPxzg7uxF6V26PnActyPaJ9tEeTKb5dUkGV2hdg3Bg=
|
||||
github.com/macadmins/osquery-extension v1.4.0/go.mod h1:/4WhG7sh9qyEi2WkacxOUJAmVciiDFmT468MbkiXBfE=
|
||||
github.com/macadmins/osquery-extension v1.4.1 h1:qkyEIYVGw9vzMMLL+ARAXhB87zhqnrK74R5hRoR1pKs=
|
||||
github.com/macadmins/osquery-extension v1.4.1/go.mod h1:Eq+JZKU8nXGenjxyM9CU+L0xoZtlKynNV0wwy6grjnc=
|
||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
|
||||
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
* Added `network_quality` table from https://github.com/macadmins/osquery-extension to macOS.
|
||||
* Bumped https://github.com/macadmins/osquery-extension to v1.4.1.
|
||||
@@ -38,6 +38,7 @@ import (
|
||||
"github.com/macadmins/osquery-extension/tables/macosrsr"
|
||||
"github.com/macadmins/osquery-extension/tables/mdm"
|
||||
"github.com/macadmins/osquery-extension/tables/munki"
|
||||
"github.com/macadmins/osquery-extension/tables/networkquality"
|
||||
"github.com/macadmins/osquery-extension/tables/socpower"
|
||||
"github.com/macadmins/osquery-extension/tables/sofa"
|
||||
"github.com/macadmins/osquery-extension/tables/thermalthrottling"
|
||||
@@ -107,6 +108,7 @@ func PlatformTables(opts PluginOpts) ([]osquery.OsqueryPlugin, error) {
|
||||
),
|
||||
table.NewPlugin("macos_thermal_pressure", thermalthrottling.ThermalPressureColumns(), thermalthrottling.ThermalPressureGenerate),
|
||||
table.NewPlugin("macos_soc_power", socpower.SocPowerColumns(), socpower.SocPowerGenerate),
|
||||
table.NewPlugin("network_quality", networkquality.NetworkQualityColumns(), networkquality.NetworkQualityGenerate),
|
||||
|
||||
filevault_status.TablePlugin(log.Logger), // table name is "filevault_status"
|
||||
ioreg.TablePlugin(log.Logger), // table name is "ioreg"
|
||||
|
||||
@@ -18616,6 +18616,43 @@
|
||||
"url": "https://fleetdm.com/tables/network_interfaces",
|
||||
"fleetRepoUrl": "https://github.com/fleetdm/fleet/blob/main/schema/tables/network_interfaces.yml"
|
||||
},
|
||||
{
|
||||
"name": "network_quality",
|
||||
"platforms": [
|
||||
"darwin"
|
||||
],
|
||||
"description": "Output from the macOS `networkQuality` binary, reporting download and upload throughput.",
|
||||
"columns": [
|
||||
{
|
||||
"name": "dl_throughput_kbps",
|
||||
"type": "integer",
|
||||
"required": false,
|
||||
"description": "Download throughput in kilobits per second, as reported by `networkQuality -c`."
|
||||
},
|
||||
{
|
||||
"name": "ul_throughput_kbps",
|
||||
"type": "integer",
|
||||
"required": false,
|
||||
"description": "Upload throughput in kilobits per second, as reported by `networkQuality -c`."
|
||||
},
|
||||
{
|
||||
"name": "dl_throughput_mbps",
|
||||
"type": "text",
|
||||
"required": false,
|
||||
"description": "Download throughput in megabits per second, formatted to two decimal places."
|
||||
},
|
||||
{
|
||||
"name": "ul_throughput_mbps",
|
||||
"type": "text",
|
||||
"required": false,
|
||||
"description": "Upload throughput in megabits per second, formatted to two decimal places."
|
||||
}
|
||||
],
|
||||
"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)). This table is from the [Mac Admins osquery extension](https://github.com/macadmins/osquery-extension).\n\nThe `/usr/bin/networkQuality` binary is only available on macOS 12 (Monterey) and later. On hosts where the binary is not present, the table returns no rows.",
|
||||
"evented": false,
|
||||
"url": "https://fleetdm.com/tables/network_quality",
|
||||
"fleetRepoUrl": "https://github.com/fleetdm/fleet/blob/main/schema/tables/network_quality.yml"
|
||||
},
|
||||
{
|
||||
"name": "nfs_shares",
|
||||
"description": "NFS shares exported by the host.",
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
name: network_quality
|
||||
platforms:
|
||||
- darwin
|
||||
description: Output from the macOS `networkQuality` binary, reporting download and upload throughput.
|
||||
columns:
|
||||
- name: dl_throughput_kbps
|
||||
type: integer
|
||||
required: false
|
||||
description: Download throughput in kilobits per second, as reported by `networkQuality -c`.
|
||||
- name: ul_throughput_kbps
|
||||
type: integer
|
||||
required: false
|
||||
description: Upload throughput in kilobits per second, as reported by `networkQuality -c`.
|
||||
- name: dl_throughput_mbps
|
||||
type: text
|
||||
required: false
|
||||
description: Download throughput in megabits per second, formatted to two decimal places.
|
||||
- name: ul_throughput_mbps
|
||||
type: text
|
||||
required: false
|
||||
description: Upload throughput in megabits per second, formatted to two decimal places.
|
||||
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)). This table is from the [Mac Admins osquery extension](https://github.com/macadmins/osquery-extension).
|
||||
|
||||
The `/usr/bin/networkQuality` binary is only available on macOS 12 (Monterey) and later. On hosts where the binary is not present, the table returns no rows.
|
||||
evented: false
|
||||
Reference in New Issue
Block a user