";}
+ try{
+ procStateList = jsonPath(ctrlNodeData,"$..NodeStatus.process_info")[0];
+ controlProcessStatusList = getStatusesForAllControlProcesses(procStateList);
+ }catch(e){}
+ var ctrlNodeDashboardInfo = [
+ {lbl:'Hostname', value:parsedData.name},
+ {lbl:'IP Address',value:(function(){
+ var ip = ifNullOrEmpty(getControlIpAddresses(ctrlNodeData,"details"),noDataStr);
+ return ip;
+ })()},
+ {lbl:'Overall Node Status', value:overallStatus},
+ {lbl:'Processes', value:" "},
+ {lbl:INDENT_RIGHT+'Control Node', value:(function(){
+ return ifNull(controlProcessStatusList['contrail-control'],noDataStr);
+ })()},
+ /*{lbl:INDENT_RIGHT+'Control Node Manager', value:(function(){
+ try{
+ return ifNull(controlProcessStatusList['contrail-control-nodemgr'],noDataStr);
+ }catch(e){return noDataStr;}
+ })()},*/
+ {lbl:'Ifmap Connection', value:(function(){
+ var cnfNode = '';
+ try{
+ var url = ctrlNodeData.BgpRouterState.ifmap_info.url;
+ if(url != null && url != undefined && url != ""){
+ var pos = url.indexOf(':8443');
+ if(pos != -1)
+ cnfNode = url.substr(0, pos);
+ pos = cnfNode.indexOf('https://');
+ if(pos != -1)
+ cnfNode = cnfNode.slice(pos + 8) ;
+ }
+ var status = ctrlNodeData.BgpRouterState.ifmap_info.connection_status;
+ var stateChangeAtTime = ctrlNodeData.BgpRouterState.ifmap_info.connection_status_change_at;
+ var stateChangeSince = "";
+ var statusString = "";
+ if(stateChangeAtTime != null){
+ var stateChangeAtTime = new XDate(stateChangeAtTime/1000);
+ var currTime = new XDate();
+ stateChangeSince = diffDates(stateChangeAtTime,currTime);
+ }
+ if(status != null && status != undefined && status != ""){
+ if(stateChangeSince != ""){
+ if(status.toLowerCase() == "up" || status.toLowerCase() == "down"){
+ status = status + " since";
+ }
+ statusString = status + " " + stateChangeSince;
+ } else {
+ statusString = status;
+ }
+ }
+ if(statusString != ""){
+ cnfNode = cnfNode.concat( ' (' + statusString + ')');
+ }
+ }catch (e){}
+ return ifNull(cnfNode,noDataStr);
+ })()},
+ {lbl:'Analytics Node', value:(function(){
+ var anlNode = noDataStr;
+ var secondaryAnlNode, status;
+ try{
+ //anlNode = ifNull(computeNodeData.VrouterAgent.collector,noDataStr);
+ anlNode = jsonPath(ctrlNodeData,"$..ModuleClientState..primary")[0].split(':')[0];
+ status = jsonPath(ctrlNodeData,"$..ModuleClientState..status")[0];
+ secondaryAnlNode = jsonPath(ctrlNodeData,"$..ModuleClientState..secondary")[0].split(':')[0];
+ }catch(e){
+ anlNode = "--";
+ }
+ try{
+ if(anlNode != null && anlNode != noDataStr && status.toLowerCase() == "established")
+ anlNode = anlNode.concat(' (Up)');
+ }catch(e){
+ if(anlNode != null && anlNode != noDataStr) {
+ anlNode = anlNode.concat(' (Down)');
+ }
+ }
+ if(secondaryAnlNode != null && secondaryAnlNode != "" && secondaryAnlNode != "0.0.0.0"){
+ anlNode.concat(', ' + secondaryAnlNode);
+ }
+ return ifNull(anlNode,noDataStr);
+ })()},
+ //TODO{lbl:'Config Messages', value:ctrlNodeData['configMessagesIn'] + ' In, ' + ctrlNodeData['configMessagesOut'] + ' Out'},
+ {lbl:'Analytics Messages', value:(function(){
+ var msgs = getAnalyticsMessagesCountAndSize(ctrlNodeData,['ControlNode']);
+ return msgs['count'] + ' [' + formatBytes(msgs['size']) + ']';
+ })()},
+ {lbl:'Peers', value:(function(){
+ var totpeers= 0,uppeers=0;
+ totpeers= ifNull(parsedData['totalBgpPeerCnt'],0);
+ uppeers = ifNull(parsedData['upBgpPeerCnt'],0);
+ var downpeers = 0;
+ if(totpeers > 0){
+ downpeers = totpeers - uppeers;
+ }
+ if (downpeers > 0){
+ downpeers = ", "+ downpeers +" Down";
+ } else {
+ downpeers = "";
+ }
+ return contrail.format('BGP Peers: {0} Total {1}',totpeers,downpeers);
+ })()},
+ {lbl:'',value:(function(){
+ var totXmppPeers = 0,upXmppPeers = 0,downXmppPeers = 0,subsCnt = 0;
+ totXmppPeers = parsedData['totalXMPPPeerCnt'];
+ upXmppPeers = parsedData['upXMPPPeerCnt'];
+ subsCnt = ifNull(jsonPath(ctrlNodeData,'$..BgpRouterState.ifmap_server_info.num_peer_clients')[0],0)
+ if(totXmppPeers > 0){
+ downXmppPeers = totXmppPeers - upXmppPeers;
+ }
+ if (downXmppPeers > 0){
+ downXmppPeers = ", "+ downXmppPeers +" Down";
+ } else {
+ downXmppPeers = "";
+ }
+ if (subsCnt > 0){
+ subsCnt = ", "+ subsCnt +" subscribed for configuration";
+ } else {
+ subsCnt = ""
+ }
+ return contrail.format('vRouters: {0} Established in Sync{1}{2} ',
+ upXmppPeers,downXmppPeers,subsCnt);
+ })()},
+ {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
+ {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
+ {lbl:'Version', value:parsedData['version'] != '-' ? parsedData['version'] : noDataStr},
+ {lbl:'Last Log', value: (function(){
+ var lmsg;
+ lmsg = getLastLogTimestamp(ctrlNodeData,"control");
+ if(lmsg != null){
+ try{
+ return new Date(parseInt(lmsg)/1000).toLocaleString();
+ }catch(e){return noDataStr;}
+ } else return noDataStr;
+ })()}
+ ];
+ }
+ return ctrlNodeDashboardInfo;
+}
+
+function getStatusesForAllControlProcesses(processStateList){
+ var ret = [];
+ if(processStateList != null){
+ for(var i=0; i < processStateList.length; i++){
+ var currProc = processStateList[i];
+ if(currProc.process_name == "contrail-control-nodemgr"){
+ ret['contrail-control-nodemgr'] = getProcessUpTime(currProc);
+ } else if(currProc.process_name == "contrail-control"){
+ ret['contrail-control'] = getProcessUpTime(currProc);
+ }
+ }
+ }
+ return ret;
+ }
+
+/*****\END Get label value pairs for Control Node details and detail template in summary *****/
+
+
+/**** Get label value pairs for vRouter Node details and detail template in summaryv****/
+function getvRouterDetailsLblValuePairs(parsedData) {
+ var computeNodeDashboardInfo = [];
+ var computeNodeData;
+ if(parsedData.raw_json != null && parsedData.raw_json.value){
+ computeNodeData = parsedData.raw_json.value;
+ }
+ if(computeNodeData != null){
+ var overallStatus = getOverallNodeStatusForDetails(parsedData);
+ var procStateList = getValueByJsonPath(computeNodeData,"NodeStatus;process_info");
+ var vRouterProcessStatusList = getStatusesForAllvRouterProcesses(procStateList);
+
+ computeNodeDashboardInfo = [
+ {lbl:'Hostname', value:parsedData.name},
+ {lbl:'IP Address', value:(function(){
+ return ifNullOrEmpty(getVrouterIpAddresses(computeNodeData,"details"),noDataStr);
+ })()},
+ {lbl:'Overall Node Status', value:overallStatus},
+ {lbl:'Processes', value:" "},
+ {lbl:INDENT_RIGHT+'vRouter Agent', value:(function(){
+ return ifNull(vRouterProcessStatusList['contrail-vrouter-agent'],noDataStr);
+ })()},
+ /*{lbl:INDENT_RIGHT+'vRouter Node Manager', value:(function(){
+ try{
+ return ifNull(vRouterProcessStatusList['contrail-vrouter-nodemgr'],noDataStr);
+ }catch(e){return noDataStr;}
+ })()},
+ {lbl:INDENT_RIGHT+'Openstack Nova Compute', value:(function(){
+ try{
+ return ifNull(vRouterProcessStatusList['openstack-nova-compute'],noDataStr);
+ }catch(e){return noDataStr;}
+ })()},*/
+ {lbl:'Analytics Node', value:(function(){
+ var anlNode = noDataStr;
+ var secondaryAnlNode, status;
+ try{
+ //anlNode = ifNull(computeNodeData.VrouterAgent.collector,noDataStr);
+ anlNode = jsonPath(computeNodeData,"$..ModuleClientState..primary")[0].split(':')[0];
+ status = jsonPath(computeNodeData,"$..ModuleClientState..status")[0];
+ secondaryAnlNode = jsonPath(computeNodeData,"$..ModuleClientState..secondary")[0].split(':')[0];
+ }catch(e){
+ anlNode = noDataStr;
+ }
+ try{
+ if(anlNode != null && anlNode != noDataStr && status.toLowerCase() == "established")
+ anlNode = anlNode.concat(' (Up)');
+ }catch(e){
+ if(anlNode != null && anlNode != noDataStr) {
+ anlNode = anlNode.concat(' (Down)');
+ }
+ }
+ if(secondaryAnlNode != null && secondaryAnlNode != "" && secondaryAnlNode != "0.0.0.0"){
+ anlNode.concat(', ' + secondaryAnlNode);
+ }
+ return ifNull(anlNode,noDataStr);
+ })()},
+ {lbl:'Control Nodes', value:(function(){
+ var peerList ;
+ try{
+ peerList = computeNodeData.VrouterAgent.xmpp_peer_list;
+ }catch(e){}
+ var nodeArr=noDataStr ;
+ if(peerList != null && peerList.length>0){
+ nodeArr = '';
+ var nodes = '';
+
+ for (var i=0; i< peerList.length;i++){
+ var node = '';
+ node = ''+ peerList[i].ip +'' ;
+
+ if(peerList[i].primary != null && peerList[i].primary == true){
+ if(peerList[i].status == true){
+ if((i+1) == peerList.length){//only primary present
+ node = node + "* (Up) " ;
+ } else {
+ node = node + "* (Up), " ;
+ }
+ } else {
+ node = "" + node + "* (Down), " ;
+ }
+ if(nodes == ''){
+ nodes = node;
+ } else {
+ nodes = node + nodes
+ }
+ } else {
+ if(peerList[i].status == true)
+ node = node + " (Up)" ;
+ else
+ node = "" + node + " (Down)" ;
+ if(node != ''){
+ nodes = nodes + node
+ } else {
+ nodes = node;
+ }
+ }
+ }
+ nodeArr = nodeArr + nodes + '
'
+ }
+ return nodeArr;
+ })(),clk:'url'},
+
+ //Best way to get the primary node - jsonPath(computeNodeData,'$.VrouterAgent.xmpp_peer_list[?(@.primary==true)].ip')},
+ {lbl:'Analytics Messages', value:(function(){
+ var msgs = getAnalyticsMessagesCountAndSize(computeNodeData,['VRouterAgent']);
+ return msgs['count'] + ' [' + formatBytes(msgs['size']) + ']';
+ })()},
+ {lbl:'XMPP Messages', value:(function(){
+ var xmppStatsList = getValueByJsonPath(computeNodeData,'VrouterStatsAgent;xmpp_stats_list',[]);
+ var inMsgs = outMsgs = 0;
+ for(var i = 0; i < xmppStatsList.length ; i++) {
+ inMsgs += getValueByJsonPath(xmppStatsList[i],'in_msgs',0);
+ outMsgs += getValueByJsonPath(xmppStatsList[i],'out_msgs',0);
+ }
+ return (inMsgs + ' In, ' + outMsgs + ' Out');
+ })()},
+ {lbl:'Flow Count', value:(function(){
+ return (getValueByJsonPath(computeNodeData,"VrouterStatsAgent;active_flows", noDataStr) + ' Active, ' +
+ getValueByJsonPath(computeNodeData,"VrouterStatsAgent;total_flows", noDataStr) + ' Total');
+ })()},
+ {lbl:'Networks', value:parsedData['vnCnt']},
+ {lbl:'Interfaces', value:(function(){
+ var downInts = parsedData['errorIntfCnt'];
+ var totInts = parsedData['intfCnt'];
+ var ret;
+ if(downInts > 0){
+ downInts = ", " + downInts + " Down";
+ } else {
+ downInts = "";
+ }
+ return totInts + " Total" + downInts;
+ })()},
+ {lbl:'Instances', value:parsedData['instCnt']},
+ {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
+ {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
+ {lbl:'Version', value:parsedData['version'] != '-' ? parsedData['version'] : noDataStr},
+ {lbl:'Last Log', value: (function(){
+ var lmsg;
+ lmsg = getLastLogTimestamp(computeNodeData,"compute");
+ if(lmsg != null){
+ try{
+ return new Date(parseInt(lmsg)/1000).toLocaleString();
+ }catch(e){return noDataStr;}
+ } else return noDataStr;
+ })()}
+ ];
+ }//if
+ return computeNodeDashboardInfo;
+}
+
+function getStatusesForAllvRouterProcesses(processStateList){
+ var ret = [];
+ if(processStateList != null){
+ for(var i=0; i < processStateList.length; i++){
+ var currProc = processStateList[i];
+ if(currProc.process_name == "contrail-vrouter-nodemgr"){
+ ret['contrail-vrouter-nodemgr'] = getProcessUpTime(currProc);
+ } else if (currProc.process_name == "openstack-nova-compute"){
+ ret['openstack-nova-compute'] = getProcessUpTime(currProc);
+ } else if (currProc.process_name == "contrail-vrouter-agent"){
+ ret['contrail-vrouter-agent'] = getProcessUpTime(currProc);
+ }
+ }
+ }
+ return ret;
+}
+
+
+/****\END Get label value pairs for vRouter Node details and detail template in summary****/
+
+/**** Get label value pairs for Analytics Node details and detail template in summary****/
+function getAnalyticsNodeLblValuePairs(parsedData){
+ var aNodeDashboardInfo = [];
+ var aNodeData = parsedData.raw_json;
+ var analyticsProcessStatusList = [];
+ var procStateList, overallStatus = noDataStr;
+
+ if(parsedData.raw_json != null && parsedData.raw_json.value){
+ aNodeData = parsedData.raw_json.value;
+ }
+ if(aNodeData != null){
+ overallStatus = getOverallNodeStatusForDetails(parsedData);
+ procStateList = getValueByJsonPath(aNodeData,"NodeStatus;process_info",[]);
+ analyticsProcessStatusList = getStatusesForAllAnalyticsProcesses(procStateList);
+ aNodeDashboardInfo = [
+ {lbl:'Hostname', value:parsedData.name},
+ {lbl:'IP Address', value:(function(){
+ var ips = '';
+ iplist = getValueByJsonPath(aNodeData,"CollectorState;self_ip_list",[]);
+ if(iplist != null && iplist.length>0){
+ for (var i=0; i< iplist.length;i++){
+ if(i+1 == iplist.length) {
+ ips = ips + iplist[i];
+ } else {
+ ips = ips + iplist[i] + ', ';
+ }
+ }
+ } else {
+ ips = noDataStr;
+ }
+ return ips;
+ })()},
+ {lbl:'Overall Node Status', value:overallStatus},
+ {lbl:'Processes', value:" "},
+ /*{lbl:INDENT_RIGHT+'Analytics Node Manager', value:(function(){
+ try{
+ return ifNull(analyticsProcessStatusList['contrail-analytics-nodemgr'],noDataStr);
+ }catch(e){return noDataStr;}
+ })()},*/
+ {lbl:INDENT_RIGHT+'Collector', value:(function(){
+ return ifNull(analyticsProcessStatusList['contrail-collector'],noDataStr);
+ })()},
+ {lbl:INDENT_RIGHT+'Query Engine', value:(function(){
+ return ifNull(analyticsProcessStatusList['contrail-query-engine'],noDataStr);
+ })()},
+ {lbl:INDENT_RIGHT+'OpServer', value:(function(){
+ return ifNull(analyticsProcessStatusList['contrail-analytics-api'],noDataStr);
+ })()},
+ /* {lbl:INDENT_RIGHT+'Redis Sentinel', value:(function(){
+ return ifNull(analyticsProcessStatusList['redis-sentinel'],noDataStr);
+ })()},*/
+ {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
+ {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
+ {lbl:'Messages', value:(function(){
+ var msgs = getAnalyticsMessagesCountAndSize(aNodeData,['Collector']);
+ return msgs['count'] + ' [' + formatBytes(msgs['size']) + ']';
+ })()},
+ {lbl:'Generators', value:(function(){
+ var ret='';
+ var genno;
+ try{
+ if(aNodeData.CollectorState["generator_infos"]!=null){
+ genno = aNodeData.CollectorState["generator_infos"].length;
+ };
+ ret = ret + ifNull(genno,noDataStr);
+ }catch(e){ return noDataStr;}
+ return ret;
+ })()},
+ {lbl:'Version', value:parsedData['version'] != '-' ? parsedData['version'] : noDataStr},
+ {lbl:'Last Log', value: (function(){
+ var lmsg;
+ lmsg = getLastLogTimestamp(aNodeData,"analytics");
+ if(lmsg != null){
+ try{
+ return new Date(parseInt(lmsg)/1000).toLocaleString();
+ }catch(e){return noDataStr;}
+ } else return noDataStr;
+ })()}
+ ];
+ }
+ return aNodeDashboardInfo;
+}
+
+function getStatusesForAllAnalyticsProcesses(processStateList){
+ var ret = [];
+ if(processStateList != null){
+ for(var i=0; i < processStateList.length; i++){
+ var currProc = processStateList[i];
+ if (currProc.process_name == "contrail-query-engine"){
+ ret['contrail-query-engine'] = getProcessUpTime(currProc);
+ } else if (currProc.process_name == "contrail-analytics-nodemgr"){
+ ret['contrail-analytics-nodemgr'] = getProcessUpTime(currProc);
+ } else if (currProc.process_name == "contrail-analytics-api"){
+ ret['contrail-analytics-api'] = getProcessUpTime(currProc);
+ } else if (currProc.process_name == "contrail-collector"){
+ ret['contrail-collector'] = getProcessUpTime(currProc);
+ }
+ }
+ }
+ return ret;
+}
+/****\END Get label value pairs for Analytics Node details and detail template in summaryv****/
+
+/**** Get label value pairs for Config Node details and detail template in summary****/
+function getConfigNodeLblValuePairs(parsedData){
+ var confNodeDashboardInfo = [];
+ var confNodeData = parsedData.raw_json;
+ var analyticsProcessStatusList = [];
+
+ if(parsedData.raw_json != null && parsedData.raw_json.value){
+ confNodeData = parsedData.raw_json.value;
+ }
+ if(confNodeData != null){
+ var procStateList, overallStatus = noDataStr;
+ var configProcessStatusList = [];
+ overallStatus = getOverallNodeStatusForDetails(parsedData);
+ procStateList = getValueByJsonPath(confNodeData,"configNode;NodeStatus;process_info",[]);
+ if(!(procStateList instanceof Array)){
+ procStateList = [procStateList];
+ }
+ configProcessStatusList = getStatusesForAllConfigProcesses(procStateList);
+ confNodeDashboardInfo = [
+ {lbl:'Hostname', value:parsedData.name},
+ {lbl:'IP Address', value:(function (){
+ var ips = '';
+ try{
+ iplist = getValueByJsonPath(confNodeData,"configNode;ModuleCpuState;config_node_ip",[]);
+ if(iplist instanceof Array){
+ nodeIp = iplist[0];//using the first ip in the list for status
+ } else {
+ nodeIp = iplist;
+ }
+ } catch(e){return noDataStr;}
+ if(iplist != null && iplist != noDataStr && iplist.length>0){
+ for (var i=0; i< iplist.length;i++){
+ if(i+1 == iplist.length) {
+ ips = ips + iplist[i];
+ } else {
+ ips = ips + iplist[i] + ', ';
+ }
+ }
+ } else {
+ ips = noDataStr;
+ }
+ return ips;
+ })()},
+ {lbl:'Overall Node Status', value:overallStatus},
+ {lbl:'Processes', value:" "},
+ {lbl:INDENT_RIGHT+'API Server', value:(function(){
+ return configProcessStatusList['contrail-api'];
+ })()},
+ {lbl:INDENT_RIGHT+'Schema Transformer', value:(function(){
+ return configProcessStatusList['contrail-schema'];
+ })()},
+ {lbl:INDENT_RIGHT+'Service Monitor', value:(function(){
+ return configProcessStatusList['contrail-svc-monitor'];
+ })()},
+ /*{lbl:INDENT_RIGHT+'Config Node Manager', value:(function(){
+ return ifNull(configProcessStatusList['contrail-config-nodemgr'],noDataStr);
+ })()},*/
+ {lbl:INDENT_RIGHT+'Discovery', value:(function(){
+ return ifNull(configProcessStatusList['contrail-discovery'],noDataStr);
+ })()},
+ /* {lbl:INDENT_RIGHT+'Zookeeper', value:(function(){
+ return ifNull(configProcessStatusList['contrail-zookeeper'],noDataStr);
+ })()},*/
+ {lbl:INDENT_RIGHT+'Ifmap', value:(function(){
+ return ifNull(configProcessStatusList['ifmap'],noDataStr);
+ })()},
+ {lbl:'Analytics Node', value:(function(){
+ var anlNode = noDataStr;
+ var secondaryAnlNode, status;
+ try{
+ //anlNode = ifNull(computeNodeData.VrouterAgent.collector,noDataStr);
+ anlNode = jsonPath(confNodeData,"$..ModuleClientState..primary")[0].split(':')[0];
+ status = jsonPath(confNodeData,"$..ModuleClientState..status")[0];
+ secondaryAnlNode = ifNull(jsonPath(confNodeData,"$..ModuleClientState..secondary")[0],"").split(':')[0];
+ }catch(e){
+ anlNode = "--";
+ }
+ try{
+ if(anlNode != null && anlNode != noDataStr && status.toLowerCase() == "established")
+ anlNode = anlNode.concat(' (Up)');
+ }catch(e){
+ if(anlNode != null && anlNode != noDataStr) {
+ anlNode = anlNode.concat(' (Down)');
+ }
+ }
+ if(secondaryAnlNode != null && secondaryAnlNode != "" && secondaryAnlNode != "0.0.0.0"){
+ anlNode.concat(', ' + secondaryAnlNode);
+ }
+ return ifNull(anlNode,noDataStr);
+ })()},
+ // {lbl:'Analytics Messages', value:(function(){return (parseInt(confNodeData.ApiServer.ModuleServerState["generator_info"]["connect_time"])
+ // > parseInt(confNodeData.ModuleServerState["generator_info"]["reset_time"]))?"Up":"Down"})()},
+ {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
+ {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
+ {lbl:'Version', value:parsedData['version'] != '-' ? parsedData['version'] : noDataStr},
+ {lbl:'Last Log', value: (function(){
+ var lmsg;
+ lmsg = getLastLogTimestamp(confNodeData,"config");
+ if(lmsg != null){
+ try{
+ return new Date(parseInt(lmsg)/1000).toLocaleString();
+ }catch(e){return noDataStr;}
+ } else return noDataStr;
+ })()}
+ ];
+ }
+ return confNodeDashboardInfo;
+}
+
+/****\END Get label value pairs for Config Node details and detail template in summary****/
diff --git a/webroot/monitor/infra/confignode/api/confignode.api.js b/webroot/monitor/infra/confignode/api/confignode.api.js
index 500e29603..7e51bf431 100644
--- a/webroot/monitor/infra/confignode/api/confignode.api.js
+++ b/webroot/monitor/infra/confignode/api/confignode.api.js
@@ -69,7 +69,7 @@ function getConfigNodesSummary (req, res, appData)
var reqUrl = '/analytics/uves/config-node';
var postData = {};
- postData['cfilt'] = ['ModuleCpuState'];
+ postData['cfilt'] = ['ModuleCpuState','NodeStatus'];
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_POST,
postData, opApiServer, null, appData);
if (null != addGen) {
diff --git a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
index a62cc3a10..46d391f3f 100644
--- a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
+++ b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
@@ -61,102 +61,9 @@ monitorInfraConfigDetailsClass = (function() {
memory = "N/A",
confNodeDashboardInfo, oneMinCPU, fiveMinCPU, fifteenMinCPU,
usedMemory, totalMemory;
- var procStateList, overallStatus = noDataStr;
- var configProcessStatusList = [];
+
var statusTemplate = contrail.getTemplate4Id("statusTemplate");
- overallStatus = getOverallNodeStatusForDetails(parsedData);
- procStateList = getValueByJsonPath(confNodeData,"configNode;ModuleCpuState;process_state_list",[]);
- if(!(procStateList instanceof Array)){
- procStateList = [procStateList];
- }
- configProcessStatusList = getStatusesForAllConfigProcesses(procStateList);
- confNodeDashboardInfo = [
- {lbl:'Hostname', value:obj['name']},
- {lbl:'IP Address', value:(function (){
- var ips = '';
- try{
- iplist = getValueByJsonPath(confNodeData,"configNode;ModuleCpuState;config_node_ip",[]);
- if(iplist instanceof Array){
- nodeIp = iplist[0];//using the first ip in the list for status
- } else {
- nodeIp = iplist;
- }
- } catch(e){return noDataStr;}
- if(iplist != null && iplist != noDataStr && iplist.length>0){
- for (var i=0; i< iplist.length;i++){
- if(i+1 == iplist.length) {
- ips = ips + iplist[i];
- } else {
- ips = ips + iplist[i] + ', ';
- }
- }
- } else {
- ips = noDataStr;
- }
- return ips;
- })()},
- {lbl:'Version', value:parsedData['version'] != '-' ? parsedData['version'] : noDataStr},
- {lbl:'Overall Node Status', value:overallStatus},
- {lbl:'Processes', value:" "},
- {lbl:INDENT_RIGHT+'API Server', value:(function(){
- return configProcessStatusList['contrail-api'];
- })()},
- {lbl:INDENT_RIGHT+'Schema Transformer', value:(function(){
- return configProcessStatusList['contrail-schema'];
- })()},
- {lbl:INDENT_RIGHT+'Service Monitor', value:(function(){
- return configProcessStatusList['contrail-svc-monitor'];
- })()},
- /*{lbl:INDENT_RIGHT+'Config Node Manager', value:(function(){
- return ifNull(configProcessStatusList['contrail-config-nodemgr'],noDataStr);
- })()},*/
- {lbl:INDENT_RIGHT+'Discovery', value:(function(){
- return ifNull(configProcessStatusList['contrail-discovery'],noDataStr);
- })()},
- /* {lbl:INDENT_RIGHT+'Zookeeper', value:(function(){
- return ifNull(configProcessStatusList['contrail-zookeeper'],noDataStr);
- })()},*/
- {lbl:INDENT_RIGHT+'Ifmap', value:(function(){
- return ifNull(configProcessStatusList['ifmap'],noDataStr);
- })()},
- {lbl:'Analytics Node', value:(function(){
- var anlNode = noDataStr;
- var secondaryAnlNode, status;
- try{
- //anlNode = ifNull(computeNodeData.VrouterAgent.collector,noDataStr);
- anlNode = jsonPath(confNodeData,"$..ModuleClientState..primary")[0].split(':')[0];
- status = jsonPath(confNodeData,"$..ModuleClientState..status")[0];
- secondaryAnlNode = ifNull(jsonPath(confNodeData,"$..ModuleClientState..secondary")[0],"").split(':')[0];
- }catch(e){
- anlNode = "--";
- }
- try{
- if(anlNode != null && anlNode != noDataStr && status.toLowerCase() == "established")
- anlNode = anlNode.concat(' (Up)');
- }catch(e){
- if(anlNode != null && anlNode != noDataStr) {
- anlNode = anlNode.concat(' (Down)');
- }
- }
- if(secondaryAnlNode != null && secondaryAnlNode != "" && secondaryAnlNode != "0.0.0.0"){
- anlNode.concat(', ' + secondaryAnlNode);
- }
- return ifNull(anlNode,noDataStr);
- })()},
- // {lbl:'Analytics Messages', value:(function(){return (parseInt(confNodeData.ApiServer.ModuleServerState["generator_info"]["connect_time"])
- // > parseInt(confNodeData.ModuleServerState["generator_info"]["reset_time"]))?"Up":"Down"})()},
- {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
- {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
- {lbl:'Last Log', value: (function(){
- var lmsg;
- lmsg = getLastLogTimestamp(confNodeData,"config");
- if(lmsg != null){
- try{
- return new Date(parseInt(lmsg)/1000).toLocaleString();
- }catch(e){return noDataStr;}
- } else return noDataStr;
- })()}
- ]
+ confNodeDashboardInfo = getConfigNodeLblValuePairs(parsedData);
/*Selenium Testing*/
confNodeDetailsData = confNodeDashboardInfo;
/*End of Selenium Testing*/
diff --git a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js
index cf85d55fa..6b3ccbfc6 100644
--- a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js
+++ b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js
@@ -29,7 +29,29 @@ monitorInfraConfigSummaryClass = (function() {
autoHeight : true,
enableAsyncPostRender:true,
forceFitColumns:true,
- lazyLoading:true
+ lazyLoading:true,
+ detail:{
+ template: $("#gridDetailTemplate").html(),
+ onExpand: function (e,dc) {
+ var detailTemplate = contrail.getTemplate4Id('infra-summary-details-template');
+ var rowData = e.data;
+ var grid = $(e['target']).closest('div.contrail-grid');
+ var dataItem = dc;
+ var data = getConfigNodeLblValuePairs(dc);
+ data = {d:data};
+ //Issue a call for fetching the details
+ if(data != null) {
+ e.detailRow.find('.row-fluid.advancedDetails').html('' + syntaxHighlight(dc.raw_json) + '
' + syntaxHighlight(dc.raw_json) + '
';
- var nodes = '';
-
- for (var i=0; i< peerList.length;i++){
- var node = '';
- node = ''+ peerList[i].ip +'' ;
-
- if(peerList[i].primary != null && peerList[i].primary == true){
- if(peerList[i].status == true){
- if((i+1) == peerList.length){//only primary present
- node = node + "* (Up) " ;
- } else {
- node = node + "* (Up), " ;
- }
- } else {
- node = "" + node + "* (Down), " ;
- }
- if(nodes == ''){
- nodes = node;
- } else {
- nodes = node + nodes
- }
- } else {
- if(peerList[i].status == true)
- node = node + " (Up)" ;
- else
- node = "" + node + " (Down)" ;
- if(node != ''){
- nodes = nodes + node
- } else {
- nodes = node;
- }
- }
- }
- nodeArr = nodeArr + nodes + '
'
- }
- return nodeArr;
- })(),clk:'url'},
-
- //Best way to get the primary node - jsonPath(computeNodeData,'$.VrouterAgent.xmpp_peer_list[?(@.primary==true)].ip')},
- {lbl:'Analytics Messages', value:(function(){
- var msgs = getAnalyticsMessagesCountAndSize(computeNodeData,['VRouterAgent']);
- return msgs['count'] + ' [' + formatBytes(msgs['size']) + ']';
- })()},
- {lbl:'XMPP Messages', value:(function(){
- var xmppStatsList = getValueByJsonPath(computeNodeData,'VrouterStatsAgent;xmpp_stats_list',[]);
- var inMsgs = outMsgs = 0;
- for(var i = 0; i < xmppStatsList.length ; i++) {
- inMsgs += getValueByJsonPath(xmppStatsList[i],'in_msgs',0);
- outMsgs += getValueByJsonPath(xmppStatsList[i],'out_msgs',0);
- }
- return (inMsgs + ' In, ' + outMsgs + ' Out');
- })()},
- {lbl:'Flow Count', value:(function(){
- return (getValueByJsonPath(computeNodeData,"VrouterStatsAgent;active_flows", noDataStr) + ' Active, ' +
- getValueByJsonPath(computeNodeData,"VrouterStatsAgent;total_flows", noDataStr) + ' Total');
- })()},
- {lbl:'Networks', value:parsedData['vnCnt']},
- {lbl:'Interfaces', value:(function(){
- var downInts = parsedData['errorIntfCnt'];
- var totInts = parsedData['intfCnt'];
- var ret;
- if(downInts > 0){
- downInts = ", " + downInts + " Down";
- } else {
- downInts = "";
- }
- return totInts + " Total" + downInts;
- })()},
- {lbl:'Instances', value:parsedData['instCnt']},
- {lbl:'CPU', value:$.isNumeric(parsedData['cpu']) ? parsedData['cpu'] + ' %' : noDataStr},
- {lbl:'Memory', value:parsedData['memory'] != '-' ? parsedData['memory'] : noDataStr},
- {lbl:'Last Log', value: (function(){
- var lmsg;
- lmsg = getLastLogTimestamp(computeNodeData,"compute");
- if(lmsg != null){
- try{
- return new Date(parseInt(lmsg)/1000).toLocaleString();
- }catch(e){return noDataStr;}
- } else return noDataStr;
- })()}
- ]
+ computeNodeDashboardInfo = getvRouterDetailsLblValuePairs(parsedData);
var cores=getCores(computeNodeData);
for(var i=0;i' + syntaxHighlight(dc.raw_json) + '
');
+ //DataItem consists of row data,passing it as a parameter to the parsefunction
+ e.detailRow.find('.row-fluid.basicDetails').html(detailTemplate(data));
+ $(grid).data('contrailGrid').adjustDetailRowHeight(dataItem['id']);
+ } else {
+ e.detailRow.find('.row-fluid.basicDetails').html(detailTemplate(data));
+ }
+ },
+ onCollapse:function (e,dc) {
+ }
+ }
},
dataSource: {
dataView: vRoutersDataSource,
@@ -223,7 +245,10 @@ monitorInfraComputeSummaryClass = (function() {
{
field:"name",
name:"Host name",
- minWidth:110,
+ minWidth:175,
+ sortable : {
+ sortBy: 'formattedValue'
+ },
formatter:function(r,c,v,cd,dc) {
return cellTemplateLinks({cellText:'name',name:'name',statusBubble:true,rowData:dc});
},
@@ -254,11 +279,6 @@ monitorInfraComputeSummaryClass = (function() {
}
},
},
- {
- field:"version",
- name:"Version",
- minWidth:110
- },
{
field:"status",
name:"Status",
@@ -276,6 +296,29 @@ monitorInfraComputeSummaryClass = (function() {
}
},
},
+ {
+ field:"vnCnt",
+ name:"Networks",
+ minWidth:70
+ },
+ {
+ field:"instCnt",
+ name:"Instances",
+ minWidth:70
+ },
+ {
+ field:"intfCnt",
+ name:"Interfaces",
+ formatter:function(r,c,v,cd,dc){
+ return contrail.format("{0} Total{1}",dc['intfCnt'],dc['errorIntfCntText']);
+ },
+ minWidth:70
+ },
+ {
+ field:"version",
+ name:"Version",
+ minWidth:110
+ },
{
field:"cpu",
name:"CPU (%)",
@@ -288,35 +331,17 @@ monitorInfraComputeSummaryClass = (function() {
return d['cpu'];
},
exportConfig: {
- allow: true,
- advFormatter: function(dc) {
- return dc.cpu;
- }
- },
+ allow: true,
+ advFormatter: function(dc) {
+ return dc.cpu;
+ }
+ },
},
{
field:"memory",
name:"Memory",
minWidth:110
- },
- {
- field:"vnCnt",
- name:"Networks",
- minWidth:100
- },
- {
- field:"instCnt",
- name:"Instances",
- minWidth:100
- },
- {
- field:"intfCnt",
- name:"Interfaces",
- formatter:function(r,c,v,cd,dc){
- return contrail.format("{0} Total{1}",dc['intfCnt'],dc['errorIntfCntText']);
- },
- minWidth:150
- },
+ }
],
}
});
diff --git a/webroot/monitor/tenant-network/common/ui/js/tenant_monitor_utils.js b/webroot/monitor/tenant-network/common/ui/js/tenant_monitor_utils.js
index 9f54f87e7..86020f145 100644
--- a/webroot/monitor/tenant-network/common/ui/js/tenant_monitor_utils.js
+++ b/webroot/monitor/tenant-network/common/ui/js/tenant_monitor_utils.js
@@ -1226,11 +1226,10 @@ function portSummaryRenderer() {
portData = tenantNetworkMonitorUtils.parsePortDistribution(portData,$.extend({startTime:portDistributionParams['startTime'],endTime:portDistributionParams['endTime'],
bandwidthField:'bytes',flowCntField:'flowCnt',portField:'port',startPort:startPort,endPort:endPort},{portType:obj['portType']}));
- var retObj = {d:[{key:'Source Port',values:portData}],
- forceX:[startPort,endPort],xLblFormat:d3.format(''),yDataType:'bytes',fqName:obj['fqName'],
- yLbl:'Bandwidth',link:{hashParams:{q:{view:'list',type:'project',fqName:obj['fqName'],context:'domain'}}},
- chartOptions:{tooltipFn:tenantNetworkMonitor.portTooltipFn},title:'Port Distribution',xLbl:'Port'
- }
+ var retObj = {d:[{key:'Source Port',values:portData}],fqName:obj['fqName'],
+ link:{hashParams:{q:{view:'list',type:'project',fqName:obj['fqName'],context:'domain'}}},
+ chartOptions:{tooltipFn:tenantNetworkMonitor.portTooltipFn,forceX:[startPort,endPort],xLblFormat:d3.format(''),
+ yDataType:'bytes',yLbl:'Bandwidth',xLbl:'Port'},title:'Port Distribution'};
return retObj;
}
}];
diff --git a/webroot/monitor/tenant-network/common/ui/views/tenant_monitor_common.view b/webroot/monitor/tenant-network/common/ui/views/tenant_monitor_common.view
index a39201981..0c926fa1c 100644
--- a/webroot/monitor/tenant-network/common/ui/views/tenant_monitor_common.view
+++ b/webroot/monitor/tenant-network/common/ui/views/tenant_monitor_common.view
@@ -7,45 +7,6 @@
-
-