From 29580a242de9fdb3113d4c02b52e0f8f97a3cd75 Mon Sep 17 00:00:00 2001 From: Sharon Katz <121527325+sharon-fdm@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:26:26 -0500 Subject: [PATCH] 15135 remove atom package (#15410) --- ...onsider-joining-against-the-users-table.md | 1 - .../standard-query-library.yml | 4 +-- docs/Using Fleet/Audit-logs.md | 8 ++--- docs/Using Fleet/Understanding-host-vitals.md | 30 ------------------- frontend/interfaces/software.ts | 2 +- .../cards/Software/SoftwareTableConfig.tsx | 2 +- schema/fleet_schema.json | 10 ------- schema/tables/atom_packages.yml | 23 +++++++------- tools/osquery-testing/macOS.txt | 1 - 9 files changed, 20 insertions(+), 61 deletions(-) diff --git a/articles/osquery-consider-joining-against-the-users-table.md b/articles/osquery-consider-joining-against-the-users-table.md index 3382188dc..9b7dc904d 100644 --- a/articles/osquery-consider-joining-against-the-users-table.md +++ b/articles/osquery-consider-joining-against-the-users-table.md @@ -30,7 +30,6 @@ Our query runs as expected when `osqueryi` is run as a normal user, but returns This same issue manifests on many tables that include a `uid` column: -- `atom_packages` - `authorized_keys` - `chrome_extension_content_scripts` - `chrome_extensions` diff --git a/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml b/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml index bb43ca47d..6e0995c34 100644 --- a/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml +++ b/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml @@ -61,7 +61,7 @@ spec: name: Get installed Linux software platform: linux description: Get all software installed on a Linux computer, including browser plugins and installed packages. Note that this does not include other running processes in the processes table. - query: SELECT name AS name, version AS version, 'Package (APT)' AS type, 'apt_sources' AS source FROM apt_sources UNION SELECT name AS name, version AS version, 'Package (deb)' AS type, 'deb_packages' AS source FROM deb_packages UNION SELECT package AS name, version AS version, 'Package (Portage)' AS type, 'portage_packages' AS source FROM portage_packages UNION SELECT name AS name, version AS version, 'Package (RPM)' AS type, 'rpm_packages' AS source FROM rpm_packages UNION SELECT name AS name, '' AS version, 'Package (YUM)' AS type, 'yum_sources' AS source FROM yum_sources UNION SELECT name AS name, version AS version, 'Package (NPM)' AS type, 'npm_packages' AS source FROM npm_packages UNION SELECT name AS name, version AS version, 'Package (Atom)' AS type, 'atom_packages' AS source FROM atom_packages UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages; + query: SELECT name AS name, version AS version, 'Package (APT)' AS type, 'apt_sources' AS source FROM apt_sources UNION SELECT name AS name, version AS version, 'Package (deb)' AS type, 'deb_packages' AS source FROM deb_packages UNION SELECT package AS name, version AS version, 'Package (Portage)' AS type, 'portage_packages' AS source FROM portage_packages UNION SELECT name AS name, version AS version, 'Package (RPM)' AS type, 'rpm_packages' AS source FROM rpm_packages UNION SELECT name AS name, '' AS version, 'Package (YUM)' AS type, 'yum_sources' AS source FROM yum_sources UNION SELECT name AS name, version AS version, 'Package (NPM)' AS type, 'npm_packages' AS source FROM npm_packages UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages; purpose: Informational tags: inventory, built-in contributors: zwass @@ -94,7 +94,7 @@ spec: name: Get installed Windows software platform: windows description: Get all software installed on a Windows computer, including programs, browser plugins, and installed packages. Note that this does not include other running processes in the processes table. - query: SELECT name AS name, version AS version, 'Program (Windows)' AS type, 'programs' AS source FROM programs UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages UNION SELECT name AS name, version AS version, 'Browser plugin (IE)' AS type, 'ie_extensions' AS source FROM ie_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Chrome)' AS type, 'chrome_extensions' AS source FROM chrome_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Firefox)' AS type, 'firefox_addons' AS source FROM firefox_addons UNION SELECT name AS name, version AS version, 'Package (Chocolatey)' AS type, 'chocolatey_packages' AS source FROM chocolatey_packages UNION SELECT name AS name, version AS version, 'Package (Atom)' AS type, 'atom_packages' AS source FROM atom_packages; + query: SELECT name AS name, version AS version, 'Program (Windows)' AS type, 'programs' AS source FROM programs UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages UNION SELECT name AS name, version AS version, 'Browser plugin (IE)' AS type, 'ie_extensions' AS source FROM ie_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Chrome)' AS type, 'chrome_extensions' AS source FROM chrome_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Firefox)' AS type, 'firefox_addons' AS source FROM firefox_addons UNION SELECT name AS name, version AS version, 'Package (Chocolatey)' AS type, 'chocolatey_packages' AS source FROM chocolatey_packages; purpose: Informational tags: inventory, built-in contributors: zwass diff --git a/docs/Using Fleet/Audit-logs.md b/docs/Using Fleet/Audit-logs.md index a27e15997..f530dedc7 100644 --- a/docs/Using Fleet/Audit-logs.md +++ b/docs/Using Fleet/Audit-logs.md @@ -610,7 +610,7 @@ This activity contains the following fields: } ``` -## `edited_windows_updates` +## edited_windows_updates Generated when the Windows OS updates deadline or grace period is modified. @@ -939,7 +939,7 @@ This activity contains the following fields: } ``` -### Type `created_windows_profile` +## created_windows_profile Generated when a user adds a new Windows profile to a team (or no team). @@ -958,7 +958,7 @@ This activity contains the following fields: } ``` -### Type `deleted_windows_profile` +## deleted_windows_profile Generated when a user deletes a Windows profile from a team (or no team). @@ -977,7 +977,7 @@ This activity contains the following fields: } ``` -### Type `edited_windows_profile` +## edited_windows_profile Generated when a user edits the Windows profiles of a team (or no team) via the fleetctl CLI. diff --git a/docs/Using Fleet/Understanding-host-vitals.md b/docs/Using Fleet/Understanding-host-vitals.md index 1e82f652e..f51fad9ff 100644 --- a/docs/Using Fleet/Understanding-host-vitals.md +++ b/docs/Using Fleet/Understanding-host-vitals.md @@ -544,17 +544,6 @@ SELECT path AS installed_path FROM cached_users CROSS JOIN firefox_addons USING (uid) UNION -SELECT - name AS name, - version AS version, - 'Package (Atom)' AS type, - 'atom_packages' AS source, - '' AS release, - '' AS vendor, - '' AS arch, - path AS installed_path -FROM cached_users CROSS JOIN atom_packages USING (uid) -UNION SELECT name AS name, version AS version, @@ -628,16 +617,6 @@ SELECT path AS installed_path FROM cached_users CROSS JOIN safari_extensions USING (uid) UNION -SELECT - name AS name, - version AS version, - 'Package (Atom)' AS type, - '' AS bundle_identifier, - 'atom_packages' AS source, - 0 AS last_opened_at, - path AS installed_path -FROM cached_users CROSS JOIN atom_packages USING (uid) -UNION SELECT name AS name, version AS version, @@ -713,15 +692,6 @@ SELECT '' AS vendor, path AS installed_path FROM chocolatey_packages -UNION -SELECT - name AS name, - version AS version, - 'Package (Atom)' AS type, - 'atom_packages' AS source, - '' AS vendor, - path AS installed_path -FROM cached_users CROSS JOIN atom_packages USING (uid); ``` ## system_info diff --git a/frontend/interfaces/software.ts b/frontend/interfaces/software.ts index 9230dfc1b..7b285004a 100644 --- a/frontend/interfaces/software.ts +++ b/frontend/interfaces/software.ts @@ -43,7 +43,7 @@ export const TYPE_CONVERSION: Record = { rpm_packages: "Package (RPM)", yum_sources: "Package (YUM)", npm_packages: "Package (NPM)", - atom_packages: "Package (Atom)", + atom_packages: "Package (Atom)", // Atom packages were removed from software inventory. Mapping is maintained for backwards compatibility. (2023-12-04) python_packages: "Package (Python)", apps: "Application (macOS)", chrome_extensions: "Browser plugin (Chrome)", diff --git a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx index 8e7e24483..b95f38b3f 100644 --- a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx +++ b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx @@ -75,7 +75,7 @@ const TYPE_CONVERSION: Record = { rpm_packages: "Package (RPM)", yum_sources: "Package (YUM)", npm_packages: "Package (NPM)", - atom_packages: "Package (Atom)", + atom_packages: "Package (Atom)", // Atom packages were removed from software inventory. Mapping is maintained for backwards compatibility. (2023-12-04) python_packages: "Package (Python)", apps: "Application (macOS)", chrome_extensions: "Browser plugin (Chrome)", diff --git a/schema/fleet_schema.json b/schema/fleet_schema.json index d4490ebe9..3930a691c 100644 --- a/schema/fleet_schema.json +++ b/schema/fleet_schema.json @@ -992,16 +992,6 @@ } ] }, - { - "name": "atom_packages", - "examples": "List installed Atom packages and their version.\n```\nSELECT name, version, description FROM atom_packages;\n```", - "columns": [ - { - "name": "uid", - "requires_user_context": true - } - ] - }, { "name": "chrome_extension_content_scripts", "columns": [ diff --git a/schema/tables/atom_packages.yml b/schema/tables/atom_packages.yml index 4d795cca9..4db7c9286 100644 --- a/schema/tables/atom_packages.yml +++ b/schema/tables/atom_packages.yml @@ -1,12 +1,13 @@ name: atom_packages -examples: >- - List installed Atom packages and their version. - - ``` - - SELECT name, version, description FROM atom_packages; - - ``` -columns: - - name: uid - requires_user_context: true +hidden: true +# examples: >- +# List installed Atom packages and their version. +# +# ``` +# +# SELECT name, version, description FROM atom_packages; +# +# ``` +# columns: +# - name: uid +# requires_user_context: true diff --git a/tools/osquery-testing/macOS.txt b/tools/osquery-testing/macOS.txt index 4969c39db..00e39cae9 100644 --- a/tools/osquery-testing/macOS.txt +++ b/tools/osquery-testing/macOS.txt @@ -10,7 +10,6 @@ app_schemes SELECT * FROM app_schemes apps SELECT * FROM apps arp_cache SELECT * FROM arp_cache asl SELECT * FROM asl -atom_packages SELECT * FROM atom_packages augeas SELECT * from augeas where path = '/etc/hosts' authorization_mechanisms SELECT * FROM authorization_mechanisms authorizations SELECT * FROM authorizations