Skip to content

feat(server): Enable Wazuh in all servers (backport #7454) - #7457

Merged
ssiyad merged 3 commits into
masterfrom
mergify/bp/master/pr-7454
Sep 11, 2026
Merged

ssiyad merged 3 commits into
masterfrom
mergify/bp/master/pr-7454

Conversation

@mergify

@mergify mergify Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #7454 done by [Mergify](https://mergify.com).

(cherry picked from commit ba99ae3)

# Conflicts:
#	press/hooks.py
@mergify

mergify Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of ba99ae3 has failed:

On branch mergify/bp/master/pr-7454
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit ba99ae3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   press/playbooks/roles/wazuh_agent_install/tasks/main.yml
	modified:   press/playbooks/roles/wazuh_agent_uninstall/tasks/main.yml
	modified:   press/press/doctype/analytics_server/analytics_server.js
	modified:   press/press/doctype/analytics_server/analytics_server.json
	modified:   press/press/doctype/analytics_server/analytics_server.py
	modified:   press/press/doctype/log_server/log_server.js
	modified:   press/press/doctype/log_server/log_server.json
	modified:   press/press/doctype/log_server/log_server.py
	modified:   press/press/doctype/monitor_server/monitor_server.js
	modified:   press/press/doctype/monitor_server/monitor_server.json
	modified:   press/press/doctype/monitor_server/monitor_server.py
	modified:   press/press/doctype/nat_server/nat_server.js
	modified:   press/press/doctype/nat_server/nat_server.json
	modified:   press/press/doctype/nat_server/nat_server.py
	modified:   press/press/doctype/nfs_server/nfs_server.js
	modified:   press/press/doctype/nfs_server/nfs_server.json
	modified:   press/press/doctype/nfs_server/nfs_server.py
	modified:   press/press/doctype/press_settings/press_settings.json
	modified:   press/press/doctype/press_settings/press_settings.py
	modified:   press/press/doctype/registry_server/registry_server.js
	modified:   press/press/doctype/registry_server/registry_server.json
	modified:   press/press/doctype/registry_server/registry_server.py
	modified:   press/press/doctype/server/server.py
	modified:   press/press/doctype/server/test_server.py
	modified:   press/press/doctype/trace_server/trace_server.js
	modified:   press/press/doctype/trace_server/trace_server.json
	modified:   press/press/doctype/trace_server/trace_server.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   press/hooks.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ssiyad

ssiyad commented Sep 11, 2026

Copy link
Copy Markdown
Member

@copilot fix conflicts

Co-authored-by: ssiyad <28098330+ssiyad@users.noreply.github.com>

Copilot AI commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

@copilot fix conflicts

Fixed in 63d517a. I resolved the merge conflict markers in press/hooks.py, kept install_missing_wazuh_agents, and removed the duplicate sync_wazuh_agent_status entry.

Copilot AI requested a review from ssiyad September 11, 2026 11:18
@mergify

mergify Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@codecov-commenter

codecov-commenter commented Sep 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 56.49%. Comparing base (b6eb2bc) to head (63d517a).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7457      +/-   ##
==========================================
- Coverage   61.41%   56.49%   -4.93%     
==========================================
  Files        1049     1049              
  Lines      101072   101144      +72     
  Branches     1777     1627     -150     
==========================================
- Hits        62074    57137    -4937     
- Misses      38952    43964    +5012     
+ Partials       46       43       -3     
Flag Coverage Δ
dashboard 67.74% <ø> (-18.17%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ssiyad
ssiyad merged commit 089b709 into master Sep 11, 2026
13 checks passed
@ssiyad
ssiyad deleted the mergify/bp/master/pr-7454 branch September 11, 2026 13:39
@frappe-pr-bot

Copy link
Copy Markdown
Collaborator

🎉 This PR is included in version 0.128.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants