Switch to overcloud dashboard

This commit is contained in:
Rob Raymond 2014-05-08 13:18:13 -06:00
parent 3301b8faf3
commit 2ae5ed1626
6 changed files with 8 additions and 8 deletions

View File

@ -1,9 +1,9 @@
# The name of the panel to be added to HORIZON_CONFIG. Required.
PANEL = 'monitoring'
# The name of the dashboard the PANEL associated with. Required.
PANEL_DASHBOARD = 'admin'
PANEL_DASHBOARD = 'overcloud'
# The name of the panel group the PANEL is associated with.
PANEL_GROUP = 'admin'
#PANEL_GROUP = 'admin'
# Python panel class of the PANEL to be added.
ADD_PANEL = \

Binary file not shown.

View File

@ -39,6 +39,6 @@ PHONE_VALIDATOR = validators.RegexValidator(
EMAIL_VALIDATOR = validators.EmailValidator(
message=_("Address must contain a valid email address."))
URL_PREFIX = 'horizon:admin:monitoring:'
TEMPLATE_PREFIX = 'admin/monitoring/'
URL_PREFIX = 'horizon:overcloud:monitoring:'
TEMPLATE_PREFIX = 'overcloud/monitoring/'

View File

@ -7,5 +7,5 @@
{% endblock page_header %}
{% load url from future %}
{% block main %}
{% include 'admin/monitoring/monitor.html' %}
{% include 'overcloud/monitoring/monitor.html' %}
{% endblock %}

View File

@ -6,7 +6,7 @@
{{ group.name }}
</div>
{% for service in group.services %}
<a href="{% url 'horizon:admin:monitoring:servicealarm' service.name %}" class="showspinner">
<a href="{% url 'horizon:overcloud:monitoring:servicealarm' service.name %}" class="showspinner">
<div class="alert alert-block {{ service.class }} fade in" style="display:inline-block; margin-bottom:4px;">
<div>
<img style="margin-right:5px;vertical-align:top;" src="{{ service.icon }}"/>

View File

@ -163,7 +163,7 @@ class StatusView(TemplateView):
class AlarmServiceView(tables.DataTableView):
table_class = AlarmsTable
template_name = 'admin/monitoring/alarm.html'
template_name = constants.TEMPLATE_PREFIX + 'alarm.html'
def dispatch(self, *args, **kwargs):
self.service = kwargs['service']
@ -194,7 +194,7 @@ class AlarmServiceView(tables.DataTableView):
class AlarmView(tables.DataTableView):
table_class = RealAlarmsTable
template_name = 'admin/monitoring/alarm.html'
template_name = constants.TEMPLATE_PREFIX + 'alarm.html'
def dispatch(self, *args, **kwargs):
return super(AlarmView, self).dispatch(*args, **kwargs)