diff --git a/src/api/index.py b/src/api/index.py index 77470ae..950290d 100755 --- a/src/api/index.py +++ b/src/api/index.py @@ -102,8 +102,6 @@ def update_plan(uid,plan,auid=None): httpclient = requests.session() r = httpclient.post(url,headers=headers) #r = requests.post(url,headers=headers) - print url - print [r.text,r.status_code] return json.loads( r.text) except Exception,e: @@ -821,7 +819,6 @@ def InitCollector(): # The database name will be overriden by the user's current plan # #global class_write,class_read,CONFIG - print 'plan' in session,CONFIG['store']['args'] if 'plan' not in session : config = json.loads(json.dumps(CONFIG)) plan = config['plan'] @@ -1106,8 +1103,9 @@ def prepare_plot(id): q = [{"info":"Monitoring RAM consumption trends","ylabel":"% used","node":node, "x":XRAM,"labels":np.arange(1,xn).tolist(),"series":names,"title":"RAM Usage"}] q.append({"info":"Monitoring CPU consumption trends","ylabel":"% used","node":node,"type":"bar","x":XCPU,"labels":np.arange(1,xn_).tolist(),"series":names,"title":"CPU Usage"}) - key = 'app.trend.'+node + key = 'apps@'+node session[key] = q + print session.keys() return (key,200) except Exception,e: print (e) @@ -1118,9 +1116,14 @@ def prepare_plot(id): @app.route("/1/plot///",methods=['GET']) def get_charts(format,id,key): + print session.keys() + if key not in session : + context = SYS_ARGS.PARAMS['context'] if 'context' in SYS_ARGS.PARAMS else '' + return render_template('error.html',context=context,caption='404',msg='Session key NOT set in session') + remove = request.args['no'].split(',') if 'no' in request.args else [] series = ['series_1'] - + args = session[key] if isinstance(args,list) is False: args['remove'] = remove @@ -1150,7 +1153,7 @@ if __name__== '__main__': SESSION_PERMANENT=True app.config['SESSION_TYPE'] = 'filesystem' - app.config['MAX_CONTENT_LENGTH'] = 1600 * 1024 * 1024 + app.config['MAX_CONTENT_LENGTH'] = 9600 * 1024 * 1024 app.secret_key = '360-8y-[0v@t10n]+kr81v17y' if 'port' not in SYS_ARGS.PARAMS : SYS_ARGS.PARAMS['port'] = 8484 diff --git a/src/api/templates/dashboard/apps/summary.html b/src/api/templates/dashboard/apps/summary.html index bb420be..53a605c 100644 --- a/src/api/templates/dashboard/apps/summary.html +++ b/src/api/templates/dashboard/apps/summary.html @@ -248,7 +248,7 @@ }else{ - var uri = '/monitor/1/plot/apps' + var uri = '{{context|safe}}/1/plot/apps' var body = {node:_id.replace(/app_grid_/,'')} body.names = jx.utils.patterns.visitor(keys,function(id){ return selected[id].name @@ -260,7 +260,7 @@ if(x.status == 200){ var key = x.responseText.trim() - jx.modal.show({url:'/monitor/1/plot/html/line/'+key+'?draw-all' }) + jx.modal.show({url:'{{context|safe}}/1/plot/html/line/'+key+'?draw-all' }) }else{ console.log(x.status) } diff --git a/src/api/templates/error.html b/src/api/templates/error.html new file mode 100644 index 0000000..c670cc9 --- /dev/null +++ b/src/api/templates/error.html @@ -0,0 +1,52 @@ + + + + + + + + + +
+
+
+ + + + +
+ +
+
+
{{caption}}
+
{{msg}}
+
+
+ +
the-phi.com
+
+ + +
+ +