openstack
/
monasca-log-api
Code Issues Proposed changes

Use openstack/monasca-kibana-plugin repo in devstack 

* rename the target directory and tarball

Depends-On: Ida2a5e2dffb31a5d7fb8ce8492ed64508f371dd9
Change-Id: I782c1bedb475db0260466d46a693b4ce634910a2
This commit is contained in:
Witold Bedyk 2017-02-01 21:27:39 +01:00
parent 85b78cd105
commit 11435d99af
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/files/kibana/kibana.yml
View File

@ -70,10 +70,10 @@ logging.quiet: false
# Set this to true to log all events, including system usage information and all requests.
logging.verbose: true
# fts-keystone configuration
fts-keystone.port: %KEYSTONE_AUTH_PORT%
fts-keystone.url: %KEYSTONE_AUTH_PROTOCOL%://%KEYSTONE_AUTH_HOST%
fts-keystone.enabled: True
fts-keystone.cookie.isSecure: False
# monasca-kibana-plugin configuration
monasca-kibana-plugin.port: %KEYSTONE_AUTH_PORT%
monasca-kibana-plugin.url: %KEYSTONE_AUTH_PROTOCOL%://%KEYSTONE_AUTH_HOST%
monasca-kibana-plugin.enabled: True
monasca-kibana-plugin.cookie.isSecure: False
optimize.useBundleCache: False

21
devstack/plugin.sh
View File

@ -354,10 +354,10 @@ function install_kibana_plugin {
# note(trebskit) that needs to happen after kibana received
# its configuration otherwise the plugin fails to be installed
local pkg=file://$DEST/fts-keystone.tar.gz
local pkg=file://$DEST/monasca-kibana-plugin.tar.gz
$KIBANA_DIR/bin/kibana plugin -r fts-keystone
$KIBANA_DIR/bin/kibana plugin -i fts-keystone -u $pkg
$KIBANA_DIR/bin/kibana plugin -r monasca-kibana-plugin
$KIBANA_DIR/bin/kibana plugin -i monasca-kibana-plugin -u $pkg
fi
}
@ -557,14 +557,13 @@ function build_kibana_plugin {
if is_service_enabled kibana; then
echo "Building Kibana plugin"
if [ ! -d "${FTS_KEYSTONE_DIR}" ]; then
git_timed clone $FTS_KEYSTONE_REPO $FTS_KEYSTONE_DIR --branch $FTS_KEYSTONE_BRANCH --depth 1
fi
git_clone $MONASCA_KIBANA_PLUGIN_REPO $MONASCA_KIBANA_PLUGIN_DIR \
$MONASCA_KIBANA_PLUGIN_BRANCH
pushd $FTS_KEYSTONE_DIR
pushd $MONASCA_KIBANA_PLUGIN_DIR
local fts_keystone_version
fts_keystone_version="$(python -c 'import json; \
local monasca_kibana_plugin_version
monasca_kibana_plugin_version="$(python -c 'import json; \
obj = json.load(open("package.json")); print obj["version"]')"
set -i
@ -572,8 +571,8 @@ function build_kibana_plugin {
(source "${HOME}"/.nvm/nvm.sh >> /dev/null; nvm use ${NODE_JS_VERSION}; npm run package)
set +i
local pkg=$FTS_KEYSTONE_DIR/target/fts-keystone-${fts_keystone_version}.tar.gz
local easyPkg=$DEST/fts-keystone.tar.gz
local pkg=$MONASCA_KIBANA_PLUGIN_DIR/target/monasca-kibana-plugin-${monasca_kibana_plugin_version}.tar.gz
local easyPkg=$DEST/monasca-kibana-plugin.tar.gz
ln -sf $pkg $easyPkg

6
devstack/settings
View File

@ -46,9 +46,9 @@ MONASCA_STATSD_REPO=${MONASCA_STATSD_REPO:-${GIT_BASE}/openstack/monasca-statsd.
MONASCA_STATSD_BRANCH=${MONASCA_STATSD_BRANCH:-master}
MONASCA_STATSD_DIR=${DEST}/monasca-statsd
FTS_KEYSTONE_REPO=${FTS_KEYSTONE_REPO:-"https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/fts-keystone.git"}
FTS_KEYSTONE_BRANCH=${FTS_KEYSTONE_BRANCH:-master}
FTS_KEYSTONE_DIR=${DEST}/fts-keystone
MONASCA_KIBANA_PLUGIN_REPO=${MONASCA_KIBANA_PLUGIN_REPO:-${GIT_BASE}/openstack/monasca-kibana-plugin.git}
MONASCA_KIBANA_PLUGIN_BRANCH=${MONASCA_KIBANA_PLUGIN_BRANCH:-master}
MONASCA_KIBANA_PLUGIN_DIR=${DEST}/monasca-kibana-plugin
GITREPO["monasca-common"]=${MONASCA_COMMON_REPO}
GITBRANCH["monasca-common"]=${MONASCA_COMMON_BRANCH}