Merge "Closes-Bug: #1544422 - Using the build_info added for db nodes…

… which will take care of the unknown build count in dashboard as well. Displaying the version info in summary,details and chart tooltip as well." into R3.0
Juniper · Feb 25, 2016 · 5a51769 · 5a51769
2 parents dbf8425 + 3293020
commit 5a51769
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js
@@ -599,7 +599,8 @@ define(
                             'value;ConfigData')) ? true : false;
                         obj['isUveMissing'] = ($.isEmptyObject(getValueByJsonPath(d,
                             'value;databaseNode'))) ? true : false;
-                        obj['version'] = noDataStr;
+                        obj['version'] = ifEmpty(self.getNodeVersion(getValueByJsonPath(d,
+                                            'value;databaseNode;NodeStatus;build_info')),'-');
                         var configData;
                         if(!obj['isConfigMissing']){
                             configData = getValueByJsonPath(d,'value;ConfigData');

diff --git a/webroot/monitor/infrastructure/common/ui/js/views/DatabaseNodeScatterChartView.js b/webroot/monitor/infrastructure/common/ui/js/views/DatabaseNodeScatterChartView.js
@@ -97,8 +97,8 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
            var databaseNode = data.rawData;
            var tooltipData = [
               {
-                  label : 'Host Name',
-                  value : databaseNode['name']
+                  label : 'Version',
+                  value : databaseNode['version']
               },
               {
                   label : 'Disk Space',

diff --git a/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeSummaryGridView.js b/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeSummaryGridView.js
@@ -74,6 +74,13 @@ define(
                        minWidth:110,
                        sorter : comparatorIP
                    },
+                   {
+                       field:"version",
+                       id:"version",
+                       name:"Version",
+                       sortable:true,
+                       minWidth:110
+                   },
                    {
                        field:"status",
                        id:"status",