Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/app/livestats: fix load diagram, improvements for diagram layout, fix menu order

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-10-20 19:00:17 +00:00
parent c951eeb008
commit 174e045fb4
5 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
View file

@ -25,7 +25,6 @@ function Graph(container, id, options, transform) {
} }
Graph.prototype.addDataset = function(name, ds) { Graph.prototype.addDataset = function(name, ds) {
if( window.console ) console.debug("AddDataset: " + name);
if( !this.layout ) { if( !this.layout ) {
this.layout = new PlotKit.Layout( this.type, this.options ); this.layout = new PlotKit.Layout( this.type, this.options );
} }
@ -41,7 +40,6 @@ Graph.prototype.addDataset = function(name, ds) {
} }
Graph.prototype.updateDataset = function(name, value) { Graph.prototype.updateDataset = function(name, value) {
if( window.console ) console.debug("UpdateDataset: " + name + " " + value);
if( this.dataset[name] ) { if( this.dataset[name] ) {
var ds = this.dataset[name]; var ds = this.dataset[name];
@ -140,39 +138,37 @@ GraphRPC.prototype.dispatchResponse = function(response) {
this.graphs[gid].updateDataset( this.graphs[gid].updateDataset(
name, instance name, instance
? response[instance][this.ds[i]] ? response[instance][this.ds[i]]
: response[parseInt(this.ds[i])] : response[this.ds[i]]
); );
this.graphs[gid].redraw(); this.graphs[gid].redraw();
} }
} }
} }
else { else {
if( !this.graphs[instance] ) { var gid = instance || 'livegraph';
this.graphs[instance] = new Graph( if( !this.graphs[gid] ) {
this.container, instance, this.options, this.transform this.graphs[gid] = new Graph(
this.container, gid, this.options, this.transform
); );
if( window.console ) console.debug("NG: " + instance);
for( var i = 0; i < this.ds.length; i += 2 ) { for( var i = 0; i < this.ds.length; i += 2 ) {
var name = this.ds[i+1] || this.ds[i]; var name = this.ds[i+1] || this.ds[i];
if( window.console ) console.debug("ADS: " + name); this.graphs[gid].addDataset(name);
this.graphs[instance].addDataset(name);
} }
this.graphs[instance].draw(); this.graphs[gid].draw();
} }
else { else {
for( var i = 0; i < this.ds.length; i += 2 ) { for( var i = 0; i < this.ds.length; i += 2 ) {
var name = this.ds[i+1] || this.ds[i]; var name = this.ds[i+1] || this.ds[i];
if( window.console ) console.debug("UDS: " + name + " " + response[instance][this.ds[i]]); this.graphs[gid].updateDataset(
this.graphs[instance].updateDataset(
name, instance name, instance
? response[instance][this.ds[i]] ? response[instance][this.ds[i]]
: response[parseInt(this.ds[i])] : response[this.ds[i]]
); );
} }
this.graphs[instance].redraw(); this.graphs[gid].redraw();
} }
} }
} }

6
applications/luci-livestats/luasrc/controller/livestats.lua
View file

@ -19,7 +19,7 @@ function index()
require("luci.i18n") require("luci.i18n")
luci.i18n.loadc("livestats") luci.i18n.loadc("livestats")
entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestat_wireless", "Live Wireless Statistics") ).i18n = "livestat" entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestat_wireless", "Live Wireless Statistics"), 90 ).i18n = "livestat"
entry( {"admin", "status", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestat_traffic", "Live Traffic Statistics") ).i18n = "livestat" entry( {"admin", "status", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestat_traffic", "Live Traffic Statistics"), 91 ).i18n = "livestat"
entry( {"admin", "status", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestat_loadavg", "Live Load Statistics") ).i18n = "livestat" entry( {"admin", "status", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestat_loadavg", "Live Load Statistics"), 92 ).i18n = "livestat"
end end

6
applications/luci-livestats/luasrc/view/livestats/loadavg.htm
View file

@ -25,14 +25,14 @@
2000, 2000,
// Data sources // Data sources
[ "1", "1 Minute Load", "2", "5 Minutes Load", "3", "15 Minutes Load" ], [ 0, "1 Minute Load", 1, "5 Minutes Load", 2, "15 Minutes Load" ],
// Graph layout options // Graph layout options
{ shouldFill: false, strokeColor: null, { shouldFill: false, drawBackground: false, strokeColor: null,
strokeColorTransform: "asFillColor", strokeColorTransform: "asFillColor",
title: 'Average Load', strokeWidth: 1, title: 'Average Load', strokeWidth: 1,
padding: { left: 70, right: 10, top: 10, bottom: 20 }, padding: { left: 70, right: 10, top: 10, bottom: 20 },
instances: [ false ] } instances: [ false ], yAxis: [ 0, 2 ] }
); );
} }

2
applications/luci-livestats/luasrc/view/livestats/traffic.htm
View file

@ -32,7 +32,7 @@
[ "1", "received Bytes/s", "9", "transmitted Bytes/s" ], [ "1", "received Bytes/s", "9", "transmitted Bytes/s" ],
// Graph layout options // Graph layout options
{ shouldFill: false, strokeColor: null, { shouldFill: true, drawBackground: false, strokeColor: null,
strokeColorTransform: "asFillColor", strokeColorTransform: "asFillColor",
title: 'Traffic on interface "%s"', title: 'Traffic on interface "%s"',
separateDS: true, strokeWidth: 0.5, height: 140, separateDS: true, strokeWidth: 0.5, height: 140,

3
applications/luci-livestats/luasrc/view/livestats/wireless.htm
View file

@ -17,7 +17,8 @@
[ "Noise level", null, "Signal level", null ], [ "Noise level", null, "Signal level", null ],
// Graph layout options // Graph layout options
{ yAxis: [ 0, 150 ], title: 'Wifi Interface "%s": Signal and Noise', { drawBackground: false, yAxis: [ 0, 150 ],
title: 'Wifi Interface "%s": Signal and Noise',
padding: { left: 40, right: 10, top: 10, bottom: 20 } } padding: { left: 40, right: 10, top: 10, bottom: 20 } }
); );
} }