Merge branch 'main' into 25210-falcon

.github/workflows/build-fleetd_tables.yaml

@@ -34,7 +34,7 @@ jobs:
       - name: Build binaries
         run: make fleetd-tables-all
 
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
+      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: fleetd_tables
           path: fleetd_tables_*

.github/workflows/build-orbit.yaml

@@ -73,7 +73,7 @@ jobs:
           ORBIT_COMMIT: ${{ github.sha }}
 
       - name: Upload orbit
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: orbit
           path: |

.github/workflows/dogfood-gitops.yml

@@ -77,6 +77,7 @@ jobs:
           DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET }}
           FLEET_SECRET_MANAGED_CHROME_ENROLLMENT_TOKEN: ${{ secrets.CLOUD_MANAGEMENT_ENROLLMENT_TOKEN }}
           DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET }}
+          DOGFOOD_ACTIVITIES_WEBHOOK_URL: ${{ secrets.DOGFOOD_ACTIVITIES_WEBHOOK_URL }}
 
       - name: Notify on Gitops failure
         if: failure() && github.ref_name == 'main'

changes/22919-semver-util

@@ -0,0 +1 @@
+* Added util wrapper func around semver package to allow for custom preprocessing. Upgraded semver library to 3.3.1 and usage everywhere to version 3.  

changes/25251-url-fleet-app-response

@@ -0,0 +1 @@
+* Added download url for fleet maintained apps as `url` property on `fleet/software/fleet_maintained_apps/:id`

changes/25318-update-sso-settings-error-states

@@ -0,0 +1 @@
+* Add clearer error states to metadata-related fields in the SSO settings form

changes/25609-archive-encryption-keys

@@ -0,0 +1 @@
+Disk encryption keys are now archived when they are created or updated. They are never fully deleted from the database.

changes/issue-24992-padding-fixes-around-lists

@@ -0,0 +1 @@
+- normalise padding spacing for list headers, lists, and help text across various modals.

docs/Configuration/yaml-files.md

@@ -349,6 +349,7 @@ Use `labels_include_any` to target hosts that have any label in the array or `la
 - `pre_install_query.path` is the osquery query Fleet runs before installing the software. Software will be installed only if the [query returns results](https://fleetdm.com/tables) (default: `""`).
 - `install_script.path` specifies the command Fleet will run on hosts to install software. The [default script](https://github.com/fleetdm/fleet/tree/main/pkg/file/scripts) is dependent on the software type (i.e. .pkg).
 - `uninstall_script.path` is the script Fleet will run on hosts to uninstall software. The [default script](https://github.com/fleetdm/fleet/tree/main/pkg/file/scripts) is dependent on the software type (i.e. .pkg).
+- `post_install_script.path` is the script Fleet will run on hosts after the software install. There is no default.
 - `self_service` specifies whether or not end users can install from **Fleet Desktop > Self-service**.
 
 #### Example
@@ -361,6 +362,8 @@ install_script:
   path: ../lib/software/tailscale-install-script.ps1
 uninstall_script:
   path: ../lib/software/tailscale-uninstall-script.ps1
+post_install_script:
+  path: ../lib/software/tailscale-config-script.ps1
 self_service: true
 ```
 
@@ -424,7 +427,7 @@ org_settings:
 
 ### org_info
 
-- `name` is the name of your organization (default: `""`)
+- `org_name` is the name of your organization (default: `""`)
 - `logo_url` is a public URL of the logo for your organization (default: Fleet logo).
 - `org_logo_url_light_background` is a public URL of the logo for your organization that can be used with light backgrounds (default: Fleet logo).
 - `contact_url` is a URL that appears in error messages presented to end users (default: `"https://fleetdm.com/company/contact"`)

docs/REST API/rest-api.md

@@ -9553,7 +9553,6 @@ Returns information about the specified Fleet-maintained app.
   "fleet_maintained_app": {
     "id": 1,
     "name": "1Password",
-    "filename": "1Password-8.10.44-aarch64.zip",
     "version": "8.10.40",
     "platform": "darwin",
     "install_script": "#!/bin/sh\ninstaller -pkg \"$INSTALLER_PATH\" -target /",
@@ -9702,7 +9701,7 @@ _Available in Fleet Premium._
 
 Get the results of a software package install.
 
-To get the results of an App Store app install, use the [List MDM commands](#list-mdm-commands) and [Get MDM command results](#get-mdm-command-results) API enpoints. Fleet uses an MDM command to install App Store apps.
+To get the results of an App Store app install, use the [List MDM commands](#list-mdm-commands) and [Get MDM command results](#get-mdm-command-results) API endpoints. Fleet uses an MDM command to install App Store apps.
 
 | Name            | Type    | In   | Description                                      |
 | ----            | ------- | ---- | --------------------------------------------     |