openstack/monasca-api
Code Issues Proposed changes

Add Keystone configuration for Grafana

Browse Source 
Add Keystone auth_url for Grafana configuration.

Depends-On: I08195ad281637e6567a8acbace9862df2d5f9502

Change-Id: If65c94104c9951e4f4508247bd92449de949def1
This commit is contained in:
Artur Basiak
2017-07-21 08:23:55 +02:00
parent c767948175
commit a23a4f1518
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/grafana/grafana.ini
View File

@@ -1,5 +1,6 @@
[auth.keystone] [auth.keystone]
enabled = true enabled = true
auth_url = '%KEYSTONE_AUTH_URI%'
[paths] [paths]
plugins = /var/lib/grafana/plugins plugins = /var/lib/grafana/plugins

4
devstack/plugin.sh
View File

@@ -1311,6 +1311,10 @@ function install_monasca_grafana {
sudo chown -R grafana:grafana /var/lib/grafana /var/log/grafana sudo chown -R grafana:grafana /var/lib/grafana /var/log/grafana
sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana.ini /etc/grafana/grafana.ini sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana.ini /etc/grafana/grafana.ini
sudo sed -e "
s|%KEYSTONE_AUTH_URI%|$KEYSTONE_AUTH_URI|g;
" -i /etc/grafana/grafana.ini
sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana-server /etc/init.d/grafana-server sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana-server /etc/init.d/grafana-server
sudo sed -i "s#/usr/sbin#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana/grafana/bin#g" /etc/init.d/grafana-server sudo sed -i "s#/usr/sbin#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana/grafana/bin#g" /etc/init.d/grafana-server
sudo sed -i "s#/usr/share#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana#g" /etc/init.d/grafana-server sudo sed -i "s#/usr/share#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana#g" /etc/init.d/grafana-server