From 90f5fbb63af7d47aedac5e376f4fb8bbba4b76f5 Mon Sep 17 00:00:00 2001
From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:24:13 -0400
Subject: [PATCH] Prepare for 4.22 (#8253)

---
 CHANGELOG.md                                  | 70 +++++++++++++++++++
 changes/7199-email-validation                 |  1 -
 changes/7517-token-rotation                   |  5 --
 ...88-add-new-missing_hosts-to-hosts-endpoint |  1 -
 changes/8031-security-headers                 |  1 -
 changes/8161-fix-kubequery-rows-check         |  1 -
 .../bug-6970-missing-host-count-user-count    |  1 -
 ...nstalled-software-appears-on-software-page |  1 -
 changes/bug-7823-http-status-400-json-decoder |  1 -
 ...912-keep-scanning-if-nvd-cannot-be-synched |  1 -
 .../bug-8095-agent-options-can-save-as-empty  |  1 -
 changes/bug-8197-tooltip-truncated-cells      |  1 -
 changes/bug-8209-host-default-100-per-page    |  1 -
 changes/bug-8215-mdm-enrollment-status        |  1 -
 changes/bug-direct-ingest-os-windows          |  2 -
 changes/bug-fix-dry-run-apply-app-config      |  1 -
 changes/bug-various-nvd-related               | 11 ---
 ...e-6946-fleet-desktop-uses-minimal-endpoint |  2 -
 changes/feature-7135-host-display-name        |  2 -
 changes/feature-7587-missing-30-days-count    |  1 -
 changes/fix-undetected-missing-migrations     |  1 -
 changes/handle-tcp-read-timeouts              |  1 -
 ...live-query-state-on-query-and-policy-pages |  1 -
 changes/issue-6072-policy-violation-days      |  3 -
 changes/issue-7062                            |  1 -
 changes/issue-7080-new-query-sidebar-docs     |  1 -
 changes/issue-7136-use-display-name-for-hosts |  1 -
 .../issue-7310-clarify-last-seen-last-fetched |  1 -
 ...ue-7377-agent-options-cli-flags-validation |  1 -
 changes/issue-7420-config-panics              |  1 -
 .../issue-7533-change-create-teams-suggestion |  1 -
 .../issue-7589-7593-dashboard-hosts-features  |  2 -
 ...issue-7656-software-link-host-details-page |  1 -
 changes/issue-7664-re-enrollment-cleanup      |  1 -
 changes/issue-7784-windows-release-id         |  2 -
 changes/issue-7796-status-now-query-param     |  1 -
 ...ranslate-appconfig-and-team-error-messages |  1 -
 .../issue-7878-keep-created-at-enroll-secrets |  1 -
 ...ssue-7879-add-inherited-policies-for-teams |  1 -
 ...issue-7906-add-file-carving-to-permissions |  1 -
 changes/issue-7989-delay-tooltip              |  1 -
 changes/issue-7992-login-dependency           |  1 -
 ...-8085-error-500-when-no-software-on-device |  1 -
 .../issue-8105-update-label-filter-chevron    |  1 -
 changes/issue-8114-select-all-checkbox-fix    |  1 -
 .../issue-8146-padding-between-enroll-secrets |  1 -
 changes/issue-8371-missing-host               |  2 -
 changes/team-features-bug                     |  1 -
 charts/fleet/Chart.yaml                       |  4 +-
 charts/fleet/values.yaml                      |  2 +-
 docs/Deploying/Server-Installation.md         |  2 +-
 .../dogfood/terraform/aws/variables.tf        |  2 +-
 .../dogfood/terraform/gcp/variables.tf        |  2 +-
 .../lambda/deploy_terraform/main.tf           |  2 +-
 tools/fleetctl-npm/package.json               |  2 +-
 55 files changed, 78 insertions(+), 77 deletions(-)
 delete mode 100644 changes/7199-email-validation
 delete mode 100644 changes/7517-token-rotation
 delete mode 100644 changes/7588-add-new-missing_hosts-to-hosts-endpoint
 delete mode 100644 changes/8031-security-headers
 delete mode 100644 changes/8161-fix-kubequery-rows-check
 delete mode 100644 changes/bug-6970-missing-host-count-user-count
 delete mode 100644 changes/bug-7804-uninstalled-software-appears-on-software-page
 delete mode 100644 changes/bug-7823-http-status-400-json-decoder
 delete mode 100644 changes/bug-7912-keep-scanning-if-nvd-cannot-be-synched
 delete mode 100644 changes/bug-8095-agent-options-can-save-as-empty
 delete mode 100644 changes/bug-8197-tooltip-truncated-cells
 delete mode 100644 changes/bug-8209-host-default-100-per-page
 delete mode 100644 changes/bug-8215-mdm-enrollment-status
 delete mode 100644 changes/bug-direct-ingest-os-windows
 delete mode 100644 changes/bug-fix-dry-run-apply-app-config
 delete mode 100644 changes/bug-various-nvd-related
 delete mode 100644 changes/feature-6946-fleet-desktop-uses-minimal-endpoint
 delete mode 100644 changes/feature-7135-host-display-name
 delete mode 100644 changes/feature-7587-missing-30-days-count
 delete mode 100644 changes/fix-undetected-missing-migrations
 delete mode 100644 changes/handle-tcp-read-timeouts
 delete mode 100644 changes/issue-5785-update-live-query-state-on-query-and-policy-pages
 delete mode 100644 changes/issue-6072-policy-violation-days
 delete mode 100644 changes/issue-7062
 delete mode 100644 changes/issue-7080-new-query-sidebar-docs
 delete mode 100644 changes/issue-7136-use-display-name-for-hosts
 delete mode 100644 changes/issue-7310-clarify-last-seen-last-fetched
 delete mode 100644 changes/issue-7377-agent-options-cli-flags-validation
 delete mode 100644 changes/issue-7420-config-panics
 delete mode 100644 changes/issue-7533-change-create-teams-suggestion
 delete mode 100644 changes/issue-7589-7593-dashboard-hosts-features
 delete mode 100644 changes/issue-7656-software-link-host-details-page
 delete mode 100644 changes/issue-7664-re-enrollment-cleanup
 delete mode 100644 changes/issue-7784-windows-release-id
 delete mode 100644 changes/issue-7796-status-now-query-param
 delete mode 100644 changes/issue-7835-translate-appconfig-and-team-error-messages
 delete mode 100644 changes/issue-7878-keep-created-at-enroll-secrets
 delete mode 100644 changes/issue-7879-add-inherited-policies-for-teams
 delete mode 100644 changes/issue-7906-add-file-carving-to-permissions
 delete mode 100644 changes/issue-7989-delay-tooltip
 delete mode 100644 changes/issue-7992-login-dependency
 delete mode 100644 changes/issue-8085-error-500-when-no-software-on-device
 delete mode 100644 changes/issue-8105-update-label-filter-chevron
 delete mode 100644 changes/issue-8114-select-all-checkbox-fix
 delete mode 100644 changes/issue-8146-padding-between-enroll-secrets
 delete mode 100644 changes/issue-8371-missing-host
 delete mode 100644 changes/team-features-bug

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b05ac7580..c1228b95d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,73 @@
+## Fleet 4.22.0 (Oct 20, 2022)
+
+* Added usage statistics for the weekly count of aggregate policy violation days. One policy violation day is counted for each policy that a host is failing, measured as of the time the count increments. The count increments once per 24-hour interval and resets each week.
+
+* Fleet Premium: Add ability to see how many and which hosts have low disk space (less than 32GB available) on the **Home** page.
+
+* Fleet Premium: Add ability to see how many and which hosts are missing (offline for at least 30 days) on the **Home** page.
+
+* Improved the query console by indicating which columns are required in the WHERE clause, indicated which columns are platform-specific, and adding example queries for almost all osquery tables in the right sidebar. These improvements are also live on [fleetdm.com/tables](https://fleetdm.com/tables)
+
+* Added a new display name for hosts in the Fleet UI. To determine the display name, Fleet uses the `computer_name` column in the [`system_info` table](https://fleetdm.com/tables/system_info). If `computer_name` isn't present, the `hostname` is used instead.
+
+* Added functionality to consider device tokens as expired after one hour. This change is not compatible with older versions of Fleet Desktop. We recommend to manually update Orbit and Fleet Desktop to > v1.0.0 in addition to upgrading the server if:
+  * You're managing your own TUF server.
+  * You have auto-updates disabled (`fleetctl package [...] --disable-updates`)
+  * You have channels pinned to an older version (`fleetctl package [...] --orbit-channel 1.0.0 --desktop-channel 1.1.0`).
+
+* Added security headers to HTML, CSV, and installer responses.
+
+* Added validation of the `command_line_flags` object in the Agent Options section of Organization Settings and Team Settings.
+
+* Added logic to clean up irrelevant policies for a host on re-enrollment (e.g., if a host changes its OS from linux to macOS or it changes teams).
+
+* Added the `inherited_policies` array to the `GET /teams/{team_id}/policies` endpoint that lists the global policies inherited by the team, along with the pass/fail counts for the hosts on that team.
+
+* Added a new UI state for when results are coming in from a live query or policy query.
+
+* Added better team name suggestions to the Create teams modal.
+
+* Clarified last seen time and last fetched time in the Fleet UI.
+
+* Translated technical error messages returned by Agent options validation to be more user-friendly.
+
+* Renamed machine serial to serial number and IPv4 properly to private IP address.
+
+* Fleet Premium: Updated Fleet Desktop to use the `/device/{token}/desktop` API route to display the number of failing policies.
+
+* Made host details software tables more responsive by adding links to software details.
+
+* Fixed a bug in which a user would not be rerouted to the Home page if already logged in.
+
+* Fixed a bug in which clicking the select all checkbox did not select all in some cases.
+
+* Fixed a bug introduced in 4.21.0 where a Windows-specific query was being sent to non-Windows hosts, causing an error in query ingestion for `directIngestOSWindows`.
+
+* Fixed a bug in which uninstalled software (DEB packages) appeared in Fleet.
+
+* Fixed a bug in which a team that didn't have `config.features` settings was edited via the UI, then both `features.enable_host_users` and `features.enable_software_inventory` would be false instead of the global default.
+
+* Fixed a bug that resulted in false negatives for vulnerable versions of Zoom, Google Chrome, Adobe Photoshop, Node.js, Visual Studio Code, Adobe Media Encoder, VirtualBox, Adobe Premiere Pro, Pip, and Firefox software.
+
+* Fixed bug that caused duplicated vulnerabilities to be sent to third-party integrations.
+
+* Fixed panic in `ingestKubequeryInfo` query ingestion.
+
+* Fixed a bug in which `host_count` and `user_count` returned as `0` in the `teams/{id}` endpoint.
+
+* Fixed a bug in which tooltips for Munki issue would be cut off at the edge of the browser window.
+
+* Fixed a bug in which tooltips for Munki issue would be cut off at the edge of the browser window.
+
+* Fixed a bug in which running `fleetctl apply` with the `--dry-run` flag would fail in some cases.
+
+* Fixed a bug in which **Hosts** table displayed 20 hosts per page.
+
+* Fixed a server panic that occured when a team was edited via YAML without an `agent_options` key.
+
+* Fixed an bug where Pop!\_OS hosts were not being included in the linux hosts count on the hosts dashboard page.
+
+
 ## Fleet 4.21.0 (Sep 28, 2022)
 
 * Fleet Premium: Added the ability to know how many hosts and which hosts, on a team, are failing a global policy.
diff --git a/changes/7199-email-validation b/changes/7199-email-validation
deleted file mode 100644
index 21e2d6dd2..000000000
--- a/changes/7199-email-validation
+++ /dev/null
@@ -1 +0,0 @@
-* Added server-side validation of user emails
diff --git a/changes/7517-token-rotation b/changes/7517-token-rotation
deleted file mode 100644
index be44eea0b..000000000
--- a/changes/7517-token-rotation
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added functionality to consider device tokens as expired after one hour.
-  This change is not compatible with older versions of Fleet Desktop, we recommend to manually update Orbit and Fleet Desktop to > v1.0.0 in addition to upgrading the server if:
-    - You're managing your own TUF server.
-    - Or have auto-updates disabled (`fleetctl package [...] --disable-updates`)
-    - Or have channels pinned to an older version (`fleetctl package [...] --orbit-channel 1.0.0 --desktop-channel 1.1.0`)
diff --git a/changes/7588-add-new-missing_hosts-to-hosts-endpoint b/changes/7588-add-new-missing_hosts-to-hosts-endpoint
deleted file mode 100644
index 778166145..000000000
--- a/changes/7588-add-new-missing_hosts-to-hosts-endpoint
+++ /dev/null
@@ -1 +0,0 @@
-* Add value `missing` to parameter `status` from endpoint `hosts`.
diff --git a/changes/8031-security-headers b/changes/8031-security-headers
deleted file mode 100644
index bb11473a7..000000000
--- a/changes/8031-security-headers
+++ /dev/null
@@ -1 +0,0 @@
-- Added security headers to HTML, CSV and installer responses.
diff --git a/changes/8161-fix-kubequery-rows-check b/changes/8161-fix-kubequery-rows-check
deleted file mode 100644
index a613f6bb9..000000000
--- a/changes/8161-fix-kubequery-rows-check
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed panic in `ingestKubequeryInfo` query ingestion.
diff --git a/changes/bug-6970-missing-host-count-user-count b/changes/bug-6970-missing-host-count-user-count
deleted file mode 100644
index 89d7458d1..000000000
--- a/changes/bug-6970-missing-host-count-user-count
+++ /dev/null
@@ -1 +0,0 @@
-* Fix host_count and user_count being always returned as `0` in `teams/{id}` endpoint.
diff --git a/changes/bug-7804-uninstalled-software-appears-on-software-page b/changes/bug-7804-uninstalled-software-appears-on-software-page
deleted file mode 100644
index 4d6b2ac87..000000000
--- a/changes/bug-7804-uninstalled-software-appears-on-software-page
+++ /dev/null
@@ -1 +0,0 @@
-* Only ingest DEB packages with the proper status.
\ No newline at end of file
diff --git a/changes/bug-7823-http-status-400-json-decoder b/changes/bug-7823-http-status-400-json-decoder
deleted file mode 100644
index bc08d5005..000000000
--- a/changes/bug-7823-http-status-400-json-decoder
+++ /dev/null
@@ -1 +0,0 @@
-* return http status 400 if json decoding fails.
diff --git a/changes/bug-7912-keep-scanning-if-nvd-cannot-be-synched b/changes/bug-7912-keep-scanning-if-nvd-cannot-be-synched
deleted file mode 100644
index 57723c6e1..000000000
--- a/changes/bug-7912-keep-scanning-if-nvd-cannot-be-synched
+++ /dev/null
@@ -1 +0,0 @@
-- When the NVD CVE feed cannot be synced, Fleet should use feeds from the last sync.
diff --git a/changes/bug-8095-agent-options-can-save-as-empty b/changes/bug-8095-agent-options-can-save-as-empty
deleted file mode 100644
index 2b4e77e03..000000000
--- a/changes/bug-8095-agent-options-can-save-as-empty
+++ /dev/null
@@ -1 +0,0 @@
-* UI allows for global or team agent options to be empty and save object properties to null
\ No newline at end of file
diff --git a/changes/bug-8197-tooltip-truncated-cells b/changes/bug-8197-tooltip-truncated-cells
deleted file mode 100644
index 68f5bf46c..000000000
--- a/changes/bug-8197-tooltip-truncated-cells
+++ /dev/null
@@ -1 +0,0 @@
-* Truncated cell default browser tooltip hidden and fleet tooltip responsive sized to fit on screen 
\ No newline at end of file
diff --git a/changes/bug-8209-host-default-100-per-page b/changes/bug-8209-host-default-100-per-page
deleted file mode 100644
index 1eff33c18..000000000
--- a/changes/bug-8209-host-default-100-per-page
+++ /dev/null
@@ -1 +0,0 @@
-* Fix host table to default to 100 hosts per page
\ No newline at end of file
diff --git a/changes/bug-8215-mdm-enrollment-status b/changes/bug-8215-mdm-enrollment-status
deleted file mode 100644
index 6b5dbb912..000000000
--- a/changes/bug-8215-mdm-enrollment-status
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed host filters by mdm enrollment status
diff --git a/changes/bug-direct-ingest-os-windows b/changes/bug-direct-ingest-os-windows
deleted file mode 100644
index 4bf4497a6..000000000
--- a/changes/bug-direct-ingest-os-windows
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixed bug introduced in 4.21.0 where Windows-specific query was being sent to non-Windows hosts
-  causing an error in query ingestion for `directIngestOSWindows`.
diff --git a/changes/bug-fix-dry-run-apply-app-config b/changes/bug-fix-dry-run-apply-app-config
deleted file mode 100644
index a3948b8b1..000000000
--- a/changes/bug-fix-dry-run-apply-app-config
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a bug when running `fleetctl apply` with the `--dry-run` flag, it could fail with an obscure "invalid JSON" error due to the way the internal caching was done.
diff --git a/changes/bug-various-nvd-related b/changes/bug-various-nvd-related
deleted file mode 100644
index 6cb42377e..000000000
--- a/changes/bug-various-nvd-related
+++ /dev/null
@@ -1,11 +0,0 @@
-- Changed the way we performed searches when mapping software to CPEs, by first sanitizing the vendor
-  and product name, and then searching for (in this order):
-
-* The vendor and product.
-* The product name only.
-* Free text search on the 'title' property.
-
-- When performing vulnerability detection using the NVD database, we now exclude software from the
-  'rpm' and 'deb' sources (we will be using OVAL for those).
-- Fixed bug that caused duplicated vulnerabilities to be sent to third party integrations.
-- Moved NVD vulnerability detection to its own directory.
diff --git a/changes/feature-6946-fleet-desktop-uses-minimal-endpoint b/changes/feature-6946-fleet-desktop-uses-minimal-endpoint
deleted file mode 100644
index 7ccf6438b..000000000
--- a/changes/feature-6946-fleet-desktop-uses-minimal-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-- Updated Fleet Desktop to use the new endpoint introduced in
-  https://github.com/fleetdm/fleet/issues/7084
diff --git a/changes/feature-7135-host-display-name b/changes/feature-7135-host-display-name
deleted file mode 100644
index 1c64ba612..000000000
--- a/changes/feature-7135-host-display-name
+++ /dev/null
@@ -1,2 +0,0 @@
-* Add display_name to hosts, which is either the computer-name or the hostname.
-* Add display_name to lists, searches, integrations and web-hooks.
\ No newline at end of file
diff --git a/changes/feature-7587-missing-30-days-count b/changes/feature-7587-missing-30-days-count
deleted file mode 100644
index db636926d..000000000
--- a/changes/feature-7587-missing-30-days-count
+++ /dev/null
@@ -1 +0,0 @@
-* Add `missing_30_days_count` to `host_summary` response.
\ No newline at end of file
diff --git a/changes/fix-undetected-missing-migrations b/changes/fix-undetected-missing-migrations
deleted file mode 100644
index 869f3262d..000000000
--- a/changes/fix-undetected-missing-migrations
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed undetected missing migrations in the cases where the are also unknown migrations.
diff --git a/changes/handle-tcp-read-timeouts b/changes/handle-tcp-read-timeouts
deleted file mode 100644
index 658523826..000000000
--- a/changes/handle-tcp-read-timeouts
+++ /dev/null
@@ -1 +0,0 @@
-* Return status code 408 at tcp read timeouts instead of 500
diff --git a/changes/issue-5785-update-live-query-state-on-query-and-policy-pages b/changes/issue-5785-update-live-query-state-on-query-and-policy-pages
deleted file mode 100644
index 362c4d0a5..000000000
--- a/changes/issue-5785-update-live-query-state-on-query-and-policy-pages
+++ /dev/null
@@ -1 +0,0 @@
-- add new UI state when results are coming in from a live query or policy query
diff --git a/changes/issue-6072-policy-violation-days b/changes/issue-6072-policy-violation-days
deleted file mode 100644
index fe920e050..000000000
--- a/changes/issue-6072-policy-violation-days
+++ /dev/null
@@ -1,3 +0,0 @@
-- Added usage statistics for the weekly count of aggregate policy violation days. One policy
-  violation day is counted for each policy that a host is failing, measured as of the time the
-  count increments. The count increments once per 24-hour interval and resets each week.
diff --git a/changes/issue-7062 b/changes/issue-7062
deleted file mode 100644
index 381b08faa..000000000
--- a/changes/issue-7062
+++ /dev/null
@@ -1 +0,0 @@
-* Rename machine serial to serial number and IPv4 properly to private IP address
\ No newline at end of file
diff --git a/changes/issue-7080-new-query-sidebar-docs b/changes/issue-7080-new-query-sidebar-docs
deleted file mode 100644
index 25cd59693..000000000
--- a/changes/issue-7080-new-query-sidebar-docs
+++ /dev/null
@@ -1 +0,0 @@
-- add new query sidebar with updated and improved docs
diff --git a/changes/issue-7136-use-display-name-for-hosts b/changes/issue-7136-use-display-name-for-hosts
deleted file mode 100644
index 992f11f7c..000000000
--- a/changes/issue-7136-use-display-name-for-hosts
+++ /dev/null
@@ -1 +0,0 @@
-* App UI uses new display_name key to reference hosts
\ No newline at end of file
diff --git a/changes/issue-7310-clarify-last-seen-last-fetched b/changes/issue-7310-clarify-last-seen-last-fetched
deleted file mode 100644
index df4223e80..000000000
--- a/changes/issue-7310-clarify-last-seen-last-fetched
+++ /dev/null
@@ -1 +0,0 @@
-* Clarify last seen time and last fetched time in Fleet UI
\ No newline at end of file
diff --git a/changes/issue-7377-agent-options-cli-flags-validation b/changes/issue-7377-agent-options-cli-flags-validation
deleted file mode 100644
index 1c860de55..000000000
--- a/changes/issue-7377-agent-options-cli-flags-validation
+++ /dev/null
@@ -1 +0,0 @@
-* Added validation of the `command_line_flags` object in the Agent Options section of Organization Settins and Team Settings.
diff --git a/changes/issue-7420-config-panics b/changes/issue-7420-config-panics
deleted file mode 100644
index 71205a1a4..000000000
--- a/changes/issue-7420-config-panics
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a server panic happening when a team was edited via yaml without an `agent_options` key.
diff --git a/changes/issue-7533-change-create-teams-suggestion b/changes/issue-7533-change-create-teams-suggestion
deleted file mode 100644
index 8df1b8078..000000000
--- a/changes/issue-7533-change-create-teams-suggestion
+++ /dev/null
@@ -1 +0,0 @@
-* Create teams modal has better team name suggestions
\ No newline at end of file
diff --git a/changes/issue-7589-7593-dashboard-hosts-features b/changes/issue-7589-7593-dashboard-hosts-features
deleted file mode 100644
index e3f849f9e..000000000
--- a/changes/issue-7589-7593-dashboard-hosts-features
+++ /dev/null
@@ -1,2 +0,0 @@
-* Premium users can see missing hosts and low disk space hosts on the homepage
-* Premium users can filter hosts by missing hosts and low disk space hosts on the manage host page
\ No newline at end of file
diff --git a/changes/issue-7656-software-link-host-details-page b/changes/issue-7656-software-link-host-details-page
deleted file mode 100644
index 831c10f1a..000000000
--- a/changes/issue-7656-software-link-host-details-page
+++ /dev/null
@@ -1 +0,0 @@
-* Host details software table links to software details, better responsive UI for software table
\ No newline at end of file
diff --git a/changes/issue-7664-re-enrollment-cleanup b/changes/issue-7664-re-enrollment-cleanup
deleted file mode 100644
index 084aa84a0..000000000
--- a/changes/issue-7664-re-enrollment-cleanup
+++ /dev/null
@@ -1 +0,0 @@
-* Added logic to clean up irrelevant policies for a host on re-enrollment, for example: if a host changes its OS from linux to macOS or it changes teams.
diff --git a/changes/issue-7784-windows-release-id b/changes/issue-7784-windows-release-id
deleted file mode 100644
index 7cd8eca08..000000000
--- a/changes/issue-7784-windows-release-id
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added ingestion of `ReleaseId` from Windows registry (which will be used to populate `host.os_version`
-  in the case that `DisplayVersion` is empty)
diff --git a/changes/issue-7796-status-now-query-param b/changes/issue-7796-status-now-query-param
deleted file mode 100644
index feb72b201..000000000
--- a/changes/issue-7796-status-now-query-param
+++ /dev/null
@@ -1 +0,0 @@
-* Manage host page filters status as a query param instead of a route param
\ No newline at end of file
diff --git a/changes/issue-7835-translate-appconfig-and-team-error-messages b/changes/issue-7835-translate-appconfig-and-team-error-messages
deleted file mode 100644
index e7de220a8..000000000
--- a/changes/issue-7835-translate-appconfig-and-team-error-messages
+++ /dev/null
@@ -1 +0,0 @@
-* Translated technical error messages returned by Organization's and Team's validations to be more user-friendly.
diff --git a/changes/issue-7878-keep-created-at-enroll-secrets b/changes/issue-7878-keep-created-at-enroll-secrets
deleted file mode 100644
index d8034c835..000000000
--- a/changes/issue-7878-keep-created-at-enroll-secrets
+++ /dev/null
@@ -1 +0,0 @@
-* Changed saving of enroll secrets so that the `created_at` timestamp of existing ones are maintained.
diff --git a/changes/issue-7879-add-inherited-policies-for-teams b/changes/issue-7879-add-inherited-policies-for-teams
deleted file mode 100644
index 93bfe4227..000000000
--- a/changes/issue-7879-add-inherited-policies-for-teams
+++ /dev/null
@@ -1 +0,0 @@
-* Added the `inherited_policies` array to the `GET /teams/{team_id}/policies` endpoint that lists the global policies inherited by the team, along with the pass/fail counts only for hosts that belong to that team.
diff --git a/changes/issue-7906-add-file-carving-to-permissions b/changes/issue-7906-add-file-carving-to-permissions
deleted file mode 100644
index 15c9510ae..000000000
--- a/changes/issue-7906-add-file-carving-to-permissions
+++ /dev/null
@@ -1 +0,0 @@
-* Permissions documentation includes initiating and retreiving file carving 
\ No newline at end of file
diff --git a/changes/issue-7989-delay-tooltip b/changes/issue-7989-delay-tooltip
deleted file mode 100644
index a13299a44..000000000
--- a/changes/issue-7989-delay-tooltip
+++ /dev/null
@@ -1 +0,0 @@
-* Add delay to compatibility tooltip that is covering UI action checkbox
diff --git a/changes/issue-7992-login-dependency b/changes/issue-7992-login-dependency
deleted file mode 100644
index 154d5d1db..000000000
--- a/changes/issue-7992-login-dependency
+++ /dev/null
@@ -1 +0,0 @@
-* Login route reroutes to dashboard if already logged in
\ No newline at end of file
diff --git a/changes/issue-8085-error-500-when-no-software-on-device b/changes/issue-8085-error-500-when-no-software-on-device
deleted file mode 100644
index dd34e46b5..000000000
--- a/changes/issue-8085-error-500-when-no-software-on-device
+++ /dev/null
@@ -1 +0,0 @@
-- fixes 500 error issue on details/:token page when host has software.
diff --git a/changes/issue-8105-update-label-filter-chevron b/changes/issue-8105-update-label-filter-chevron
deleted file mode 100644
index 9fc347914..000000000
--- a/changes/issue-8105-update-label-filter-chevron
+++ /dev/null
@@ -1 +0,0 @@
-- updates label filter chevron icon to match the icon on the status filter dropdown
diff --git a/changes/issue-8114-select-all-checkbox-fix b/changes/issue-8114-select-all-checkbox-fix
deleted file mode 100644
index 421f88ff9..000000000
--- a/changes/issue-8114-select-all-checkbox-fix
+++ /dev/null
@@ -1 +0,0 @@
-* Clicking the select all checkbox will select all, unless all are selected it will deselect all
\ No newline at end of file
diff --git a/changes/issue-8146-padding-between-enroll-secrets b/changes/issue-8146-padding-between-enroll-secrets
deleted file mode 100644
index c8cc6836e..000000000
--- a/changes/issue-8146-padding-between-enroll-secrets
+++ /dev/null
@@ -1 +0,0 @@
-* Padding between multiple enroll secrets
\ No newline at end of file
diff --git a/changes/issue-8371-missing-host b/changes/issue-8371-missing-host
deleted file mode 100644
index 7484cb09c..000000000
--- a/changes/issue-8371-missing-host
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fixed an issue where a host was enrolled with orbit, but was being omitted when listing hosts and ordering by display name
-* Fixed an issue where popos hosts were not being includes in the linux hosts count on the hosts dashboard page.
diff --git a/changes/team-features-bug b/changes/team-features-bug
deleted file mode 100644
index dd84a90ae..000000000
--- a/changes/team-features-bug
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a bug where if a team didn't have a `config.features` settings and was edited via the UI, the both `features.enable_host_users` and `features.enable_software_inventory` would be `false` instad of the global default.
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 10e549253..b8dcf7f74 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,9 +4,9 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: v4.21.0
+version: v4.22.0
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.21.0
+appVersion: v4.22.0
 
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 60caf6275..bf11a5fae 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -2,7 +2,7 @@
 # All settings related to how Fleet is deployed in Kubernetes
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
-imageTag: v4.21.0 # Version of Fleet to deploy
+imageTag: v4.22.0 # Version of Fleet to deploy
 createIngress: true # Whether or not to automatically create an Ingress
 ingressAnnotations: {} # Additional annotation to add to the Ingress
 podAnnotations: {} # Additional annotations to add to the Fleet pod
diff --git a/docs/Deploying/Server-Installation.md b/docs/Deploying/Server-Installation.md
index fb07ffd0f..e59f1e2d9 100644
--- a/docs/Deploying/Server-Installation.md
+++ b/docs/Deploying/Server-Installation.md
@@ -264,7 +264,7 @@ spec:
     spec:
       containers:
       - name: fleet
-        image: fleetdm/fleet:4.21.0
+        image: fleetdm/fleet:4.22.0
         env:
           # if running Fleet behind external ingress controller that terminates TLS
           - name: FLEET_SERVER_TLS
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
index 63f82fb64..0cc088d78 100644
--- a/infrastructure/dogfood/terraform/aws/variables.tf
+++ b/infrastructure/dogfood/terraform/aws/variables.tf
@@ -56,7 +56,7 @@ variable "database_name" {
 
 variable "fleet_image" {
   description = "the name of the container image to run"
-  default     = "fleetdm/fleet:v4.21.0"
+  default     = "fleetdm/fleet:v4.22.0"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index 3f1a9d6e8..3c40f16ca 100644
--- a/infrastructure/dogfood/terraform/gcp/variables.tf
+++ b/infrastructure/dogfood/terraform/gcp/variables.tf
@@ -68,5 +68,5 @@ variable "redis_mem" {
 }
 
 variable "image" {
-  default = "fleet:v4.21.0"
+  default = "fleet:v4.22.0"
 }
diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
index cc2f456e1..a5a8d79aa 100644
--- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
+++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
@@ -157,7 +157,7 @@ resource "helm_release" "main" {
 
   set {
     name  = "imageTag"
-    value = "v4.21.0"
+    value = "v4.22.0"
   }
 
   set {
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index d26d546d2..f852ad933 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.21.0",
+  "version": "v4.22.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"