From 95c7774a6de10d41fa94f52c692f012d45b64084 Mon Sep 17 00:00:00 2001
From: Witek Bedyk <witold.bedyk@suse.com>
Date: Tue, 28 Jan 2020 12:08:28 +0100
Subject: [PATCH] Update nodejs and npm packages

Update nodejs from 8.10.0 to 10.17.0
Update npm from 3.5.4 to 6.11.3

Configure Monasca tempest plugin to use the correct Kibana version.

This is a partial port of https://review.opendev.org/727195

Depends-On: https://review.opendev.org/730637
Change-Id: Id93ee30bcd803e7a48074da67b9538496e7d1063
Story: 2003881
Task: 38494
---
 devstack/plugin.sh | 35 ++++++++++++++++++++++++++++-------
 devstack/settings  |  8 +++++++-
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 683ed5e3..ff1fcd1d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -460,11 +460,17 @@ function start_elasticsearch {
     fi
 }
 
+function _get_kibana_version_name {
+    echo "kibana-${KIBANA_VERSION}-linux-x86_64"
+}
+
 function install_kibana {
     if is_service_enabled kibana; then
         echo_summary "Installing Kibana ${KIBANA_VERSION}"
 
-        local kibana_tarball=kibana-${KIBANA_VERSION}.tar.gz
+        local kibana_version_name
+        kibana_version_name=`_get_kibana_version_name`
+        local kibana_tarball=${kibana_version_name}.tar.gz
         local kibana_tarball_url=http://download.elastic.co/kibana/kibana/${kibana_tarball}
 
         local kibana_tarball_dest
@@ -472,8 +478,8 @@ function install_kibana {
 
         tar xzf ${kibana_tarball_dest} -C $DEST
 
-        sudo chown -R $STACK_USER $DEST/kibana-${KIBANA_VERSION}
-        ln -sf $DEST/kibana-${KIBANA_VERSION} $KIBANA_DIR
+        sudo chown -R $STACK_USER $DEST/${kibana_version_name}
+        ln -sf $DEST/${kibana_version_name} $KIBANA_DIR
     fi
 }
 
@@ -518,8 +524,10 @@ function clean_kibana {
     if is_service_enabled kibana; then
         echo_summary "Cleaning Kibana ${KIBANA_VERSION}"
 
+        local kibana_tarball
+        kibana_tarball=`_get_kibana_version_name`.tar.gz
         sudo rm -rf $KIBANA_DIR || true
-        sudo rm -rf $FILES/kibana-${KIBANA_VERSION}.tar.gz || true
+        sudo rm -rf $FILES/${kibana_tarball} || true
         sudo rm -rf $KIBANA_CFG_DIR || true
     fi
 }
@@ -681,7 +689,8 @@ function start_monasca_log_agent {
 function install_nodejs {
     if is_service_enabled kibana; then
         # refresh installation
-        apt_get install nodejs npm
+        curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
+        apt_get install nodejs
         (
             npm config set registry "http://registry.npmjs.org/"; \
             npm config set proxy "${HTTP_PROXY}"; \
@@ -693,7 +702,7 @@ function install_nodejs {
 function clean_nodejs {
     if is_service_enabled kibana; then
         echo_summary "Cleaning Node.js"
-        apt_get purge nodejs npm
+        apt_get purge nodejs
     fi
 }
 
@@ -705,10 +714,12 @@ function build_kibana_plugin {
     if is_service_enabled kibana; then
         echo "Building Kibana plugin"
 
-        git_clone $MONASCA_KIBANA_PLUGIN_REPO $MONASCA_KIBANA_PLUGIN_DIR \
+        git_clone $MONASCA_KIBANA_PLUGIN_REPO \
+            $MONASCA_KIBANA_PLUGIN_DIR \
             $MONASCA_KIBANA_PLUGIN_BRANCH
 
         pushd $MONASCA_KIBANA_PLUGIN_DIR
+        git_update_branch $MONASCA_KIBANA_PLUGIN_BRANCH
 
         local monasca_kibana_plugin_version
         monasca_kibana_plugin_version="$(python -c 'import json; \
@@ -790,6 +801,10 @@ function enable_log_management {
     fi
 }
 
+function configure_tempest_for_monasca {
+    iniset $TEMPEST_CONFIG monitoring kibana_version $KIBANA_VERSION
+}
+
 # check for service enabled
 if is_service_enabled monasca-log; then
 
@@ -803,6 +818,12 @@ if is_service_enabled monasca-log; then
         echo_summary "Installing Monasca Log Management"
         install_monasca_log
 
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        if is_service_enabled tempest; then
+            echo_summary "Configuring Tempest for Monasca"
+            configure_tempest_for_monasca
+        fi
+
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         # Configure after the other layer 1 and 2 services have been configured
         echo_summary "Configuring Monasca Log Management"
diff --git a/devstack/settings b/devstack/settings
index 9fe8fa0c..adcfe789 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -15,6 +15,12 @@
 # limitations under the License.
 #
 
+# --- WARNING ---
+# monasca-log-api DevStack plugin has been deprecated in Ussuri
+# the code has been merged into monasca-api DevStack plugin
+# the settings here apply only to stable/train and older branches
+# please use settings in monasca-api for newer releases
+
 # services
 enable_service zookeeper              # devstack/monasca-api/zookeeper
 enable_service kibana                 # devstack/monasca-api/kafka
@@ -27,7 +33,7 @@ enable_service monasca-log-metrics
 enable_service monasca-log-agent
 
 # libraries/frameworks/projects monasca-log requires to install itself
-KIBANA_VERSION=${KIBANA_VERSION:-4.6.3-linux-x86_64}
+KIBANA_VERSION=${KIBANA_VERSION:-4.6.3}
 LOGSTASH_VERSION=${LOGSTASH_VERSION:-2.4.1}
 ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-2.4.6}
 LOGSTASH_OUTPUT_MONASCA_VERSION=${LOGSTASH_OUTPUT_MONASCA_VERSION:-1.0.4}