';
- switch (alertState + '_' + alertNormalizedSeverity) {
+ switch (alertState + '_' + alertOperationalSeverity) {
case 'ACTIVE_CRITICAL':
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 {