-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
Fix framework processes cleanup #23222
Conversation
1734003
to
db5d1a3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modified the name to be consistent with the rest of the files and to avoid doing ugly things in clean_pid_files()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good Job!
Two things to note:
- Can you check if the failure of the AIT is related to these changes?
- With the rename of
wazuh_apid.py
, would it be necessary to make changes to wazuh-jenkins?
The failures are related to #23195.
Good catch, I opened https://github.com/wazuh/wazuh-jenkins/pull/6472 to add it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes look good. However, modifying the name of one of the processes usually has many implications, more than it may seem at first. For example, these checks are failing because wazuh-apid.py was not found:
- https://github.com/wazuh/wazuh/pull/23222/checks?check_run_id=24526001286
- https://github.com/wazuh/wazuh/pull/23222/checks?check_run_id=24525757757
Processing files: wazuh-manager-4.9.0-0.commit50e245f.x86_64
error: File not found: /build_wazuh/rpmbuild/BUILDROOT/wazuh-manager-4.9.0-0.commit50e245f.x86_64/var/ossec/api/scripts/wazuh-apid.py
RPM build errors:
File not found: /build_wazuh/rpmbuild/BUILDROOT/wazuh-manager-4.9.0-0.commit50e245f.x86_64/var/ossec/api/scripts/wazuh-apid.py
Probably, in addition to the changes in qa-integration-framework, you should also update some tools that still exist in wazuh-qa such as metrics collection. At least, it was done when wazuh-clusterd was renamed:
We should go through all the other repositories and also notify the cloud team in case they have healthchecks looking for the old process name.
All of this could go beyond the initial scope of the issue. Consider opening a new issue for it.
50e245f
to
18cb803
Compare
Description
Checks that a process belongs to the Wazuh daemon before killing it on the script start.
Logs/Alerts example
Terminating processes that belong to the daemon
API
Cluster
Creating file with the pid of a process from other service (wazuh-modulesd) and restarting the daemon.
Running processes
API
Cluster
Note
Cluster AIT is failing because of #23195, the fix was merged in 4.8.0 but didn't reach 4.9.0 yet.