Skip to content

fix: fixing issues found in 2.19.0 testing #174

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 7, 2025
Merged

fix: fixing issues found in 2.19.0 testing #174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e07798
fix: fixing issues found in 2.19.0 testing
bejjrajesh Feb 7, 2025
7dc905c
Merge branch 'main' into rbejjanki/post-2-19-0-issue-fixes
bejjrajesh Feb 7, 2025
bb42c5f
fix: fixing review comments
bejjrajesh Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions static/scripts/install-nim-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TARGET_DISTRIBUTION=""
PACKAGE_INSTALLER=""
NMS_NGINX_MGMT_BLOCK="mgmt { \n usage_report endpoint=127.0.0.1 interval=30m; \n ssl_verify off; \n}";
NIM_FQDN=""

NIM_CERTS_DIR="/etc/nms/certs"
# Added to account for the renaming of the adc dimension from application to app.
if [ -f "/usr/share/nms/catalogs/dimensions/application.yml" ]; then
rm /usr/share/nms/catalogs/dimensions/application.yml
Expand Down Expand Up @@ -335,6 +335,7 @@ installBundleForDebianDistro() {
if [ "${USE_SM_MODULE}" == "true" ]; then
nim_major_version=$(nms-core --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | awk -F. '{print $1}')
nim_minor_version=$(nms-core --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | awk -F. '{print $2}')
echo "Installed NIM major Version: ${nim_major_version}, minor Version:${nim_minor_version}"
if [[ $nim_major_version -ge 2 && $nim_minor_version -ge 19 ]]; then
echo "Note: NGINX Instance Manager version 2.19.0 or later comes with security monitoring installed. skipping installing security monitoring"
else
Expand Down Expand Up @@ -477,7 +478,8 @@ installBundleForRPMDistro(){

if [ "${USE_SM_MODULE}" == "true" ]; then
nim_major_version=$(nms-core --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | awk -F. '{print $1}')
nim_minor_version=$(nms-core --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | awk -F. '{print $1}')
nim_minor_version=$(nms-core --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | awk -F. '{print $2}')
echo "Installed NIM major Version: ${nim_major_version}, minor Version:${nim_minor_version}"
if [[ $nim_major_version -ge 2 && $nim_minor_version -ge 19 ]]; then
echo "Note: NGINX Instance Manager version 2.19.0 or later comes with security monitoring installed. skipping installing security monitoring"
else
Expand Down Expand Up @@ -530,7 +532,11 @@ install_nim_online(){
exit 1
fi
if [[ -n ${NIM_FQDN} ]] ; then
bash -c "source /etc/nms/scripts/certs.sh || /etc/nms/scripts/certs.sh 0 ${NIM_FQDN}"
if [ -d "${NIM_CERTS_DIR}" ]; then
echo "removing existing NIM certs"
rm -rf "/etc/nms/certs"
fi
bash -c "source /etc/nms/scripts/certs.sh 0 \"${NIM_FQDN}\" || /etc/nms/scripts/certs.sh 0 ${NIM_FQDN}"
fi
curl -s -o /dev/null --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} "https://pkgs.nginx.com/nms/?using_install_script=true&app=nim&mode=online"
}
Expand Down Expand Up @@ -1029,7 +1035,11 @@ else
exit 1
fi
if [[ -n ${NIM_FQDN} ]] ; then
bash -c "source /etc/nms/scripts/certs.sh || /etc/nms/scripts/certs.sh 0 ${NIM_FQDN}"
if [ -d "${NIM_CERTS_DIR}" ]; then
echo "removing existing nim certs"
rm -rf "/etc/nms/certs"
fi
bash -c "source /etc/nms/scripts/certs.sh 0 \"${NIM_FQDN}\" || /etc/nms/scripts/certs.sh 0 ${NIM_FQDN}"
fi
curl -s -o /dev/null --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} "https://pkgs.nginx.com/nms/?using_install_script=true&app=nim&mode=offline"
fi
Expand Down
Loading