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

Adapt wazuhapp and Wazuh dashboard to install the Wazuh CheckUpdates and Core plugins #2609

Merged
merged 8 commits into from
Nov 22, 2023

Conversation

rauldpm
Copy link
Member

@rauldpm rauldpm commented Nov 16, 2023

Related issue
closes #2589

Description

This pull request adapts the APP and Wazuh dashboard packages creation according to the new Wazuh plugins

Logs example

See #2589 (comment)

Tests

  • Build the package in any supported platform
    • Linux
  • Package installation
  • Package upgrade
  • Package remove
  • Tests for Linux RPM
    • Build the package for x86_64
  • Tests for Linux deb
    • Build the package for x86_64

@rauldpm rauldpm self-assigned this Nov 16, 2023
@rauldpm rauldpm marked this pull request as draft November 16, 2023 16:19
@rauldpm rauldpm linked an issue Nov 16, 2023 that may be closed by this pull request
5 tasks
@rauldpm rauldpm marked this pull request as ready for review November 21, 2023 15:17
Copy link
Member

@jnasselle jnasselle left a comment

Choose a reason for hiding this comment

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

LGTM!

echo -e " $(basename "$0") - Build Wazuh dashboard base file."
echo -e ""
echo -e "SYNOPSIS"
echo -e " $(basename "$0") -a | -m | -u | -c | -s | -b | -f | -r | -h"
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: only short options are listed, long ones are not mentioned

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the expected output as it was decided a long time ago, the same applies to the OVA and other packages that have been updated before this change, this was a decision from the management team.

https://github.com/wazuh/wazuh-packages/blob/master/ova/generate_ova.sh#L33-L61

Comment on lines +38 to +42
echo -e " -r, --revision <rev>"
echo -e " [Optional] Package revision."
echo -e ""
echo -e " -c, --checksum <path>"
echo -e " [Optional] Generate checksum."
Copy link
Member

Choose a reason for hiding this comment

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

nitpick: default behavior missing

Copy link
Member Author

Choose a reason for hiding this comment

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

Same, the default value was removed unless it was necessary to the user (as the output directory)

npm install -g n
npm install -g n

RUN yum install -y \
Copy link
Member

Choose a reason for hiding this comment

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

Any reason to keep this in a separate RUN command?

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, no, I didn't see the other yum install, but this dependency is not necessary to build the package itself but to configure the packages names, I think it should be separately

@davidjiglesias davidjiglesias merged commit ecb77fa into 4.8.0 Nov 22, 2023
4 checks passed
@davidjiglesias davidjiglesias deleted the enhancement/2589-add-new-wazuh-apps branch November 22, 2023 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adapt process to install multiple Wazuh Dashboards plugins
3 participants