Skip to content

Commit

Permalink
Closes-Bug:#1581650
Browse files Browse the repository at this point in the history 
Changed the timestamp field from T to T= in sandesh message query in analytics node summary page chart
& fixed the legend showing color code instead of node name summary page charts.

Change-Id: Ibad6c7ad25f3737fdeeb464052fa263d79c96338
  • Loading branch information
@vishnuvv
vishnuvv committed Aug 5, 2016
1 parent e6c34c3 commit 9aa714e
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 11 deletions.
5 changes: 2 additions & 3 deletions webroot/monitor/infrastructure/analyticsnode/ui/js/models/AnalyticsNodeSandeshChartModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ define([
"table_name": "StatTable.SandeshMessageStat.msg_info",
"table_type": "STAT",
"query_prefix": "stat",
"time_range": "3600",
"from_time": Date.now() - (2 * 60 * 60 * 1000),
"from_time_utc": Date.now() - (2 * 60 * 60 * 1000),
"to_time": Date.now(),
"to_time_utc": Date.now(),
"select": "Source, T, UUID, msg_info.messages," +
" name",
"select": "Source, T=, SUM(msg_info.messages)",
"time_granularity": 150,
"time_granularity_unit": "secs",
"limit": "150000"
},
Expand Down
13 changes: 7 additions & 6 deletions webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,12 @@ define(

};

this.bucketizeConfigNodeStats = function (apiStats, bucketDuration, insertEmptyBuckets, queryJSON) {
this.bucketizeConfigNodeStats = function (apiStats, bucketDuration, insertEmptyBuckets, queryJSON, timeStampField) {
timeStampField = ifNull(timeStampField, 'T');
insertEmptyBuckets = ifNull(insertEmptyBuckets, true);
bucketDuration = ifNull(bucketDuration, monitorInfraConstants.CONFIGNODESTATS_BUCKET_DURATION);
var minMaxTS = d3.extent(apiStats,function(obj){
return obj['T'];
return obj[timeStampField];
});
if (insertEmptyBuckets && queryJSON != null
&& queryJSON['start_time'] && queryJSON['end_time']) {
Expand All @@ -715,7 +716,7 @@ define(
var buckets = {};
//Group nodes into buckets
$.each(apiStats,function(idx,obj) {
var xBucket = xBucketScale(obj['T']);
var xBucket = xBucketScale(obj[timeStampField]);
if(buckets[xBucket] == null) {
var timestampExtent = xBucketScale.invertExtent(xBucket);
buckets[xBucket] = {timestampExtent:timestampExtent,
Expand All @@ -741,10 +742,10 @@ define(
self.parseSandeshMessageStackChartData = function (apiStats, chartViewModel) {
var cf =crossfilter(apiStats);
var parsedData = [];
var timeStampField = 'T';
var timeStampField = 'T=';
var groupDim = cf.dimension(function(d) { return d["Source"];});
var tsDim = cf.dimension(function(d) { return d[timeStampField];});
var buckets = this.bucketizeConfigNodeStats(apiStats, null, null, chartViewModel.queryJSON);
var buckets = this.bucketizeConfigNodeStats(apiStats, null, null, chartViewModel.queryJSON, timeStampField);
var colorCodes = monitorInfraUtils.getMonitorInfraNodeColors(groupDim.group().all().length);
//Now parse this data to be usable in the chart
var parsedData = [];
Expand All @@ -756,7 +757,7 @@ define(
//Getting nodes group with msg_info.messages
var totalResMessages = groupDim.group().reduceSum(
function (d) {
return d['msg_info.messages'];
return d['SUM(msg_info.messages)'];
});
var totalResMessagesArr = totalResMessages.top(Infinity);
var totalResMessagesArrLen = totalResMessagesArr.length;
Expand Down
10 changes: 9 additions & 1 deletion webroot/monitor/infrastructure/common/ui/js/views/AnalyticsNodesSummaryChartsView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ define(['underscore', 'contrail-view',
if (self.model.isPrimaryRequestInProgress() == false
&& callBackExecuted == false) {
callBackExecuted = true;
analyticsNodeList = self.model.getItems();
if(self.model.loadedFromCache) {
var cacheObj = cowch.getDataFromCache(ctwl.CACHE_ANALYTICSNODE),
cacheListModel = getValueByJsonPath(cacheObj, 'dataObject;listModel');
if (cacheListModel != null) {
analyticsNodeList = cacheListModel.getItems();
}
} else {
analyticsNodeList = self.model.getItems();
}
var topleftColumn = self.$el.find(".top-container .left-column"),
toprightCoulmn = self.$el.find(".top-container .right-column"),
bottomleftColumn = self.$el.find(".bottom-container .left-column"),
Expand Down
10 changes: 9 additions & 1 deletion webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeChartsView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@ define(['underscore', 'contrail-view',
if (self.model.isPrimaryRequestInProgress() == false
&& callBackExecuted == false) {
callBackExecuted = true;
configNodeList = self.model.getItems();
if(self.model.loadedFromCache) {
var cacheObj = cowch.getDataFromCache(ctwl.CACHE_CONFIGNODE),
cacheListModel = getValueByJsonPath(cacheObj, 'dataObject;listModel');
if (cacheListModel != null) {
configNodeList = cacheListModel.getItems();
}
} else {
configNodeList = self.model.getItems();
}
var nodeColorMap = monitorInfraUtils.constructNodeColorMap(configNodeList);
var chartModel = new ConfigNodeChartsModel();
self.renderView4Config(self.$el, chartModel,
Expand Down

0 comments on commit 9aa714e

Please sign in to comment.