From 59c47f493ed74599ee7ef5b0ee072b760d047c80 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 13 Sep 2011 10:26:09 +0000 Subject: [PATCH] cleanup, data of the monitor page refreshed automaticly (not using page refresh) --- www/monitor.html | 207 +++++++++++++++++++++---------------------------------- www/psensor.js | 70 +++++++++++++++++-- www/style.css | 12 ++-- 3 files changed, 151 insertions(+), 138 deletions(-) diff --git a/www/monitor.html b/www/monitor.html index 04bfdc8..1764194 100644 --- a/www/monitor.html +++ b/www/monitor.html @@ -7,139 +7,90 @@ -

- - -

- -

Uptime:

- -

CPU

- -

- - - - - - - - - - -

Current usage	Load 1mn	Load 5mn	Load 15mn

- -

Memory

- -

- - - - - - - - - - - - - - - -

	Total	Used	Free	Shared	Buffer
Memory
Swap

- -

Network

- -

- - - - - - - - - - -

Interface	Bytes In	Bytes Out

- -

Sensors

- -

- - - - - - - - - - - -

Name	Value	Min	Max	Type

Psensor Server Monitoring

+ +

Uptime:

+ +

CPU

+ + + + + + + + + + + +

Current usage	Load 1mn	Load 5mn	Load 15mn

+ +

Memory

+ + + + + + + + + + + + + + + + +

	Total	Used	Free	Shared	Buffer

+ +

Network

+ + + + + + + + + + + +

Interface	Bytes In	Bytes Out

+ +

Sensors

+ + + + + + + + + + + + +

Name	Value	Min	Max	Type

+ + - - diff --git a/www/psensor.js b/www/psensor.js index 862aa1d..c59a268 100644 --- a/www/psensor.js +++ b/www/psensor.js @@ -41,7 +41,7 @@ function format_mem_size(s) { return o+"o"; return "0"; -}; +} function type_to_str(stype) { var stype_str; @@ -63,7 +63,7 @@ function type_to_str(stype) { stype_str += " Fan"; return stype_str; -}; +} function type_to_unit(stype) { if (stype & 0x0001) @@ -78,8 +78,7 @@ function value_to_str(value, type) { return value+type_to_unit(type); } -function get_url_params() -{ +function get_url_params() { var vars, hashes, i; vars = []; @@ -172,7 +171,11 @@ function update_summary_sensors() { var name, value_str, min_str, max_str, type, type_str, url; $.getJSON("/api/1.0/sensors", function(data) { + $("#sensors tbody").html(""); + $.each(data, function(i, item) { + + name = item["name"]; type = item["type"]; value_str = value_to_str(item["last_measure"]["value"], type); @@ -181,7 +184,7 @@ function update_summary_sensors() { type_str = type_to_str(type); url = "details.html?id="+escape("/api/1.0/sensors/"+item["id"]); - $("#sensors").append("" + $("#sensors tbody").append("" +""+name+"" +""+value_str+"" +""+min_str+"" @@ -190,4 +193,61 @@ function update_summary_sensors() { +""); }); }); +} + +function update_summary_sysinfo() { + $.getJSON("/api/1.0/sysinfo", function(data) { + $("#uptime").html(""); + $("#cpu tbody").html(""); + $("#memory").html(""); + $("#swap").html(""); + $("#net tbody").html(""); + + var load = Math.round(data["load"] * 100); + var load_1 = Math.round(data["load_1"]*1000)/1000; + var load_5 = Math.round(data["load_5"]*1000)/1000; + var load_15 = Math.round(data["load_15"]*1000)/1000; + var uptime = data["uptime"]; + var uptime_s = uptime % 60; + var uptime_mn = Math.floor((uptime / 60) % 60); + var uptime_h = Math.floor((uptime / (60*60)) % 24); + var uptime_d = Math.floor(uptime / (60*60*24)); + + $("#cpu").append(""+load+"%" + +load_1+"" + +load_5+"" + +load_15+""); + + $("#uptime").append(uptime_d+"d "+uptime_h+"h "+uptime_mn+"mn"); + + var ram = data["ram"]; + var swap = data["swap"]; + var mu = data["mem_unit"]; + + var ramtotal = ram["total"]*mu; + var ramfree = ram["free"]*mu; + var ramused = (ram["total"] - ram["free"])*mu; + var ramshared = ram["shared"]*mu; + var rambuffer = ram["buffer"]*mu; + + + $("#memory").append("Memory" + +""+format_mem_size(ramtotal)+"" + +""+format_mem_size(ramused)+"" + +""+format_mem_size(ramfree)+"" + +""+format_mem_size(ramshared)+"" + +""+format_mem_size(rambuffer)+""); + + $("#swap").append("Swap" + +""+format_mem_size(swap["total"]*mu)+"" + +""+format_mem_size(swap["total"]*mu-swap["free"]*mu)+"" + +""+format_mem_size(swap["free"]*mu)+""); + + var netdata = data["net"]; + $.each(netdata, function(i, item) { + $("#net").append(""+item["name"]+"" + +""+format_mem_size(item["bytes_in"])+"" + +""+format_mem_size(item["bytes_out"])+""); + }); + }); } \ No newline at end of file diff --git a/www/style.css b/www/style.css index d2075ac..885996c 100644 --- a/www/style.css +++ b/www/style.css @@ -38,21 +38,18 @@ p { table { text-align: left; - width: 100%; padding-left: 8px; padding-right: 8px; } thead { - background-color: #aea79f; - color: #ffffff; - font-weight: bold; + background-color: #000; + color: #fff; padding-top: 4px; padding-bottom: 4px; } tbody { - color: #333333; padding-top: 4px; padding-bottom: 4px; } @@ -61,6 +58,11 @@ th, td { padding: 4px 4px 4px 4px; } +th { + font-style: normal; + font-weight: normal; +} + .chart { color: #000; } -- 2.7.4