From 6002324139ae5159fd34330f0f4bc30171489cae Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Mon, 1 Aug 2022 10:50:40 -0700 Subject: [PATCH] Bring 4.17.1 changelog into main (#6901) --- CHANGELOG.md | 15 ++++++++++++++- changes/bug-6594-convert-sso-no-password | 1 - changes/bug-6595-edit-user-modal | 1 - changes/bug-6658-export-live-query-results | 1 - changes/bug-6700-live-query-results | 1 - changes/bug-6777-update-version-regexp | 2 -- changes/issue-6763-battery-health | 3 --- charts/fleet/Chart.yaml | 4 ++-- charts/fleet/values.yaml | 2 +- docs/Deploying/Server-Installation.md | 2 +- infrastructure/dogfood/terraform/aws/variables.tf | 2 +- infrastructure/dogfood/terraform/gcp/variables.tf | 2 +- tools/fleetctl-npm/package.json | 4 ++-- 13 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 changes/bug-6594-convert-sso-no-password delete mode 100644 changes/bug-6595-edit-user-modal delete mode 100644 changes/bug-6658-export-live-query-results delete mode 100644 changes/bug-6700-live-query-results delete mode 100644 changes/bug-6777-update-version-regexp delete mode 100644 changes/issue-6763-battery-health diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc5735f9d..65f98c9293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ +## Fleet 4.17.1 (Jul 22, 2022) -## Fleet 4.17.0 (July 8, 2022) +* Fixed a bug causing an error when converting users to SSO login. + +* Fixed a bug causing the **Edit User** modal to hang when editing multiple users. + +* Fixed a bug that caused Ubuntu hosts to display an inaccurate OS version. + +* Fixed a bug affecting exporting live query results. + +* Fixed a bug in the Fleet UI affecting live query result counts. + +* Improved **Battery Health** processing to better reflect the health of batteries for M1 Macs. + +## Fleet 4.17.0 (Jul 8, 2022) * Fleet Premium and Fleet Free: Fleet desktop is officially out of beta. This application shows users exactly what's going on with their device and gives them the tools they need to make sure it is secure and aligned with policies. They just need to click an icon in their menu bar. diff --git a/changes/bug-6594-convert-sso-no-password b/changes/bug-6594-convert-sso-no-password deleted file mode 100644 index 948ce92073..0000000000 --- a/changes/bug-6594-convert-sso-no-password +++ /dev/null @@ -1 +0,0 @@ -* Fix edit user modal converting a user to sso will provide a new password of null \ No newline at end of file diff --git a/changes/bug-6595-edit-user-modal b/changes/bug-6595-edit-user-modal deleted file mode 100644 index 07954515a0..0000000000 --- a/changes/bug-6595-edit-user-modal +++ /dev/null @@ -1 +0,0 @@ -* Fix edit user modal hanging after editing one user \ No newline at end of file diff --git a/changes/bug-6658-export-live-query-results b/changes/bug-6658-export-live-query-results deleted file mode 100644 index 55ce5cc7fc..0000000000 --- a/changes/bug-6658-export-live-query-results +++ /dev/null @@ -1 +0,0 @@ -* Fix exporting live query results \ No newline at end of file diff --git a/changes/bug-6700-live-query-results b/changes/bug-6700-live-query-results deleted file mode 100644 index e1b457ad21..0000000000 --- a/changes/bug-6700-live-query-results +++ /dev/null @@ -1 +0,0 @@ -* Live query correctly counts results not hosts \ No newline at end of file diff --git a/changes/bug-6777-update-version-regexp b/changes/bug-6777-update-version-regexp deleted file mode 100644 index 22c54239b0..0000000000 --- a/changes/bug-6777-update-version-regexp +++ /dev/null @@ -1,2 +0,0 @@ -- Updated the regexp we use for detecting the major/minor version on OS platforms to account for any - string after the version part. diff --git a/changes/issue-6763-battery-health b/changes/issue-6763-battery-health deleted file mode 100644 index 5ae6b5c386..0000000000 --- a/changes/issue-6763-battery-health +++ /dev/null @@ -1,3 +0,0 @@ -- Modified `GET /host/:id` endpoint to calculate battery health based on the cycle count reported by - osquery such that “Normal” corresponds to cycle count < 1000 and “Replacement recommended” - corresponds to cycle count >= 1000. diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml index ff9220ce7a..b13cb3cb1a 100644 --- a/charts/fleet/Chart.yaml +++ b/charts/fleet/Chart.yaml @@ -4,8 +4,8 @@ name: fleet keywords: - fleet - osquery -version: v4.17.0 +version: v4.17.1 home: https://github.com/fleetdm/fleet sources: - https://github.com/fleetdm/fleet.git -appVersion: v4.17.0 +appVersion: v4.17.1 diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml index 98b198a87d..135614b2e2 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.17.0 # Version of Fleet to deploy +imageTag: v4.17.1 # 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 e70bc16b16..19697a539a 100644 --- a/docs/Deploying/Server-Installation.md +++ b/docs/Deploying/Server-Installation.md @@ -445,7 +445,7 @@ spec: spec: containers: - name: fleet - image: fleetdm/fleet:4.17.0 + image: fleetdm/fleet:4.17.1 env: - name: FLEET_MYSQL_ADDRESS valueFrom: diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf index ff3d77a461..d18a3b9d00 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.17.0" + default = "fleetdm/fleet:v4.17.1" } variable "software_inventory" { diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf index a26cb09bd6..7715276f9f 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.17.0" + default = "fleet:v4.17.1" } diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json index 819b47cb71..7178678da4 100644 --- a/tools/fleetctl-npm/package.json +++ b/tools/fleetctl-npm/package.json @@ -1,6 +1,6 @@ { "name": "fleetctl", - "version": "v4.17.0", + "version": "v4.17.1", "description": "Installer for the fleetctl CLI tool", "bin": { "fleetctl": "./run.js" @@ -24,4 +24,4 @@ "osquery", "security" ] -} \ No newline at end of file +}