diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.html b/vitragedashboard/static/dashboard/project/alarmList/alarmList.html index 7eca7d0..0ce89b5 100644 --- a/vitragedashboard/static/dashboard/project/alarmList/alarmList.html +++ b/vitragedashboard/static/dashboard/project/alarmList/alarmList.html @@ -27,12 +27,12 @@ - + {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} {$alarm.name$} {$alarm.resource_type$} {$alarm.resource_id$} - {$alarm.normalized_severity | lowercase$} + {$alarm.aggregated_severity | lowercase$} {$alarm.type$} diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.scss b/vitragedashboard/static/dashboard/project/alarmList/alarmList.scss index 4044654..f7ee220 100644 --- a/vitragedashboard/static/dashboard/project/alarmList/alarmList.scss +++ b/vitragedashboard/static/dashboard/project/alarmList/alarmList.scss @@ -2,4 +2,8 @@ .refreshBtn{ text-align: right; } + + .first-column { + padding-left: 5px; + } } diff --git a/vitragedashboard/static/dashboard/project/assets/bell_gray_off.svg b/vitragedashboard/static/dashboard/project/assets/bell_gray_off.svg new file mode 100644 index 0000000..8887bcd --- /dev/null +++ b/vitragedashboard/static/dashboard/project/assets/bell_gray_off.svg @@ -0,0 +1,193 @@ + +image/svg+xml \ No newline at end of file diff --git a/vitragedashboard/static/dashboard/project/assets/bell_gray_on.svg b/vitragedashboard/static/dashboard/project/assets/bell_gray_on.svg new file mode 100644 index 0000000..be5eed4 --- /dev/null +++ b/vitragedashboard/static/dashboard/project/assets/bell_gray_on.svg @@ -0,0 +1,161 @@ + +image/svg+xml \ No newline at end of file diff --git a/vitragedashboard/static/dashboard/project/assets/bell_green_off.svg b/vitragedashboard/static/dashboard/project/assets/bell_green_off.svg new file mode 100644 index 0000000..5e43ca4 --- /dev/null +++ b/vitragedashboard/static/dashboard/project/assets/bell_green_off.svg @@ -0,0 +1,173 @@ + +image/svg+xml \ No newline at end of file diff --git a/vitragedashboard/static/dashboard/project/assets/bell_green_on.svg b/vitragedashboard/static/dashboard/project/assets/bell_green_on.svg new file mode 100644 index 0000000..07c6dd9 --- /dev/null +++ b/vitragedashboard/static/dashboard/project/assets/bell_green_on.svg @@ -0,0 +1,161 @@ + +image/svg+xml \ No newline at end of file diff --git a/vitragedashboard/static/dashboard/project/components/alarms/alarms.html b/vitragedashboard/static/dashboard/project/components/alarms/alarms.html index 6bb539d..8c09717 100644 --- a/vitragedashboard/static/dashboard/project/components/alarms/alarms.html +++ b/vitragedashboard/static/dashboard/project/components/alarms/alarms.html @@ -11,7 +11,7 @@ hz-table> - + {$ 'Time' | translate $} {$ 'Name' | translate $} {$ 'RCA' | translate $} @@ -19,7 +19,7 @@ - + {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} {$alarm.name$} diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js index 93ebf68..59a78ed 100644 --- a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js +++ b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js @@ -111,7 +111,7 @@ function hzRootCauseAnalysisGraph($filter) { alertResourceName = key.resource_name, // host-0 alertResourceType = key.resource_type, // nova.host alertSeverity = key.severity, //WARNING - alertNormalizedSeverity = key.normalized_severity ? key.normalized_severity.toUpperCase() : key.normalized_severity, //WARNING + alertOperationalSeverity = key.operational_severity ? key.operational_severity.toUpperCase() : key.operational_severity, //WARNING alertState = key.state ? key.state.toUpperCase() : key.state, //Active alertTimeStamp = $filter('date')(key.update_timestamp, 'MM/dd/yyyy h:mma'), //2015-12-01T12:46:41Z alertType = key.type, //nagios @@ -122,28 +122,36 @@ function hzRootCauseAnalysisGraph($filter) { html += '
'; break; case 'ACTIVE_WARNING': - case 'ACTIVE_SEVER': + html += ''; + break; case 'ACTIVE_SEVERE': html += ''; break; - case 'ACTIVE_DISABLED': - html += ''; + case 'ACTIVE_N/A': + html += ''; + break; + case 'ACTIVE_OK': + html += ''; break; case 'INACTIVE_CRITICAL': html += ''; break; case 'INACTIVE_WARNING': - case 'INACTIVE_SEVER': - case 'INACTIVE_SEVER': + html += ''; + break; + case 'INACTIVE_SEVERE': html += ''; break; - case 'INACTIVE_DISABLED': - html += ''; + case 'INACTIVE_N/A': + html += ''; + break; + case 'INACTIVE_OK': + html += ''; break; default: html += ''; diff --git a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js b/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js index 70c933d..c91b022 100644 --- a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js +++ b/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js @@ -111,24 +111,22 @@ function hzSunburst() { } function getColor(d) { - if (d.aggregated_state) { - switch (d.aggregated_state.toUpperCase()) { + if (d.operational_state) { + switch (d.operational_state.toUpperCase()) { case 'ERROR': + case 'DELETED': return '#FA3C3C'; break; - case 'TERMINATED': - case 'SUSPEND': - case 'RESCUED': - case 'RESIZED': case 'SUBOPTIMAL': return '#FCD20E'; break; - case 'RUNNING': + case 'OK': return '#87CE53'; break; case 'TRANSIENT': - case 'UNRECOGNIZED': - case 'UNDEFINED': + return '#97A560'; + break; + case 'N/A': return '#AEAEAE'; break; default: diff --git a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js b/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js index 8920ef9..4166f46 100644 --- a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js +++ b/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js @@ -226,16 +226,24 @@ function hzEntitiesGraph() { .attr('transform', 'scale(1)') .attr('class', function(d) { var cls = ''; - var severity = d.severity || d.normalized_severity; + var severity = d.operational_severity; if (severity) { switch (severity.toLowerCase()) { case 'critical': - case 'severe': cls = 'red'; break; - case 'warning': + case 'severe': cls = 'orange'; break; + case 'warning': + cls = 'yellow'; + break; + case 'ok': + cls = 'green'; + break; + case 'n/a': + cls = 'gray'; + break; default: //'DISABLED', 'UNKNOWN', 'UNDEFINED' cls = 'gray'; break; diff --git a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss b/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss index c4e1af2..60fe95f 100644 --- a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss +++ b/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss @@ -1,6 +1,7 @@ $blue: #428BCA; $vitrage_red: #FA3C3C; -$vitrage_orange: #FCD20E; +$vitrage_orange: #fc9100; +$vitrage_yellow: #FCD20E; $vitrage_green: #87CE53; $vitrage_gray: #AEAEAE; $dark_gray: darkgray; @@ -68,6 +69,10 @@ $dark_gray: darkgray; stroke: $vitrage_orange; } + &.yellow { + stroke: $vitrage_yellow; + } + &.green { stroke: $vitrage_green; } diff --git a/vitragedashboard/static/dashboard/project/vitrage.scss b/vitragedashboard/static/dashboard/project/vitrage.scss index cb5bd91..7e2ea50 100644 --- a/vitragedashboard/static/dashboard/project/vitrage.scss +++ b/vitragedashboard/static/dashboard/project/vitrage.scss @@ -17,7 +17,11 @@ } .orange { - color: #FCD20E; + color: #fc9d00; +} + +.yellow { + color: #FFC600; } .green {