openstack
/
monasca-api
Code Issues Proposed changes

[DevStack] Allow testing different Kibana versions 

Kibana API has changed between the versions. To allow testing
different Kibana versions `kibana_version` option should be set in
tempest.conf.

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

Change-Id: I0a21bd99c942ab05ce1eae51226132691518bd91
This commit is contained in:
Witek Bedyk 2020-05-25 17:05:09 +02:00
parent 7b06211d2f
commit d6104a693b
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devstack/lib/monasca-log.sh
View File

@ -396,19 +396,31 @@ function start_elasticsearch {
fi
}
function _get_kibana_version_name {
echo "kibana-${KIBANA_VERSION}-linux-x86_64"
}
function _get_kibana_oss_version_name {
echo "kibana-oss-${KIBANA_VERSION}-linux-x86_64"
}
function install_kibana {
if is_service_enabled kibana; then
echo_summary "Installing Kibana ${KIBANA_VERSION}"
local kibana_tarball=kibana-oss-${KIBANA_VERSION}.tar.gz
local kibana_oss_version_name
kibana_oss_version_name=`_get_kibana_oss_version_name`
local kibana_tarball=${kibana_oss_version_name}.tar.gz
local kibana_tarball_url=https://artifacts.elastic.co/downloads/kibana/${kibana_tarball}
local kibana_tarball_dest
kibana_tarball_dest=`get_extra_file ${kibana_tarball_url}`
tar xzf ${kibana_tarball_dest} -C $DEST
sudo chown -R $STACK_USER $DEST/kibana-${KIBANA_VERSION}
ln -sf $DEST/kibana-${KIBANA_VERSION} $KIBANA_DIR
local kibana_version_name
kibana_version_name=`_get_kibana_version_name`
sudo chown -R $STACK_USER $DEST/${kibana_version_name}
ln -sf $DEST/${kibana_version_name} $KIBANA_DIR
fi
}
@ -439,8 +451,10 @@ function clean_kibana {
if is_service_enabled kibana; then
echo_summary "Cleaning Kibana ${KIBANA_VERSION}"
local kibana_tarball
kibana_tarball=`_get_kibana_oss_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
}
@ -500,6 +514,8 @@ function build_kibana_plugin {
git clone $KIBANA_DEV_REPO $KIBANA_DEV_DIR --branch $KIBANA_DEV_BRANCH --depth 1
git_clone $MONASCA_KIBANA_PLUGIN_REPO $MONASCA_KIBANA_PLUGIN_DIR $MONASCA_KIBANA_PLUGIN_BRANCH
cd $MONASCA_KIBANA_PLUGIN_DIR
git_update_branch $MONASCA_KIBANA_PLUGIN_BRANCH
cp -r $MONASCA_KIBANA_PLUGIN_DIR "$KIBANA_DEV_DIR/plugins"
local plugin_dir="$KIBANA_DEV_DIR/plugins/monasca-kibana-plugin"

10
devstack/plugin.sh
View File

@ -1445,6 +1445,10 @@ function init_collector_service {
fi
}
function configure_tempest_for_monasca {
iniset $TEMPEST_CONFIG monitoring kibana_version $KIBANA_VERSION
}
# check for service enabled
if is_service_enabled monasca; then
@ -1458,6 +1462,12 @@ if is_service_enabled monasca; then
echo_summary "Installing Monasca"
install_monasca
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"

2
devstack/settings
View File

@ -122,7 +122,7 @@ STORM_VERSION=${STORM_VERSION:-1.2.2}
GO_VERSION=${GO_VERSION:-"1.7.1"}
NODE_JS_VERSION=${NODE_JS_VERSION:-"4.0.0"}
NVM_VERSION=${NVM_VERSION:-"0.32.1"}
KIBANA_VERSION=${KIBANA_VERSION:-7.3.0-linux-x86_64}
KIBANA_VERSION=${KIBANA_VERSION:-7.3.0}
LOGSTASH_VERSION=${LOGSTASH_VERSION:-7.3.0}
ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-7.3.0}
LOGSTASH_OUTPUT_MONASCA_VERSION=${LOGSTASH_OUTPUT_MONASCA_VERSION:-2.0.0}