diff --git a/src/monitor.py b/src/monitor.py index f8917a8..23f84a3 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -68,7 +68,7 @@ class Container_Collector(threading.Thread): else: self.cpu_quota[container_name] = tmp/100000.0 quota = {'cpu':self.cpu_quota[container_name],'memory':self.mem_quota[container_name]} - logger.info(quota) + #logger.info(quota) self.etcdser.setkey('/vnodes/%s/quota'%(container_name),quota) else: logger.error("Cant't find config file %s"%(confpath)) diff --git a/web/static/js/plot_monitor.js b/web/static/js/plot_monitor.js index 7391d64..53fcc3b 100755 --- a/web/static/js/plot_monitor.js +++ b/web/static/js/plot_monitor.js @@ -158,12 +158,12 @@ var host = window.location.host; var node_name = $("#node_name").html(); var url = "http://" + host + "/monitor/vnodes/" + node_name; -plot_graph($("#mem-chart"),url + "/mem_use",processMemData,getMemY); -plot_graph($("#cpu-chart"),url + "/cpu_use",processCpuData,getCpuY); +plot_graph($("#mem-chart"),url + "/mem_use/",processMemData,getMemY); +plot_graph($("#cpu-chart"),url + "/cpu_use/",processCpuData,getCpuY); function processDiskData() { - $.post(url+"/disk_use",{},function(data){ + $.post(url+"/disk_use/",{},function(data){ var diskuse = data.monitor.disk_use; var usedp = diskuse.percent; var total = diskuse.total/1024.0/1024.0; diff --git a/web/static/js/plot_monitorReal.js b/web/static/js/plot_monitorReal.js index 6237fd2..b85cc6a 100755 --- a/web/static/js/plot_monitorReal.js +++ b/web/static/js/plot_monitorReal.js @@ -190,8 +190,8 @@ var host = window.location.host; var com_ip = $("#com_ip").html(); var url = "http://" + host + "/monitor/hosts/"+com_ip; -plot_graph($("#mem-chart"), url + "/meminfo",processMemData,getMemY); -plot_graph($("#cpu-chart"), url + "/cpuinfo",processCpuData,getCpuY); +plot_graph($("#mem-chart"), url + "/meminfo/",processMemData,getMemY); +plot_graph($("#cpu-chart"), url + "/cpuinfo/",processCpuData,getCpuY); //plot_graph($("#disk-chart"), url + "/diskinfo",processDiskData,getDiskY); -$.post(url+"/diskinfo",{user:"root",key:"unias"},processDiskData,"json"); +$.post(url+"/diskinfo/",{user:"root",key:"unias"},processDiskData,"json"); diff --git a/web/templates/monitor/hosts.html b/web/templates/monitor/hosts.html index afbe6af..c080940 100644 --- a/web/templates/monitor/hosts.html +++ b/web/templates/monitor/hosts.html @@ -78,7 +78,7 @@ { var MB = 1024; - $.post(url+"/status",{},function(data){ + $.post(url+"/status/",{},function(data){ var status = data.monitor.status; if(status == 'RUNNING') { @@ -95,7 +95,7 @@ tmp.html("Stopped"); } - $.post(url+"/containers",{},function(data){ + $.post(url+"/containers/",{},function(data){ var containers = data.monitor.containers; $("#"+index+"_contotal").html(containers.total); $("#"+index+"_conrunning").html(containers.running); @@ -109,20 +109,20 @@ return; } - $.post(url+"/cpuinfo",{},function(data){ + $.post(url+"/cpuinfo/",{},function(data){ var idle = data.monitor.cpuinfo.idle; var usedp = (100 - idle).toFixed(2); $("#"+index+"_cpu").html(String(usedp)+"%"); },"json"); - $.post(url+"/meminfo",{},function(data){ + $.post(url+"/meminfo/",{},function(data){ var used = data.monitor.meminfo.used; var total = data.monitor.meminfo.total; var usedp = String(((used/total)*100).toFixed(2))+"%"; $("#"+index+"_mem").html(usedp); },"json"); - $.post(url+"/diskinfo",{},function(data){ + $.post(url+"/diskinfo/",{},function(data){ var val = data.monitor.diskinfo; var usedp = val[0].percent; $("#"+index+"_disk").html(String(usedp)+"%"); diff --git a/web/templates/monitor/hostsConAll.html b/web/templates/monitor/hostsConAll.html index c2302f5..8c72631 100644 --- a/web/templates/monitor/hostsConAll.html +++ b/web/templates/monitor/hostsConAll.html @@ -85,7 +85,7 @@ function update(url,index) { - $.post(url+"/basic_info",{},function(data){ + $.post(url+"/basic_info/",{},function(data){ var state = data.monitor.basic_info.State; if(state == 'RUNNING') { @@ -109,13 +109,13 @@ return; } - $.post(url+"/cpu_use",{},function(data){ + $.post(url+"/cpu_use/",{},function(data){ var val = data.monitor.cpu_use.val; var unit = data.monitor.cpu_use.unit; $("#"+index+"_cpu").html(val +" "+ unit); },"json"); - $.post(url+"/mem_use",{},function(data){ + $.post(url+"/mem_use/",{},function(data){ var val = data.monitor.mem_use.val; var unit = data.monitor.mem_use.unit $("#"+index+"_mem").html(val+" "+unit); diff --git a/web/templates/monitor/status.html b/web/templates/monitor/status.html index 133a390..e8c1dac 100644 --- a/web/templates/monitor/status.html +++ b/web/templates/monitor/status.html @@ -122,7 +122,7 @@ function update(url,index) { - $.post(url+"/basic_info",{},function(data){ + $.post(url+"/basic_info/",{},function(data){ var state = data.monitor.basic_info.State; if(state == 'RUNNING') { @@ -146,7 +146,7 @@ return; } - $.post(url+"/cpu_use",{},function(data){ + $.post(url+"/cpu_use/",{},function(data){ var usedp = data.monitor.cpu_use.usedp; var quota = data.monitor.cpu_use.quota.cpu; var quotaout = "("+quota; @@ -157,7 +157,7 @@ $("#"+index+"_cpu").html((usedp/0.01).toFixed(2)+"%
"+quotaout); },"json"); - $.post(url+"/mem_use",{},function(data){ + $.post(url+"/mem_use/",{},function(data){ var usedp = data.monitor.mem_use.usedp; var unit = data.monitor.mem_use.unit; var quota = data.monitor.mem_use.quota.memory/1024.0; @@ -166,7 +166,7 @@ $("#"+index+"_mem").html((usedp/0.01).toFixed(2)+"%
"+out); },"json"); - $.post(url+"/disk_use",{},function(data){ + $.post(url+"/disk_use/",{},function(data){ var diskuse = data.monitor.disk_use; var usedp = diskuse.percent; var total = diskuse.total/1024.0/1024.0; diff --git a/web/web.py b/web/web.py index 40cb709..22e7efe 100755 --- a/web/web.py +++ b/web/web.py @@ -265,8 +265,8 @@ def statusRealtime(vcluster_name,node_name): statusRealtimeView.node_name = node_name return statusRealtimeView.as_view() -@app.route("/monitor/hosts//", methods=['POST']) -@app.route("/monitor/vnodes//", methods=['POST']) +@app.route("/monitor/hosts///", methods=['POST']) +@app.route("/monitor/vnodes///", methods=['POST']) @login_required def monitor_request(comid,infotype): data = {