From f9322a29c67cb6be06462a1bbde91b669caa1680 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Wed, 3 Jun 2015 23:39:54 +0200 Subject: [PATCH] Convert memory page to use bootgrid --- html/includes/table/mempool.inc.php | 70 ++++++++++++++++ html/pages/health/mempool.inc.php | 121 +++++++++------------------- 2 files changed, 106 insertions(+), 85 deletions(-) create mode 100644 html/includes/table/mempool.inc.php diff --git a/html/includes/table/mempool.inc.php b/html/includes/table/mempool.inc.php new file mode 100644 index 000000000..a4b83263a --- /dev/null +++ b/html/includes/table/mempool.inc.php @@ -0,0 +1,70 @@ + generate_device_link($mempool), + 'mempool_descr' => $mempool['mempool_descr'], + 'graph' => $mini_graph, + 'mempool_usage' => $bar_link); + if ($_POST['view'] == "graphs") { + $graph_array['height'] = "100"; + $graph_array['width'] = "216"; + $graph_array['to'] = $config['time']['now']; + $graph_array['id'] = $mempool['mempool_id']; + $graph_array['type'] = $graph_type; + $return_data = true; + include("includes/print-graphrow.inc.php"); + unset($return_data); + $response[] = array('hostname' => $graph_data[0], + 'mempool_descr' => $graph_data[1], + 'graph' => $graph_data[2], + 'mempool_usage' => $graph_data[3]); + } # endif graphs +} +$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total); +echo _json_encode($output); diff --git a/html/pages/health/mempool.inc.php b/html/pages/health/mempool.inc.php index b348724e5..621892444 100644 --- a/html/pages/health/mempool.inc.php +++ b/html/pages/health/mempool.inc.php @@ -1,86 +1,37 @@ - + + + + + + + + + +
DeviceMemoryUsage
+ -$graph_type = "mempool_usage"; - -echo("
"); -echo(""); - -echo(" - - - - - - "); - -foreach (dbFetchRows("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.device_id = M.device_id ORDER BY D.hostname") as $mempool) -{ - if (device_permitted($mempool['device_id'])) - { - $text_descr = $mempool['mempool_descr']; - - if ($config['memcached']['enable']) - { - $state = $memcache->get('mempool-'.$mempool['mempool_id'].'-state'); - if($debug) { print_r($state); } - if(is_array($state)) { $port = array_merge($mempool, $state); } - unset($state); - } - - - $mempool_url = "device/device=".$mempool['device_id']."/tab=health/metric=mempool/"; - $mini_url = "graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=80&height=20&bg=f4f4f4"; - - $mempool_popup = "onmouseover=\"return overlib('
".$device['hostname']." - ".$text_descr; - $mempool_popup .= "
"; - $mempool_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\""; - - $total = formatStorage($mempool['mempool_total']); - $used = formatStorage($mempool['mempool_used']); - $free = formatStorage($mempool['mempool_free']); - - $background = get_percentage_colours($mempool['mempool_perc']); - - echo(" - - - - - - "); - - if ($vars['view'] == "graphs") - { - echo(""); - } # endif graphs - } -} - -echo("
DeviceMemoryUsageUsed
".generate_device_link($mempool)."" . $text_descr . " - ".print_percentage_bar (400, 20, $mempool['mempool_perc'], "$used / $total", "ffffff", $background['left'], $free , "ffffff", $background['right'])." - ".$mempool['mempool_perc']."%
"); - - $daily_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=211&height=100"; - $daily_url = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=400&height=150"; - - $weekly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['week']."&to=".$config['time']['now']."&width=211&height=100"; - $weekly_url = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['week']."&to=".$config['time']['now']."&width=400&height=150"; - - $monthly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['month']."&to=".$config['time']['now']."&width=211&height=100"; - $monthly_url = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['month']."&to=".$config['time']['now']."&width=400&height=150"; - - $yearly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['year']."&to=".$config['time']['now']."&width=211&height=100"; - $yearly_url = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=".$config['time']['year']."&to=".$config['time']['now']."&width=400&height=150"; - - echo("', LEFT);\" onmouseout=\"return nd();\"> - "); - echo("', LEFT);\" onmouseout=\"return nd();\"> - "); - echo("', LEFT);\" onmouseout=\"return nd();\"> - "); - echo("', LEFT);\" onmouseout=\"return nd();\"> - "); - echo("
"); -echo("
"); - -?> +