Skip to content

ENT-14312: Removed noisy reports from command-dispatcher #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickanderson merged 2 commits into from
Jul 16, 2026
+6 −7
Merged

ENT-14312: Removed noisy reports from command-dispatcher #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef29370
Removed noisy reports from command-dispatcher
Jul 16, 2026
9e4c1b2
Reformatted policy files for CI
Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions management/command-dispatcher/main.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ bundle agent main
"5"
);

reports:
enabled::
"Command [$(i)]: $(_command[$(i)]), condition: $(_condition[$(i)]), ifelapsed: $(_ifelapsed[$(i)])";

!enabled::
"Command-dispatcher: commands_to_run variable not found";

commands:
enabled::
"$(_command[$(i)])"
Expand Down
4 changes: 4 additions & 0 deletions management/manage-fwupd/main.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,15 @@ bundle agent main
"fwupd-refresh.timer"
service_policy => "enabled",
comment => "Ensure the fwupd metadata refresh timer is enabled so the LVFS firmware catalog stays current";

# --- Stale marker cleanup ----------------------------------------
files:
linux::
"$(_update_marker)"
delete => default:tidy,
if => not("_update_applied"),
comment => "Remove stale marker from a previous boot cycle";

# --- Apply firmware updates --------------------------------------
commands:
linux.default:have_fwupdmgr.manage_fwupd:apply_updates::
Expand All @@ -151,6 +153,7 @@ bundle agent main
if => and("_device_allowed_$(_dev_idx)", not("_update_applied")),
classes => default:results("bundle", "manage_fwupd_update_$(_dev_idx)"),
comment => "Apply firmware update to allowed device $(_dev_name[$(_dev_idx)])";

# --- Post-update marker and reboot --------------------------------
files:
linux.default:have_fwupdmgr.manage_fwupd:apply_updates::
Expand Down Expand Up @@ -184,6 +187,7 @@ bundle agent main
},
handle => "manage_fwupd_reboot_after_update_fallback",
comment => "Fallback reboot for non-systemd systems (shutdown -r +1)";

# --- Inventory --------------------------------------------------
vars:
linux.default:have_fwupdmgr::
Expand Down
2 changes: 2 additions & 0 deletions management/package-method-winget/package-method-winget.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ body package_method winget
package_name_convention => "$(name)";
package_delete_convention => "$(name)";
package_installed_regex => ".*";

# Note that package_list_name_regex does not allow for commas inside of package names as parsing that from ConvertTo-Csv below would be too complex
# an example of output of the package_list_command below is
#
Expand All @@ -14,6 +15,7 @@ body package_method winget
# so the matches below simply grab the thing before or after the comma separating Id and InstalledVersion fields.
package_list_name_regex => '^"([^"]*)",.*';
package_list_version_regex => '.*,"([^"]*)".*';

# Here we use the Get-WinGetPackage Cmdlet because it is easier to produce easily parsed information that way
package_list_command => "$(sys.winsysdir)\\WindowsPowerShell\\v1.0\\powershell.exe -Command \"Get-WinGetPackage | Select Id,InstalledVersion | ConvertTo-Csv ";
package_delete_command => "$(sys.winsysdir)\\WindowsPowerShell\\v1.0\\powershell.exe -Command \"Uninstall-WinGetPackage ";
Expand Down
Loading