"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devstack/lib/ui.sh" between
monasca-api-3.1.0.tar.gz and monasca-api-4.0.0.tar.gz

About: OpenStack Monasca API is a RESTful API server that is designed with a layered architecture and supports Monitoring as a Service (MONaaS).
The "Ussuri" series (latest release).

ui.sh  (monasca-api-3.1.0):ui.sh  (monasca-api-4.0.0)
skipping to change at line 37 skipping to change at line 37
rm -rf "${HORIZON_DIR}/monitoring" \ rm -rf "${HORIZON_DIR}/monitoring" \
"${HORIZON_DIR}/openstack_dashboard/local/enabled/_50_admin_add_moni toring_panel.py" \ "${HORIZON_DIR}/openstack_dashboard/local/enabled/_50_admin_add_moni toring_panel.py" \
"${HORIZON_DIR}/openstack_dashboard/conf/monitoring_policy.json" "${HORIZON_DIR}/openstack_dashboard/conf/monitoring_policy.json"
fi fi
} }
function configure_ui { function configure_ui {
if is_ui_enabled; then if is_ui_enabled; then
_link_ui_files _link_ui_files
cp $MONASCA_UI_DIR/monitoring/config/local_settings.py \
$HORIZON_DIR/openstack_dashboard/local/local_settings.d/_50_monasca_
ui_settings.py
local localSettings=$HORIZON_DIR/openstack_dashboard/local/local_setting
s.d/_50_monasca_ui_settings.py
sed -e " sed -e "
s#getattr(settings, 'GRAFANA_URL', None)#{'RegionOne': \"http:\/\/${ SERVICE_HOST}:3000\", }#g; s#getattr(settings, 'GRAFANA_URL', None)#{'RegionOne': \"http:\/\/${ SERVICE_HOST}:3000\", }#g;
" -i "${MONASCA_BASE}"/monasca-ui/monitoring/config/local_settings.py " -i ${localSettings}
if is_service_enabled horizon && is_service_enabled kibana && is_service
_enabled monasca-log; then
echo_summary "Configure Horizon with Kibana access"
sudo sed -e "
s|KIBANA_HOST = getattr(settings, 'KIBANA_HOST', 'http://192.168
.10.6:5601/')|KIBANA_HOST = getattr(settings, 'KIBANA_HOST', 'http://${KIBANA_SE
RVICE_HOST}:${KIBANA_SERVICE_PORT}/')|g;
" -i ${localSettings}
sudo sed -e "
s|'ENABLE_LOG_MANAGEMENT_BUTTON', False|'ENABLE_LOG_MANAGEMENT_B
UTTON', True|g;
" -i ${localSettings}
fi
if python3_enabled; then if python3_enabled; then
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONAS CA_BASE}"/horizon/manage.py collectstatic --noinput DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONAS CA_BASE}"/horizon/manage.py collectstatic --noinput
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONAS CA_BASE}"/horizon/manage.py compress --force DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONAS CA_BASE}"/horizon/manage.py compress --force
else else
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASC A_BASE}"/horizon/manage.py collectstatic --noinput DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASC A_BASE}"/horizon/manage.py collectstatic --noinput
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASC A_BASE}"/horizon/manage.py compress --force DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASC A_BASE}"/horizon/manage.py compress --force
fi fi
restart_service apache2 || true restart_service apache2 || true
fi fi
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)