Skip to content
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

Repo management in dashboard class #529

Merged
merged 2 commits into from
Aug 9, 2022

Conversation

poloz-lab
Copy link
Contributor

@poloz-lab poloz-lab commented Jul 27, 2022

When the Wazuh dashboard is not installed on the same machine as the Wazuh manager or indexer, the Wazuh repository is not configured.

This PR adds a parameter in Wazuh dashboard class to manage the repos as in the Wazuh indexer class.

This PR also fixes the dependencies between the resources in the Wazuh dashboard class to make it possible.

Resolves #528

Tested on a Debian 10 machine.

@le-ya
Copy link

le-ya commented Jul 27, 2022

LGTM

@poloz-lab poloz-lab force-pushed the feature-528-repo-management-dashboard branch from 531dd1a to 6974b97 Compare July 27, 2022 14:51
@poloz-lab poloz-lab changed the base branch from master to 4.3 July 27, 2022 14:53
@vcerenu vcerenu self-assigned this Jul 27, 2022
Copy link
Member

@vcerenu vcerenu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @poloz-lab

Thanks for your patience and contribution. We are working hard to review all the requests as soon as possible. Currently, we are reviewing this PR.

The development of this PR is greatly appreciated, we will be merging it and it will be available in the next Wazuh release.

Thank you very much and if you have any questions or ideas, do not hesitate to contact us.

@poloz-lab
Copy link
Contributor Author

Hi @vcerenu ,

Thanks for your approval and for your time reviewing.

Have a nice day !

@poloz-lab poloz-lab marked this pull request as draft August 2, 2022 15:26
files_lines resources need the configuration file from the package.
@poloz-lab poloz-lab force-pushed the feature-528-repo-management-dashboard branch from 6974b97 to c1f059e Compare August 3, 2022 07:20
@poloz-lab poloz-lab marked this pull request as ready for review August 3, 2022 07:21
@poloz-lab
Copy link
Contributor Author

Hi @vcerenu ,

Sorry for this late fix.

I changed the require for an include as you can see in the compare.

I did this to avoid a dependency to the wazuh::repo class for the whole wazuh::dashboard class. The sufficient dependency is declared on line 34 or 36.

This doesn't change the behaviour under normal operation.

@cruelsmith
Copy link
Contributor

LGTM

@okynos okynos merged commit 7e0cec0 into wazuh:4.3 Aug 9, 2022
@poloz-lab poloz-lab deleted the feature-528-repo-management-dashboard branch August 9, 2022 07:30
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.

Wazuh repo management missing in Wazuh dashboard
5 participants