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

Changed CONFIG_DIR var in opensearch-dashboards script #1451

Merged
merged 2 commits into from
Apr 13, 2022

Conversation

c-bordon
Copy link
Member

Related issue
closes #1447

Description

The CONFIG_DIR variable of the opensearch scripts is modified

Logs example

Tests

build:

Install:

  • Build the package in any supported platform
    • Linux
    • Windows
    • macOS
    • Solaris
    • AIX
    • HP-UX
  • Package installation
  • Package upgrade
  • Package downgrade
  • Package remove
  • Package install/remove/install
  • Change added to CHANGELOG.md
  • Tests for Linux RPM
    • [x ] Build the package for x86_64
    • Build the package for i386
    • Build the package for armhf
    • Build the package for aarch64
    • %files section is correctly updated if necessary
  • Tests for Linux deb
    • Build the package for x86_64
    • Build the package for i386
    • Build the package for armhf
    • Build the package for aarch64
    • Package install/remove/install
    • Package install/purge/install
    • Check file permissions after installing the package
  • Tests for macOS
    • Test the package from macOS Sierra to Mojave
  • Tests for Solaris
    • Test the package on Solaris 10
    • Test the package on Solaris 11
    • Check file permissions on Solaris 11 template
  • Tests for IBM AIX
    • %files section is correctly updated if necessary
    • Check the changes from IBM AIX 5 to 7

@c-bordon c-bordon self-assigned this Apr 12, 2022
Copy link
Contributor

@alberpilot alberpilot left a comment

Choose a reason for hiding this comment

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

Could we have sed replacement instead of 4 completely new files?

fi

if [ -f "${CONFIG_DIR}/node.options" ]; then
OSD_NODE_OPTS="$(grep -v ^# < ${CONFIG_DIR}/node.options | xargs)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Does affect the comment to last "?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done: a91f07e

@c-bordon
Copy link
Member Author

Suggested changes are made:

New tests:
build:

Install:

Centos: https://devel.ci.wazuh.info/view/Tests/job/Test_install_stack/444/console
Debian: https://devel.ci.wazuh.info/view/Tests/job/Test_install_stack/443/console

[root@centos7-1 ~]# ps -fea | grep dashboard
wazuh-d+ 26297     1 18 11:43 ?        00:00:04 /usr/share/wazuh-dashboard/bin/../node/bin/node /usr/share/wazuh-dashboard/bin/../src/cli/dist -c /etc/wazuh-dashboard/opensearch_dashboards.yml
root     26329  3255  0 11:44 pts/0    00:00:00 grep --color=auto dashboard
[root@centos7-1 ~]# cat /proc/26297/environ 
NODE_ENV=productionNODE_OPTIONS=--no-warnings --max-http-header-size=65536 --unhandled-rejections=warn KILL_ON_STOP_TIMEOUT=0chroot=/SHELL=/sbin/nologinnice=user=wazuh-dashboardUSER=wazuh-dashboardPATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/binPWD=/usr/share/wazuh-dashboardLANG=en_US.UTF-8SHLVL=0HOME=/usr/share/wazuh-dashboard/group=wazuh-dashboardLOGNAME=wazuh-dashboardchdir=/[root@centos7-1 ~]# 

@c-bordon c-bordon requested a review from alberpilot April 13, 2022 12:20
@alberpilot alberpilot merged commit d8b5fe0 into 4.3 Apr 13, 2022
@alberpilot alberpilot deleted the 1447-DashboardWrapper-to4.3 branch April 13, 2022 16:09
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.

2 participants