Closes-Bug:#1581650

Monitor infra config node page, 1)PUT/GET donut charts changed to Read/Write which include GET for read and PUT,POST,DELETE for write. 2)Label changes for charts. Change-Id: I67cf6b1f8e1994bd03e6e657d3d0c88bcb49ba36
Juniper · May 27, 2016 · bc80077 · bc80077
1 parent 8eaed98
commit bc80077
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeChartsView.js b/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeChartsView.js
@@ -27,7 +27,7 @@ define(['underscore', 'contrail-view',
                                view: "WidgetView",
                                viewConfig: {
                                    header: {
-                                       title: 'Request Served',
+                                       title: 'Request served',
                                    },
                                    controls: {
                                        top: {
@@ -43,7 +43,7 @@ define(['underscore', 'contrail-view',
                                brush: false,
                                height: 380,
                                xAxisLabel: 'Time (hrs)',
-                               yAxisLabel: 'Request Served',
+                               yAxisLabel: 'Requests Served',
                                yAxisOffset: 25,
                                axisLabelFontSize: 11,
                                tickPadding: 8,
@@ -130,7 +130,7 @@ define(['underscore', 'contrail-view',
                                            .append('text')
                                            .attr('dy', 8)
                                            .attr('text-anchor', 'end')
-                                           .text('Failure');
+                                           .text('Failures');
                                        var legend = legendWrap.selectAll('.contrail-slegend')
                                               .data(colorCodes)
                                               .enter()
@@ -166,7 +166,7 @@ define(['underscore', 'contrail-view',
                                view: "WidgetView",
                                viewConfig: {
                                    header: {
-                                       title: 'Response Parameters',
+                                       title: 'Response Statistics',
                                    },
                                    controls: {
                                        top: {
@@ -288,7 +288,7 @@ define(['underscore', 'contrail-view',
                                view: "WidgetView",
                                viewConfig: {
                                    header: {
-                                       title: 'Config Node',
+                                       title: 'Request Statistics',
                                    },
                                    controls: {
                                        top: {

diff --git a/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js b/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js
@@ -28,7 +28,9 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                         viewConfig: {
                             class: 'span6',
                             parseFn: function (response) {
-                                return monitorInfraParsers.parseConfigNodeRequestForDonutChart(response, 'GET');
+                                return monitorInfraParsers
+                                    .parseConfigNodeRequestForDonutChart(
+                                         response, ['GET']);
                             },
                             chartOptions: {
                                 height: 160,
@@ -38,7 +40,7 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                                     top: 10
                                 },
                                 showLabels: false,
-                                title: 'Put Request',
+                                title: 'Read',
                             },
                         }
                     }, {
@@ -47,7 +49,9 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                         viewConfig: {
                             class: 'span6',
                             parseFn: function (response) {
-                                return monitorInfraParsers.parseConfigNodeRequestForDonutChart(response, 'GET');
+                                return monitorInfraParsers
+                                    .parseConfigNodeRequestForDonutChart(
+                                         response, 'POST', 'PUT', 'DELETE');
                             },
                             chartOptions: {
                                 height: 160,
@@ -58,7 +62,7 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                                 },
                                 showLabels: false,
                                 showLegend: true,
-                                title: 'Get Request',
+                                title: 'Write',
                                 legendFn: function (data, svg, chart) {
                                     if (data != null && svg != null && chart != null) {
                                         $(svg).find('g.contrail-legendWrap').remove();