openstack
/
monasca-ui
Code Issues Proposed changes

Merge "Move Grafana to Apache's DocumentRoot"

This commit is contained in:
Jenkins 2016-01-13 20:48:15 +00:00 committed by Gerrit Code Review
parent ecada698dc c2c73f5254
commit d5557dc91b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -8,7 +8,7 @@ by monasca-vagrant.
* git clone https://github.com/openstack/horizon.git # clone horizon
* git clone https://github.com/hpcloud-mon/grafana.git
* ln -s grafana/src horizon/static/grafana
* ln -r -s grafana/src *apache_document_root*/grafana
* cd horizon
* Add git+https://github.com/openstack/monasca-ui.git to requirements.txt
@ -55,8 +55,8 @@ ln -s ../monasca-ui/monitoring monitoring
##Set up Grafana
```
cd static
ln -s ../../grafana/src grafana
cd ..
ln -r -s grafana/src <apache_document_root>/grafana
cd grafana
cp config.monasca.js config.js
```

4
monitoring/overview/templates/overview/index.html
View File

@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load static i18n %}
{% load i18n %}
{% block title %}{% trans 'Monitoring' %}{% endblock %}
{% block page_header %}
@ -9,7 +9,7 @@
{% block main %}
<div style="padding: 3px;">
{% for dashboard in dashboards %}
<a target={{ dashboard.title }} href="{% get_static_prefix %}grafana/index.html#/dashboard/file/{{ dashboard.fileName }}?api={{api}}" class="btn btn-default btn-sm">
<a target={{ dashboard.title }} href="/grafana/index.html#/dashboard/file/{{ dashboard.fileName }}?api={{api}}" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-dashboard"></span>
{% trans dashboard.title %}
</a>