openstack/vitrage-dashboard
Code Issues Proposed changes

vitrage Alarms table, add sort, global search

Browse Source 
Change-Id: I5f9dd5db51f88c69bffc33d8d7e8bbdc2fdd4949
This commit is contained in:
Omer Etrog 2016-02-16 15:42:07 +02:00
parent 7aa6a788b8
commit 7b6e279c75
7 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
# plugin.sh - DevStack plugin.sh dispatch script vitrage-dashboard
VITRAGE_DASHBOARD_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
@ -5,6 +6,7 @@ VITRAGE_DASHBOARD_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
function install_vitrage_dashboard {
sudo pip install --upgrade ${VITRAGE_DASHBOARD_DIR}
cp -a ${VITRAGE_DASHBOARD_DIR}/vitragedashboard/static ${DEST}/horizon/
cp -a ${VITRAGE_DASHBOARD_DIR}/vitragealarms/static ${DEST}/horizon/
cp -a ${VITRAGE_DASHBOARD_DIR}/vitragedashboard/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/
cp -a ${VITRAGE_DASHBOARD_DIR}/vitrageclient/api/* ${DEST}/horizon/openstack_dashboard/api/
python ${DEST}/horizon/manage.py compress --force
@ -22,7 +24,6 @@ if is_service_enabled vitrage-dashboard; then
# Perform installation of service source
# no-op
:
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured
echo_summary "Installing Vitrage Dashboard"

2
vitragealarms/static/alarms/project/layout/main/alarmList.controller.js
View File

@ -9,6 +9,8 @@
function AlarmListController($scope, vitrageTopologySrv) {
var alarmList = this;
alarmList.alarms = [];
alarmList.ialarms = [];
$scope.STATIC_URL = STATIC_URL;
alarmList.alarms = [];
vitrageTopologySrv.getAlarms('all').then(function(result){

24
vitragealarms/static/alarms/project/layout/main/alarmList.html
View File

@ -1,20 +1,30 @@
<div class="alarm-list" ng-controller="AlarmListController as alarmList">
<div class="panel panel-default" >
<table class="table table-striped table-hover table-bordered">
<table st-table='alarmList.ialarms' st-safe-src="alarmList.alarms" class="table-striped table-rsp table-detail modern" hz-table>
<thead>
<tr>
<th>{$ 'TimeStamp' | translate $}</th>
<th>{$ 'Name' | translate $}</th>
<th>{$ 'Severity' | translate $}</th>
<th>{$ 'Type' | translate $}</th>
<th st-sort="update_timestamp">{$ 'TimeStamp' | translate $}</th>
<th st-sort="name">{$ 'Name' | translate $}</th>
<th st-sort="resource_type">{$ 'Resource Type' | translate $}</th>
<th st-sort="resource_name">{$ 'Resource Name' | translate $}</th>
<th st-sort="severity">{$ 'Severity' | translate $}</th>
<th st-sort="type">{$ 'Type' | translate $}</th>
<th>{$ 'RCA' | translate $}</th>
</tr>
<tr>
<th colspan="7">
<hz-search-bar group-classes="input-group-sm"
icon-classes="fa-search">
</hz-search-bar>
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="alarm in alarmList.alarms track by $index">
<tr ng-repeat="alarm in alarmList.ialarms track by $index">
<td><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"h:mm a"$} </td>
<td>{$alarm.name$}</td>
<td>{$alarm.resource_type$}</td>
<td>{$alarm.resource_name$}</td>
<td>{$alarm.severity $}</td>
<td>{$alarm.type$}</td>
<td><i class="fa fa-sitemap"></i></td>

31
vitragedashboard/locale/django.pot Normal file
View File

@ -0,0 +1,31 @@
# Translations template for PROJECT.
# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2016-02-11 07:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.2.0\n"
#: vitragedashboard/templates/topology/index.html:3
#: vitragedashboard/static/dashboard/project/layout/main/compute/compute.html:19
msgid "Topology"
msgstr "Topology"
#: vitragedashboard/templates/topology/index.html:6
msgid "\"Topology\""
msgstr "Topology"
#: vitragedashboard/static/dashboard/project/layout/main/compute/compute.html:7
msgid "Info"
msgstr "Info"

0
vitragedashboard/locale/djangojs.pot Normal file
View File

4
vitragedashboard/static/dashboard/project/layout/main/compute/compute.html
View File

@ -4,7 +4,7 @@
<div class="col-md-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Info.</h3>
<h3 class="panel-title">{$ 'Info' |translate$}</h3>
</div>
<div class="panel-body">
<hz-information selected="computeCtrl.model.selected"></hz-information>
@ -16,7 +16,7 @@
<div class="col-md-9">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Topology</h3>
<h3 class="panel-title">{$ 'Topology' |translate$}</h3>
</div>
<div class="panel-body">
<div class="col-md-10">

3
vitragedashboard/templates/topology/index.html
View File

@ -3,7 +3,8 @@
{% block title %}{% trans "Topology" %}{% endblock %}
{% block page_header %}
<hz-page-header header="Topology Vitrage" description="Topology Vitrage Desc"></hz-page-header>
{% include "horizon/common/_page_header.html" with title=_("Topology") %}
<!--<hz-page-header header="Topology Vitrage" description="Topology Vitrage Desc"></hz-page-header>-->
{% endblock page_header %}
{% block main %}