Merge "Partial-Bug: #1608793- DB Node UI changes" into R3.1

Juniper · Aug 4, 2016 · d187a50 · d187a50
2 parents f0bfe61 + 5bbda4b
commit d187a50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/webroot/common/ui/js/controller.labels.js b/webroot/common/ui/js/controller.labels.js
@@ -322,7 +322,7 @@ define([
         this.TITLE_CONFIGNODE_APISERVER_CPU_MEM_UTILIZATION = 'API Server CPU/Memory Utilization';
         this.TITLE_CONFIGNODE_SERVICE_MONITOR_CPU_MEM_UTILIZATION = 'Service Monitor CPU/Memory Utilization';
         this.TITLE_CONFIGNODE_SCHEMA_CPU_MEM_UTILIZATION = 'Schema CPU/Memory Utilization';
-        this.TITLE_DATABASENODE_DISK_USAGE = 'Database Node Disk Space Usage';
+        this.TITLE_DATABASENODE_DISK_USAGE = 'Disk Usage';
         /**ENDS Titles used in node details chart widget **/
 
         this.X_AXIS_TITLE_PORT = "Port";

diff --git a/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailPageView.js b/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailPageView.js
@@ -167,7 +167,7 @@ define([
                 [
                     {
                         key: 'databaseUsage',
-                        label: 'Database Usage',
+                        label: 'Disk Usage',
                         templateGenerator: 'TextGenerator'
                     },
                     {

diff --git a/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailsChartsView.js b/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailsChartsView.js
@@ -24,7 +24,7 @@ define([
             var detailsChartsTmpl = contrail.getTemplate4Id(cowc.NODE_DETAILS_CHARTS);
             self.$el.append(detailsChartsTmpl);
             this.infoBoxView = new NodeDetailsInfoboxesView({el:$(contentContainer).
-                find('#infoboxes-container'), widgetTitle:'Database Space Utilization'});
+                find('#infoboxes-container'), widgetTitle:'Resource Utilization'});
             var infoBoxList = getInfoboxesConfig({node:hostname});
             for(var i=0;i<infoBoxList.length;i++) {
                 this.infoBoxView.add(infoBoxList[i]);
@@ -35,10 +35,10 @@ define([
     function getInfoboxesConfig(config) {
         var databaseNodeDetailsChartListModel = new DatabaseNodeDetailsChartListModel(config);
         return [{
-            title: 'Database',
+            title: 'Disk Usage',
             prefix:'databaseCollector',
-            sparklineTitle1:'Disk Usage',
-            sparklineTitle2:'Analytics DB',
+            sparklineTitle1:'Used Space',
+            sparklineTitle2:'Analytics DB Size',
             sparkline1Dimension:'database_usage.disk_space_used_1k',
             sparkline2Dimension:'database_usage.analytics_db_size_1k',
             view: DatabaseNodeDetailsLineChartView,

diff --git a/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailsLineChartView.js b/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeDetailsLineChartView.js
@@ -33,12 +33,12 @@ define([
                                     parseFn: function (response) {
                                         var dimensions = ['database_usage.disk_space_used_1k',
                                                           'database_usage.analytics_db_size_1k'];
-                                        var axisLabels = ['Database Disk Usage', 'Analytics DB Size']
+                                        var axisLabels = ['Used Space', 'Analytics DB Size']
                                         var options = {dimensions:dimensions,axisLabels:axisLabels};
                                         return ctwp.parseLineChartDataForNodeDetails(response,options);
                                     },
                                     chartOptions: {
-                                        y1AxisLabel:'Database Disk Usage',
+                                        y1AxisLabel:'Used Space',
                                         y1Formatter: function (y1Value) {
                                             return formatBytes(y1Value * 1024, true);
                                         },